har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/rawdec: Deduplicate AVClasses based upon ff_rawvideo_options

Browse Source 
The child_class_next API relied on different (de)muxers to use
different AVClasses; yet this API has been replaced by
child_class_iterate.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2021-06-07 16:13:33 +02:00
parent 6a055bf036
commit 7ca0931fe1
3 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/ingenientdec.c
View File

@ -61,8 +61,6 @@ static int ingenient_read_packet(AVFormatContext *s, AVPacket *pkt)
return ret; return ret;
} }
FF_RAWVIDEO_DEMUXER_CLASS(ingenient)
const AVInputFormat ff_ingenient_demuxer = { const AVInputFormat ff_ingenient_demuxer = {
.name = "ingenient", .name = "ingenient",
.long_name = NULL_IF_CONFIG_SMALL("raw Ingenient MJPEG"), .long_name = NULL_IF_CONFIG_SMALL("raw Ingenient MJPEG"),
@ -73,5 +71,5 @@ const AVInputFormat ff_ingenient_demuxer = {
.flags = AVFMT_GENERIC_INDEX, .flags = AVFMT_GENERIC_INDEX,
.extensions = "cgi", // FIXME .extensions = "cgi", // FIXME
.raw_codec_id = AV_CODEC_ID_MJPEG, .raw_codec_id = AV_CODEC_ID_MJPEG,
.priv_class = &ingenient_demuxer_class, .priv_class = &ff_rawvideo_demuxer_class,
}; };

10
libavformat/rawdec.c
View File

@ -118,12 +118,20 @@ int ff_raw_data_read_header(AVFormatContext *s)
#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
const AVOption ff_rawvideo_options[] = { static const AVOption rawvideo_options[] = {
{ "framerate", "", OFFSET(framerate), AV_OPT_TYPE_VIDEO_RATE, {.str = "25"}, 0, INT_MAX, DEC}, { "framerate", "", OFFSET(framerate), AV_OPT_TYPE_VIDEO_RATE, {.str = "25"}, 0, INT_MAX, DEC},
{ "raw_packet_size", "", OFFSET(raw_packet_size), AV_OPT_TYPE_INT, {.i64 = RAW_PACKET_SIZE }, 1, INT_MAX, DEC}, { "raw_packet_size", "", OFFSET(raw_packet_size), AV_OPT_TYPE_INT, {.i64 = RAW_PACKET_SIZE }, 1, INT_MAX, DEC},
{ NULL }, { NULL },
}; };
#undef OFFSET #undef OFFSET
const AVClass ff_rawvideo_demuxer_class = {
.class_name = "generic raw video demuxer",
.item_name = av_default_item_name,
.option = rawvideo_options,
.version = LIBAVUTIL_VERSION_INT,
};
#define OFFSET(x) offsetof(FFRawDemuxerContext, x) #define OFFSET(x) offsetof(FFRawDemuxerContext, x)
static const AVOption raw_options[] = { static const AVOption raw_options[] = {
{ "raw_packet_size", "", OFFSET(raw_packet_size), AV_OPT_TYPE_INT, {.i64 = RAW_PACKET_SIZE }, 1, INT_MAX, DEC}, { "raw_packet_size", "", OFFSET(raw_packet_size), AV_OPT_TYPE_INT, {.i64 = RAW_PACKET_SIZE }, 1, INT_MAX, DEC},

14
libavformat/rawdec.h
View File

@ -24,7 +24,6 @@
#include "avformat.h" #include "avformat.h"
#include "libavutil/log.h" #include "libavutil/log.h"
#include "libavutil/opt.h"
typedef struct FFRawVideoDemuxerContext { typedef struct FFRawVideoDemuxerContext {
const AVClass *class; /**< Class for private options. */ const AVClass *class; /**< Class for private options. */
@ -39,7 +38,7 @@ typedef struct FFRawDemuxerContext {
int raw_packet_size; int raw_packet_size;
} FFRawDemuxerContext; } FFRawDemuxerContext;
extern const AVOption ff_rawvideo_options[]; extern const AVClass ff_rawvideo_demuxer_class;
extern const AVClass ff_raw_demuxer_class; extern const AVClass ff_raw_demuxer_class;
int ff_raw_read_partial_packet(AVFormatContext *s, AVPacket *pkt); int ff_raw_read_partial_packet(AVFormatContext *s, AVPacket *pkt);
@ -52,16 +51,7 @@ int ff_raw_subtitle_read_header(AVFormatContext *s);
int ff_raw_data_read_header(AVFormatContext *s); int ff_raw_data_read_header(AVFormatContext *s);
#define FF_RAWVIDEO_DEMUXER_CLASS(name)\
static const AVClass name ## _demuxer_class = {\
.class_name = #name " demuxer",\
.item_name = av_default_item_name,\
.option = ff_rawvideo_options,\
.version = LIBAVUTIL_VERSION_INT,\
};
#define FF_DEF_RAWVIDEO_DEMUXER2(shortname, longname, probe, ext, id, flag)\ #define FF_DEF_RAWVIDEO_DEMUXER2(shortname, longname, probe, ext, id, flag)\
FF_RAWVIDEO_DEMUXER_CLASS(shortname)\
const AVInputFormat ff_ ## shortname ## _demuxer = {\ const AVInputFormat ff_ ## shortname ## _demuxer = {\
.name = #shortname,\ .name = #shortname,\
.long_name = NULL_IF_CONFIG_SMALL(longname),\ .long_name = NULL_IF_CONFIG_SMALL(longname),\
@ -72,7 +62,7 @@ const AVInputFormat ff_ ## shortname ## _demuxer = {\
.flags = flag,\ .flags = flag,\
.raw_codec_id = id,\ .raw_codec_id = id,\
.priv_data_size = sizeof(FFRawVideoDemuxerContext),\ .priv_data_size = sizeof(FFRawVideoDemuxerContext),\
.priv_class = &shortname ## _demuxer_class,\ .priv_class = &ff_rawvideo_demuxer_class,\
}; };
#define FF_DEF_RAWVIDEO_DEMUXER(shortname, longname, probe, ext, id)\ #define FF_DEF_RAWVIDEO_DEMUXER(shortname, longname, probe, ext, id)\