diff options
author | Anton Khirnov <anton@khirnov.net> | 2024-01-23 18:42:20 +0100 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2024-01-30 09:52:00 +0100 |
commit | 9ba4bc87e6c02a7dfe710534c536d17684cc6c02 (patch) | |
tree | da3e2cbbcd08470b32d57ce66d9676f8bfa0f1a8 /fftools | |
parent | 970281766200491c4e5bb2ea1480d8afc1548a3d (diff) | |
download | ffmpeg-9ba4bc87e6c02a7dfe710534c536d17684cc6c02.tar.gz |
fftools/ffmpeg_dec: pass top_field_first through DecoderOpts
Do not read it from InputStream directly.
This is a step towards decoupling Decoder and InputStream.
Diffstat (limited to 'fftools')
-rw-r--r-- | fftools/ffmpeg.h | 3 | ||||
-rw-r--r-- | fftools/ffmpeg_dec.c | 2 | ||||
-rw-r--r-- | fftools/ffmpeg_demux.c | 6 |
3 files changed, 9 insertions, 2 deletions
diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 5d6a538aa0..9add5cac85 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -287,6 +287,9 @@ enum DecoderFlags { // decoder should override timestamps by fixed framerate // from DecoderOpts.framerate DECODER_FLAG_FRAMERATE_FORCED = (1 << 2), +#if FFMPEG_OPT_TOP + DECODER_FLAG_TOP_FIELD_FIRST = (1 << 3), +#endif }; typedef struct DecoderOpts { diff --git a/fftools/ffmpeg_dec.c b/fftools/ffmpeg_dec.c index 0266e9c97d..184d2130c7 100644 --- a/fftools/ffmpeg_dec.c +++ b/fftools/ffmpeg_dec.c @@ -318,7 +318,7 @@ static int video_frame_process(InputStream *ist, AVFrame *frame) DecoderPriv *dp = dp_from_dec(ist->decoder); #if FFMPEG_OPT_TOP - if(ist->top_field_first>=0) { + if (dp->flags & DECODER_FLAG_TOP_FIELD_FIRST) { av_log(dp, AV_LOG_WARNING, "-top is deprecated, use the setfield filter instead\n"); frame->flags |= AV_FRAME_FLAG_TOP_FIELD_FIRST; } diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index 4cced4a7f8..3c3be214c5 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -905,7 +905,11 @@ static int ist_use(InputStream *ist, int decoding_needed) return ret; ds->dec_opts.flags = (!!ist->fix_sub_duration * DECODER_FLAG_FIX_SUB_DURATION) | - (!!(d->f.ctx->iformat->flags & AVFMT_NOTIMESTAMPS) * DECODER_FLAG_TS_UNRELIABLE); + (!!(d->f.ctx->iformat->flags & AVFMT_NOTIMESTAMPS) * DECODER_FLAG_TS_UNRELIABLE) +#if FFMPEG_OPT_TOP + | ((ist->top_field_first >= 0) * DECODER_FLAG_TOP_FIELD_FIRST) +#endif + ; if (ist->framerate.num) { ds->dec_opts.flags |= DECODER_FLAG_FRAMERATE_FORCED; |