RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-17 20:37:04 +00:00
Code Issues Projects Releases Wiki Activity

fftools/ffmpeg_dec: pass top_field_first through DecoderOpts

Browse Source 
Do not read it from InputStream directly.

This is a step towards decoupling Decoder and InputStream.
This commit is contained in:
Anton Khirnov 2024-01-23 18:42:20 +01:00
parent 9702817662
commit 9ba4bc87e6
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fftools/ffmpeg.h
View File

@ -287,6 +287,9 @@ enum DecoderFlags {
// decoder should override timestamps by fixed framerate // decoder should override timestamps by fixed framerate
// from DecoderOpts.framerate // from DecoderOpts.framerate
DECODER_FLAG_FRAMERATE_FORCED = (1 << 2), DECODER_FLAG_FRAMERATE_FORCED = (1 << 2),
#if FFMPEG_OPT_TOP
DECODER_FLAG_TOP_FIELD_FIRST = (1 << 3),
#endif
}; };
typedef struct DecoderOpts { typedef struct DecoderOpts {

2
fftools/ffmpeg_dec.c
View File

@ -318,7 +318,7 @@ static int video_frame_process(InputStream *ist, AVFrame *frame)
DecoderPriv *dp = dp_from_dec(ist->decoder); DecoderPriv *dp = dp_from_dec(ist->decoder);
#if FFMPEG_OPT_TOP #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"); av_log(dp, AV_LOG_WARNING, "-top is deprecated, use the setfield filter instead\n");
frame->flags |= AV_FRAME_FLAG_TOP_FIELD_FIRST; frame->flags |= AV_FRAME_FLAG_TOP_FIELD_FIRST;
} }

6
fftools/ffmpeg_demux.c
View File

@ -905,7 +905,11 @@ static int ist_use(InputStream *ist, int decoding_needed)
return ret; return ret;
ds->dec_opts.flags = (!!ist->fix_sub_duration * DECODER_FLAG_FIX_SUB_DURATION) | 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) { if (ist->framerate.num) {
ds->dec_opts.flags |= DECODER_FLAG_FRAMERATE_FORCED; ds->dec_opts.flags |= DECODER_FLAG_FRAMERATE_FORCED;