highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

oss: add channels and sample_rate private options.

Browse Source
This commit is contained in:
Anton Khirnov
2011-05-23 19:02:40 +02:00
parent a1a15a9993
commit 003e63b6df
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
libavdevice/oss_audio.c
View File

@@ -37,12 +37,14 @@
#include <sys/select.h> #include <sys/select.h>
#include "libavutil/log.h" #include "libavutil/log.h"
#include "libavutil/opt.h"
#include "libavcodec/avcodec.h" #include "libavcodec/avcodec.h"
#include "libavformat/avformat.h" #include "libavformat/avformat.h"
#define AUDIO_BLOCK_SIZE 4096 #define AUDIO_BLOCK_SIZE 4096
typedef struct { typedef struct {
AVClass *class;
int fd; int fd;
int sample_rate; int sample_rate;
int channels; int channels;
@@ -216,15 +218,15 @@ static int audio_read_header(AVFormatContext *s1, AVFormatParameters *ap)
AVStream *st; AVStream *st;
int ret; int ret;
if (ap->sample_rate <= 0 || ap->channels <= 0) if (ap->sample_rate > 0)
return -1; 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 = audio_open(s1, 0, s1->filename); ret = audio_open(s1, 0, s1->filename);
if (ret < 0) { if (ret < 0) {
@@ -293,6 +295,19 @@ static int audio_read_close(AVFormatContext *s1)
} }
#if CONFIG_OSS_INDEV #if CONFIG_OSS_INDEV
static const AVOption options[] = {
{ "sample_rate", "", offsetof(AudioData, sample_rate), FF_OPT_TYPE_INT, {.dbl = 48000}, 1, INT_MAX, AV_OPT_FLAG_DECODING_PARAM },
{ "channels", "", offsetof(AudioData, channels), FF_OPT_TYPE_INT, {.dbl = 2}, 1, INT_MAX, AV_OPT_FLAG_DECODING_PARAM },
{ NULL },
};
static const AVClass oss_demuxer_class = {
.class_name = "OSS demuxer",
.item_name = av_default_item_name,
.option = options,
.version = LIBAVUTIL_VERSION_INT,
};
AVInputFormat ff_oss_demuxer = { AVInputFormat ff_oss_demuxer = {
"oss", "oss",
NULL_IF_CONFIG_SMALL("Open Sound System capture"), NULL_IF_CONFIG_SMALL("Open Sound System capture"),
@@ -302,6 +317,7 @@ AVInputFormat ff_oss_demuxer = {
audio_read_packet, audio_read_packet,
audio_read_close, audio_read_close,
.flags = AVFMT_NOFILE, .flags = AVFMT_NOFILE,
.priv_class = &oss_demuxer_class,
}; };
#endif #endif