ffmpeg | branch: master | Dawid Kozinski <d.kozin...@samsung.com> | Thu Jun 26 08:36:43 2025 +0200| [6e8bd5dd2588f892cde308022a8a1e6ee82b9fa0] | committer: James Almer
avformat/apvdec: add framerate option Signed-off-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6e8bd5dd2588f892cde308022a8a1e6ee82b9fa0 --- libavformat/apvdec.c | 27 +++++++++++++++++++++++++-- libavformat/version.h | 2 +- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/libavformat/apvdec.c b/libavformat/apvdec.c index 1e5497bcd3..52adb17e41 100644 --- a/libavformat/apvdec.c +++ b/libavformat/apvdec.c @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/opt.h" + #include "libavcodec/apv.h" #include "libavcodec/bytestream.h" @@ -24,6 +26,10 @@ #include "demux.h" #include "internal.h" +typedef struct APVDemuxerContext { + const AVClass *class; /**< Class for private options. */ + AVRational framerate; /**< AVRational describing framerate, set by a private option. */ +} APVDemuxerContext; typedef struct APVHeaderInfo { uint8_t pbu_type; @@ -145,6 +151,7 @@ static int apv_probe(const AVProbeData *p) static int apv_read_header(AVFormatContext *s) { + APVDemuxerContext *apv = s->priv_data; AVStream *st; GetByteContext gbc; uint8_t buffer[12]; @@ -184,8 +191,8 @@ static int apv_read_header(AVFormatContext *s) st->codecpar->codec_id = AV_CODEC_ID_APV; ffstream(st)->need_parsing = AVSTREAM_PARSE_HEADERS; - st->avg_frame_rate = (AVRational){ 30, 1 }; - avpriv_set_pts_info(st, 64, 1, 30); + st->avg_frame_rate = apv->framerate; + avpriv_set_pts_info(st, 64, apv->framerate.den, apv->framerate.num); avio_seek(s->pb, -size, SEEK_CUR); @@ -221,11 +228,27 @@ static int apv_read_packet(AVFormatContext *s, AVPacket *pkt) return 0; } +#define OFFSET(x) offsetof(APVDemuxerContext, x) +#define DEC AV_OPT_FLAG_DECODING_PARAM +static const AVOption apv_options[] = { + { "framerate", "set frame rate", OFFSET(framerate), AV_OPT_TYPE_VIDEO_RATE, { .str = "30" }, 0, INT_MAX, DEC }, + { NULL }, +}; + +static const AVClass apv_demuxer_class = { + .class_name = "apv demuxer", + .item_name = av_default_item_name, + .option = apv_options, + .version = LIBAVUTIL_VERSION_INT, +}; + const FFInputFormat ff_apv_demuxer = { .p.name = "apv", .p.long_name = NULL_IF_CONFIG_SMALL("APV raw bitstream"), .p.extensions = "apv", .p.flags = AVFMT_GENERIC_INDEX | AVFMT_NOTIMESTAMPS, + .p.priv_class = &apv_demuxer_class, + .priv_data_size = sizeof(APVDemuxerContext), .read_probe = apv_probe, .read_header = apv_read_header, .read_packet = apv_read_packet, diff --git a/libavformat/version.h b/libavformat/version.h index a7c80dc564..b32ddb3617 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -32,7 +32,7 @@ #include "version_major.h" #define LIBAVFORMAT_VERSION_MINOR 1 -#define LIBAVFORMAT_VERSION_MICRO 100 +#define LIBAVFORMAT_VERSION_MICRO 101 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
