virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-23 21:54:53 +02:00
Code Issues Releases Activity

pcmdec: use unique classes for all pcm demuxers.

Browse Source
This commit is contained in:
Anton Khirnov
2011-09-14 09:54:29 +02:00
parent d906f49aa8
commit 34d2bf30a0
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libavformat/pcmdec.c
View File

@@ -22,6 +22,8 @@
#include "avformat.h" #include "avformat.h"
#include "rawdec.h" #include "rawdec.h"
#include "pcm.h" #include "pcm.h"
#include "libavutil/log.h"
#include "libavutil/opt.h"
#define RAW_SAMPLES 1024 #define RAW_SAMPLES 1024
@@ -46,7 +48,19 @@ static int raw_read_packet(AVFormatContext *s, AVPacket *pkt)
return ret; return ret;
} }
static const AVOption pcm_options[] = {
{ "sample_rate", "", offsetof(RawAudioDemuxerContext, sample_rate), FF_OPT_TYPE_INT, {.dbl = 0}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM },
{ "channels", "", offsetof(RawAudioDemuxerContext, channels), FF_OPT_TYPE_INT, {.dbl = 0}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM },
{ NULL },
};
#define PCMDEF(name, long_name, ext, codec) \ #define PCMDEF(name, long_name, ext, codec) \
static const AVClass name ## _demuxer_class = {\
.class_name = #name " demuxer",\
.item_name = av_default_item_name,\
.option = pcm_options,\
.version = LIBAVUTIL_VERSION_INT,\
};\
AVInputFormat ff_pcm_ ## name ## _demuxer = {\ AVInputFormat ff_pcm_ ## name ## _demuxer = {\
#name,\ #name,\
NULL_IF_CONFIG_SMALL(long_name),\ NULL_IF_CONFIG_SMALL(long_name),\
@@ -59,7 +73,7 @@ AVInputFormat ff_pcm_ ## name ## _demuxer = {\
.flags= AVFMT_GENERIC_INDEX,\ .flags= AVFMT_GENERIC_INDEX,\
.extensions = ext,\ .extensions = ext,\
.value = codec,\ .value = codec,\
.priv_class = &ff_rawaudio_demuxer_class,\ .priv_class = &name ## _demuxer_class,\
}; };
PCMDEF(f64be, "PCM 64 bit floating-point big-endian format", PCMDEF(f64be, "PCM 64 bit floating-point big-endian format",

13
libavformat/rawdec.c
View File

@@ -167,19 +167,6 @@ fail:
/* Note: Do not forget to add new entries to the Makefile as well. */ /* Note: Do not forget to add new entries to the Makefile as well. */
static const AVOption audio_options[] = {
{ "sample_rate", "", offsetof(RawAudioDemuxerContext, sample_rate), FF_OPT_TYPE_INT, {.dbl = 0}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM },
{ "channels", "", offsetof(RawAudioDemuxerContext, channels), FF_OPT_TYPE_INT, {.dbl = 0}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM },
{ NULL },
};
const AVClass ff_rawaudio_demuxer_class = {
.class_name = "rawaudio demuxer",
.item_name = av_default_item_name,
.option = audio_options,
.version = LIBAVUTIL_VERSION_INT,
};
#define OFFSET(x) offsetof(FFRawVideoDemuxerContext, x) #define OFFSET(x) offsetof(FFRawVideoDemuxerContext, x)
#define DEC AV_OPT_FLAG_DECODING_PARAM #define DEC AV_OPT_FLAG_DECODING_PARAM
static const AVOption video_options[] = { static const AVOption video_options[] = {

1
libavformat/rawdec.h
View File

@@ -38,7 +38,6 @@ typedef struct FFRawVideoDemuxerContext {
char *framerate; /**< String describing framerate, set by a private option. */ char *framerate; /**< String describing framerate, set by a private option. */
} FFRawVideoDemuxerContext; } FFRawVideoDemuxerContext;
extern const AVClass ff_rawaudio_demuxer_class;
extern const AVClass ff_rawvideo_demuxer_class; extern const AVClass ff_rawvideo_demuxer_class;
int ff_raw_read_header(AVFormatContext *s, AVFormatParameters *ap); int ff_raw_read_header(AVFormatContext *s, AVFormatParameters *ap);