Browse Source

sndio: add channels and sample_rate private options.

tags/n0.8
Anton Khirnov 14 years ago
parent
commit
a1a15a9993
2 changed files with 21 additions and 5 deletions
  1. +2
    -0
      libavdevice/sndio_common.h
  2. +19
    -5
      libavdevice/sndio_dec.c

+ 2
- 0
libavdevice/sndio_common.h View File

@@ -26,8 +26,10 @@
#include <sndio.h> #include <sndio.h>


#include "libavformat/avformat.h" #include "libavformat/avformat.h"
#include "libavutil/log.h"


typedef struct { typedef struct {
AVClass *class;
struct sio_hdl *hdl; struct sio_hdl *hdl;
enum CodecID codec_id; enum CodecID codec_id;
int64_t hwpos; int64_t hwpos;


+ 19
- 5
libavdevice/sndio_dec.c View File

@@ -23,6 +23,7 @@
#include <sndio.h> #include <sndio.h>


#include "libavformat/avformat.h" #include "libavformat/avformat.h"
#include "libavutil/opt.h"


#include "sndio_common.h" #include "sndio_common.h"


@@ -33,16 +34,15 @@ static av_cold int audio_read_header(AVFormatContext *s1,
AVStream *st; AVStream *st;
int ret; int ret;


if (ap->sample_rate <= 0 || ap->channels <= 0)
return AVERROR(EINVAL);
if (ap->sample_rate > 0)
s->sample_rate = ap->sample_rate;
if (ap->channels > 0)
s->channels = ap->channels;


st = av_new_stream(s1, 0); st = av_new_stream(s1, 0);
if (!st) if (!st)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);


s->sample_rate = ap->sample_rate;
s->channels = ap->channels;

ret = ff_sndio_open(s1, 0, s1->filename); ret = ff_sndio_open(s1, 0, s1->filename);
if (ret < 0) if (ret < 0)
return ret; return ret;
@@ -97,6 +97,19 @@ static av_cold int audio_read_close(AVFormatContext *s1)
return 0; return 0;
} }


static const AVOption options[] = {
{ "sample_rate", "", offsetof(SndioData, sample_rate), FF_OPT_TYPE_INT, {.dbl = 48000}, 1, INT_MAX, AV_OPT_FLAG_DECODING_PARAM },
{ "channels", "", offsetof(SndioData, channels), FF_OPT_TYPE_INT, {.dbl = 2}, 1, INT_MAX, AV_OPT_FLAG_DECODING_PARAM },
{ NULL },
};

static const AVClass sndio_demuxer_class = {
.class_name = "sndio indev",
.item_name = av_default_item_name,
.option = options,
.version = LIBAVUTIL_VERSION_INT,
};

AVInputFormat ff_sndio_demuxer = { AVInputFormat ff_sndio_demuxer = {
.name = "sndio", .name = "sndio",
.long_name = NULL_IF_CONFIG_SMALL("sndio audio capture"), .long_name = NULL_IF_CONFIG_SMALL("sndio audio capture"),
@@ -105,4 +118,5 @@ AVInputFormat ff_sndio_demuxer = {
.read_packet = audio_read_packet, .read_packet = audio_read_packet,
.read_close = audio_read_close, .read_close = audio_read_close,
.flags = AVFMT_NOFILE, .flags = AVFMT_NOFILE,
.priv_class = &sndio_demuxer_class,
}; };

Loading…
Cancel
Save