January 2024 - ffmpeg-cvslog - lists.ffmpeg.org

fftools/ffmpeg_dec: eliminate InputStream use in hw_device_setup_for_decode()
by Anton Khirnov 30 Jan '24

30 Jan '24

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Tue Jan 23 18:42:20 2024 +0100| [d5f9ef766b4e7958f3cf75c6b838fbe0f22936c5] | committer: Anton Khirnov fftools/ffmpeg_dec: eliminate InputStream use in hw_device_setup_for_decode() The same information can also be obtained from the decoder itself. This is a step towards decoupling Decoder and InputStream. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d5f9ef766b4e7958f… --- fftools/ffmpeg_dec.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/fftools/ffmpeg_dec.c b/fftools/ffmpeg_dec.c index cbb782bf9d..734549ed0b 100644 --- a/fftools/ffmpeg_dec.c +++ b/fftools/ffmpeg_dec.c @@ -803,7 +803,8 @@ static HWDevice *hw_device_match_by_codec(const AVCodec *codec) } } -static int hw_device_setup_for_decode(InputStream *ist, DecoderPriv *dp, +static int hw_device_setup_for_decode(DecoderPriv *dp, + const AVCodec *codec, const char *hwaccel_device) { const AVCodecHWConfig *config; @@ -858,7 +859,7 @@ static int hw_device_setup_for_decode(InputStream *ist, DecoderPriv *dp, if (!dev) err = hw_device_init_from_type(type, NULL, &dev); } else { - dev = hw_device_match_by_codec(ist->dec); + dev = hw_device_match_by_codec(codec); if (!dev) { // No device for this codec, but not using generic hwaccel // and therefore may well not need one - ignore. @@ -869,12 +870,12 @@ static int hw_device_setup_for_decode(InputStream *ist, DecoderPriv *dp, if (auto_device) { int i; - if (!avcodec_get_hw_config(ist->dec, 0)) { + if (!avcodec_get_hw_config(codec, 0)) { // Decoder does not support any hardware devices. return 0; } for (i = 0; !dev; i++) { - config = avcodec_get_hw_config(ist->dec, i); + config = avcodec_get_hw_config(codec, i); if (!config) break; type = config->device_type; @@ -886,7 +887,7 @@ static int hw_device_setup_for_decode(InputStream *ist, DecoderPriv *dp, } } for (i = 0; !dev; i++) { - config = avcodec_get_hw_config(ist->dec, i); + config = avcodec_get_hw_config(codec, i); if (!config) break; type = config->device_type; @@ -921,7 +922,7 @@ static int hw_device_setup_for_decode(InputStream *ist, DecoderPriv *dp, if (!dev) { av_log(dp, AV_LOG_ERROR, "No device available " "for decoder: device type %s needed for codec %s.\n", - av_hwdevice_get_type_name(type), ist->dec->name); + av_hwdevice_get_type_name(type), codec->name); return err; } @@ -1010,7 +1011,7 @@ int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx, av_dict_set(dec_opts, "flags", "+copy_opaque", AV_DICT_MULTIKEY); - ret = hw_device_setup_for_decode(ist, dp, o->hwaccel_device); + ret = hw_device_setup_for_decode(dp, codec, o->hwaccel_device); if (ret < 0) { av_log(dp, AV_LOG_ERROR, "Hardware device setup failed for decoder: %s\n",

1 0

fftools/ffmpeg_dec: pass decoder name through DecoderOpts
by Anton Khirnov 30 Jan '24

30 Jan '24

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Tue Jan 23 18:42:20 2024 +0100| [097f9ddbe94039b3c6f888560e24cc1753fec3f3] | committer: Anton Khirnov fftools/ffmpeg_dec: pass decoder name through DecoderOpts Do not build it from InputStream values. This is a step towards decoupling Decoder and InputStream. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=097f9ddbe94039b3c… --- fftools/ffmpeg.h | 2 ++ fftools/ffmpeg_dec.c | 17 +++++++++++------ fftools/ffmpeg_demux.c | 4 ++++ 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 9add5cac85..bdfacf16b7 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -295,6 +295,8 @@ enum DecoderFlags { typedef struct DecoderOpts { int flags; + char *name; + /* hwaccel options */ enum HWAccelID hwaccel_id; enum AVHWDeviceType hwaccel_device_type; diff --git a/fftools/ffmpeg_dec.c b/fftools/ffmpeg_dec.c index 184d2130c7..cbb782bf9d 100644 --- a/fftools/ffmpeg_dec.c +++ b/fftools/ffmpeg_dec.c @@ -73,6 +73,7 @@ typedef struct DecoderPriv { void *log_parent; char log_name[32]; + char *parent_name; } DecoderPriv; static DecoderPriv *dp_from_dec(Decoder *d) @@ -104,6 +105,8 @@ void dec_free(Decoder **pdec) av_frame_free(&dp->sub_prev[i]); av_frame_free(&dp->sub_heartbeat); + av_freep(&dp->parent_name); + av_freep(pdec); } @@ -499,7 +502,6 @@ static int transcode_subtitles(InputStream *ist, const AVPacket *pkt, static int packet_decode(InputStream *ist, AVPacket *pkt, AVFrame *frame) { - const InputFile *ifile = ist->file; DecoderPriv *dp = dp_from_dec(ist->decoder); AVCodecContext *dec = dp->dec_ctx; const char *type_desc = av_get_media_type_string(dec->codec_type); @@ -554,8 +556,7 @@ static int packet_decode(InputStream *ist, AVPacket *pkt, AVFrame *frame) update_benchmark(NULL); ret = avcodec_receive_frame(dec, frame); - update_benchmark("decode_%s %d.%d", type_desc, - ifile->index, ist->index); + update_benchmark("decode_%s %s", type_desc, dp->parent_name); if (ret == AVERROR(EAGAIN)) { av_assert0(pkt); // should never happen during flushing @@ -616,10 +617,10 @@ static int packet_decode(InputStream *ist, AVPacket *pkt, AVFrame *frame) } } -static void dec_thread_set_name(const InputStream *ist, const DecoderPriv *dp) +static void dec_thread_set_name(const DecoderPriv *dp) { char name[16]; - snprintf(name, sizeof(name), "dec%d:%d:%s", ist->file->index, ist->index, + snprintf(name, sizeof(name), "dec%s:%s", dp->parent_name, dp->dec_ctx->codec->name); ff_thread_setname(name); } @@ -662,7 +663,7 @@ void *decoder_thread(void *arg) if (ret < 0) goto finish; - dec_thread_set_name(ist, dp); + dec_thread_set_name(dp); while (!input_status) { int flush_buffers, have_data; @@ -972,6 +973,10 @@ int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx, snprintf(dp->log_name, sizeof(dp->log_name), "dec:%s", codec->name); + dp->parent_name = av_strdup(o->name ? o->name : ""); + if (!dp->parent_name) + return AVERROR(ENOMEM); + if (codec->type == AVMEDIA_TYPE_SUBTITLE && (dp->flags & DECODER_FLAG_FIX_SUB_DURATION)) { for (int i = 0; i < FF_ARRAY_ELEMS(dp->sub_prev); i++) { diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index 3c3be214c5..8bc73e2bf3 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -73,6 +73,7 @@ typedef struct DemuxStream { const AVCodecDescriptor *codec_desc; DecoderOpts dec_opts; + char dec_name[16]; AVBSFContext *bsf; @@ -926,6 +927,9 @@ static int ist_use(InputStream *ist, int decoding_needed) "same time is not fully supported, also see -compute_edt [0|1]\n"); } + snprintf(ds->dec_name, sizeof(ds->dec_name), "%d:%d", ist->file->index, ist->index); + ds->dec_opts.name = ds->dec_name; + ret = dec_open(ist, d->sch, ds->sch_idx_dec, &ist->decoder_opts, &ds->dec_opts); if (ret < 0)

1 0

fftools/ffmpeg_dec: pass top_field_first through DecoderOpts
by Anton Khirnov 30 Jan '24

30 Jan '24

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Tue Jan 23 18:42:20 2024 +0100| [9ba4bc87e6c02a7dfe710534c536d17684cc6c02] | committer: Anton Khirnov 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. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9ba4bc87e6c02a7df… --- fftools/ffmpeg.h | 3 +++ fftools/ffmpeg_dec.c | 2 +- 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;

1 0

fftools/ffmpeg_dec: pass input timebase through DecoderOpts
by Anton Khirnov 30 Jan '24

30 Jan '24

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Tue Jan 23 18:42:20 2024 +0100| [970281766200491c4e5bb2ea1480d8afc1548a3d] | committer: Anton Khirnov fftools/ffmpeg_dec: pass input timebase through DecoderOpts Do not read it from AVStream directly. This is a step towards decoupling Decoder and InputStream. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=970281766200491c4… --- fftools/ffmpeg.h | 2 ++ fftools/ffmpeg_dec.c | 5 +---- fftools/ffmpeg_demux.c | 2 ++ 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 106f943a2b..5d6a538aa0 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -298,6 +298,8 @@ typedef struct DecoderOpts { char *hwaccel_device; enum AVPixelFormat hwaccel_output_format; + AVRational time_base; + // Either forced (when DECODER_FLAG_FRAMERATE_FORCED is set) or // estimated (otherwise) video framerate. AVRational framerate; diff --git a/fftools/ffmpeg_dec.c b/fftools/ffmpeg_dec.c index dc36af6f35..0266e9c97d 100644 --- a/fftools/ffmpeg_dec.c +++ b/fftools/ffmpeg_dec.c @@ -998,10 +998,7 @@ int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx, dp->dec_ctx->opaque = dp; dp->dec_ctx->get_format = get_format; - - /* Useful for subtitles retiming by lavf (FIXME), skipping samples in - * audio, and video decoders such as cuvid or mediacodec */ - dp->dec_ctx->pkt_timebase = ist->st->time_base; + dp->dec_ctx->pkt_timebase = o->time_base; if (!av_dict_get(*dec_opts, "threads", NULL, 0)) av_dict_set(dec_opts, "threads", "auto", 0); diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index 7cb85c127a..4cced4a7f8 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -1152,6 +1152,8 @@ static int ist_add(const OptionsContext *o, Demuxer *d, AVStream *st) ds->first_dts = AV_NOPTS_VALUE; ds->next_dts = AV_NOPTS_VALUE; + ds->dec_opts.time_base = st->time_base; + ds->ts_scale = 1.0; MATCH_PER_STREAM_OPT(ts_scale, dbl, ds->ts_scale, ic, st);

1 0

fftools/ffmpeg_dec: move setting compute_edt to demuxer
by Anton Khirnov 30 Jan '24

30 Jan '24

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Tue Jan 23 18:42:20 2024 +0100| [b27de18e4f66e8e775e173e4953f8fe4a7404a82] | committer: Anton Khirnov fftools/ffmpeg_dec: move setting compute_edt to demuxer It is done based on demuxer information, so that is the more appropriate place for this code. This is a step towards decoupling Decoder and InputStream. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b27de18e4f66e8e77… --- fftools/ffmpeg_dec.c | 9 --------- fftools/ffmpeg_demux.c | 9 +++++++++ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/fftools/ffmpeg_dec.c b/fftools/ffmpeg_dec.c index afbf6408cb..dc36af6f35 100644 --- a/fftools/ffmpeg_dec.c +++ b/fftools/ffmpeg_dec.c @@ -999,15 +999,6 @@ int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx, dp->dec_ctx->opaque = dp; dp->dec_ctx->get_format = get_format; - if (dp->dec_ctx->codec_id == AV_CODEC_ID_DVB_SUBTITLE && - (ist->decoding_needed & DECODING_FOR_OST)) { - av_dict_set(dec_opts, "compute_edt", "1", AV_DICT_DONT_OVERWRITE); - if (ist->decoding_needed & DECODING_FOR_FILTER) - av_log(dp, AV_LOG_WARNING, - "Warning using DVB subtitles for filtering and output at the " - "same time is not fully supported, also see -compute_edt [0|1]\n"); - } - /* Useful for subtitles retiming by lavf (FIXME), skipping samples in * audio, and video decoders such as cuvid or mediacodec */ dp->dec_ctx->pkt_timebase = ist->st->time_base; diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index 2a34f97545..7cb85c127a 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -913,6 +913,15 @@ static int ist_use(InputStream *ist, int decoding_needed) } else ds->dec_opts.framerate = ist->st->avg_frame_rate; + if (ist->dec->id == AV_CODEC_ID_DVB_SUBTITLE && + (ist->decoding_needed & DECODING_FOR_OST)) { + av_dict_set(&ist->decoder_opts, "compute_edt", "1", AV_DICT_DONT_OVERWRITE); + if (ist->decoding_needed & DECODING_FOR_FILTER) + av_log(ist, AV_LOG_WARNING, + "Warning using DVB subtitles for filtering and output at the " + "same time is not fully supported, also see -compute_edt [0|1]\n"); + } + ret = dec_open(ist, d->sch, ds->sch_idx_dec, &ist->decoder_opts, &ds->dec_opts); if (ret < 0)

1 0

fftools/ffmpeg_dec: pass forced/estimated framerate though DecoderOpts
by Anton Khirnov 30 Jan '24

30 Jan '24

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Tue Jan 23 18:39:48 2024 +0100| [052c83e356e8716643e0475ed3b23901310d27ce] | committer: Anton Khirnov fftools/ffmpeg_dec: pass forced/estimated framerate though DecoderOpts Stop reading them from InputStream. This is a step towards decoupling Decoder and InputStream. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=052c83e356e871664… --- fftools/ffmpeg.h | 7 +++++++ fftools/ffmpeg_dec.c | 15 ++++++++++----- fftools/ffmpeg_demux.c | 6 ++++++ 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index b4288e7352..106f943a2b 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -284,6 +284,9 @@ enum DecoderFlags { DECODER_FLAG_FIX_SUB_DURATION = (1 << 0), // input timestamps are unreliable (guessed by demuxer) DECODER_FLAG_TS_UNRELIABLE = (1 << 1), + // decoder should override timestamps by fixed framerate + // from DecoderOpts.framerate + DECODER_FLAG_FRAMERATE_FORCED = (1 << 2), }; typedef struct DecoderOpts { @@ -294,6 +297,10 @@ typedef struct DecoderOpts { enum AVHWDeviceType hwaccel_device_type; char *hwaccel_device; enum AVPixelFormat hwaccel_output_format; + + // Either forced (when DECODER_FLAG_FRAMERATE_FORCED is set) or + // estimated (otherwise) video framerate. + AVRational framerate; } DecoderOpts; typedef struct Decoder { diff --git a/fftools/ffmpeg_dec.c b/fftools/ffmpeg_dec.c index 2698e2683a..afbf6408cb 100644 --- a/fftools/ffmpeg_dec.c +++ b/fftools/ffmpeg_dec.c @@ -45,6 +45,8 @@ typedef struct DecoderPriv { // override output video sample aspect ratio with this value AVRational sar_override; + AVRational framerate_in; + // a combination of DECODER_FLAG_*, provided to dec_open() int flags; @@ -220,6 +222,7 @@ static int64_t video_duration_estimate(const InputStream *ist, const AVFrame *fr { const DecoderPriv *dp = dp_from_dec(ist->decoder); const int ts_unreliable = dp->flags & DECODER_FLAG_TS_UNRELIABLE; + const int fr_forced = dp->flags & DECODER_FLAG_FRAMERATE_FORCED; int64_t codec_duration = 0; // XXX lavf currently makes up frame durations when they are not provided by @@ -229,7 +232,7 @@ static int64_t video_duration_estimate(const InputStream *ist, const AVFrame *fr // durations, then this should be simplified. // prefer frame duration for containers with timestamps - if (frame->duration > 0 && (!ts_unreliable || ist->framerate.num)) + if (frame->duration > 0 && (!ts_unreliable || fr_forced)) return frame->duration; if (dp->dec_ctx->framerate.den && dp->dec_ctx->framerate.num) { @@ -257,8 +260,8 @@ static int64_t video_duration_estimate(const InputStream *ist, const AVFrame *fr return codec_duration; // try average framerate - if (ist->st->avg_frame_rate.num && ist->st->avg_frame_rate.den) { - int64_t d = av_rescale_q(1, av_inv_q(ist->st->avg_frame_rate), + if (dp->framerate_in.num && dp->framerate_in.den) { + int64_t d = av_rescale_q(1, av_inv_q(dp->framerate_in), frame->time_base); if (d > 0) return d; @@ -330,10 +333,10 @@ static int video_frame_process(InputStream *ist, AVFrame *frame) frame->pts = frame->best_effort_timestamp; // forced fixed framerate - if (ist->framerate.num) { + if (dp->flags & DECODER_FLAG_FRAMERATE_FORCED) { frame->pts = AV_NOPTS_VALUE; frame->duration = 1; - frame->time_base = av_inv_q(ist->framerate); + frame->time_base = av_inv_q(dp->framerate_in); } // no timestamp available - extrapolate from previous frame duration @@ -961,6 +964,8 @@ int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx, dp->dec.class = &dec_class; dp->log_parent = ist; + dp->framerate_in = o->framerate; + dp->hwaccel_id = o->hwaccel_id; dp->hwaccel_device_type = o->hwaccel_device_type; dp->hwaccel_output_format = o->hwaccel_output_format; diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index 5ee07f706b..2a34f97545 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -907,6 +907,12 @@ static int ist_use(InputStream *ist, int decoding_needed) ds->dec_opts.flags = (!!ist->fix_sub_duration * DECODER_FLAG_FIX_SUB_DURATION) | (!!(d->f.ctx->iformat->flags & AVFMT_NOTIMESTAMPS) * DECODER_FLAG_TS_UNRELIABLE); + if (ist->framerate.num) { + ds->dec_opts.flags |= DECODER_FLAG_FRAMERATE_FORCED; + ds->dec_opts.framerate = ist->framerate; + } else + ds->dec_opts.framerate = ist->st->avg_frame_rate; + ret = dec_open(ist, d->sch, ds->sch_idx_dec, &ist->decoder_opts, &ds->dec_opts); if (ret < 0)

1 0

fftools/ffmpeg_dec: move flags to DecoderOpts
by Anton Khirnov 30 Jan '24

30 Jan '24

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Tue Jan 23 18:28:57 2024 +0100| [e0a6cb07b21fe958f30b0ed47a5ae5b9d16693bd] | committer: Anton Khirnov fftools/ffmpeg_dec: move flags to DecoderOpts Will be useful in the following commit. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e0a6cb07b21fe958f… --- fftools/ffmpeg.h | 4 +++- fftools/ffmpeg_dec.c | 4 ++-- fftools/ffmpeg_demux.c | 7 ++++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index abf95f106b..b4288e7352 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -287,6 +287,8 @@ enum DecoderFlags { }; typedef struct DecoderOpts { + int flags; + /* hwaccel options */ enum HWAccelID hwaccel_id; enum AVHWDeviceType hwaccel_device_type; @@ -738,7 +740,7 @@ AVBufferRef *hw_device_for_filter(void); * is transferred to the decoder. */ int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx, - AVDictionary **dec_opts, int flags, const DecoderOpts *o); + AVDictionary **dec_opts, const DecoderOpts *o); void dec_free(Decoder **pdec); int dec_add_filter(Decoder *dec, InputFilter *ifilter); diff --git a/fftools/ffmpeg_dec.c b/fftools/ffmpeg_dec.c index 791df8d98c..2698e2683a 100644 --- a/fftools/ffmpeg_dec.c +++ b/fftools/ffmpeg_dec.c @@ -943,7 +943,7 @@ static const AVClass dec_class = { }; int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx, - AVDictionary **dec_opts, int flags, const DecoderOpts *o) + AVDictionary **dec_opts, const DecoderOpts *o) { DecoderPriv *dp; const AVCodec *codec = ist->dec; @@ -957,7 +957,7 @@ int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx, dp->sch = sch; dp->sch_idx = sch_idx; - dp->flags = flags; + dp->flags = o->flags; dp->dec.class = &dec_class; dp->log_parent = ist; diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index 0f426e3c2e..5ee07f706b 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -893,8 +893,6 @@ static int ist_use(InputStream *ist, int decoding_needed) if (decoding_needed && ds->sch_idx_dec < 0) { int is_audio = ist->st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO; - int dec_flags = (!!ist->fix_sub_duration * DECODER_FLAG_FIX_SUB_DURATION) | - (!!(d->f.ctx->iformat->flags & AVFMT_NOTIMESTAMPS) * DECODER_FLAG_TS_UNRELIABLE); ret = sch_add_dec(d->sch, decoder_thread, ist, d->loop && is_audio); if (ret < 0) @@ -906,8 +904,11 @@ static int ist_use(InputStream *ist, int decoding_needed) if (ret < 0) 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); + ret = dec_open(ist, d->sch, ds->sch_idx_dec, - &ist->decoder_opts, dec_flags, &ds->dec_opts); + &ist->decoder_opts, &ds->dec_opts); if (ret < 0) return ret;

1 0

fftools/ffmpeg_dec: pass hwaccel options to the decoder in a separate struct
by Anton Khirnov 30 Jan '24

30 Jan '24

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Tue Jan 23 18:24:05 2024 +0100| [4bdffec8144cacdb1a54180797b07b49e390e8ec] | committer: Anton Khirnov fftools/ffmpeg_dec: pass hwaccel options to the decoder in a separate struct Stop reading them from InputStream. This is a step towards decoupling Decoder and InputStream. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4bdffec8144cacdb1… --- fftools/ffmpeg.h | 16 ++++++------ fftools/ffmpeg_dec.c | 67 ++++++++++++++++++++++++++++---------------------- fftools/ffmpeg_demux.c | 36 ++++++++++++++------------- 3 files changed, 65 insertions(+), 54 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 80c09d1662..abf95f106b 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -286,6 +286,14 @@ enum DecoderFlags { DECODER_FLAG_TS_UNRELIABLE = (1 << 1), }; +typedef struct DecoderOpts { + /* hwaccel options */ + enum HWAccelID hwaccel_id; + enum AVHWDeviceType hwaccel_device_type; + char *hwaccel_device; + enum AVPixelFormat hwaccel_output_format; +} DecoderOpts; + typedef struct Decoder { const AVClass *class; @@ -351,12 +359,6 @@ typedef struct InputStream { int nb_outputs; int reinit_filters; - - /* hwaccel options */ - enum HWAccelID hwaccel_id; - enum AVHWDeviceType hwaccel_device_type; - char *hwaccel_device; - enum AVPixelFormat hwaccel_output_format; } InputStream; typedef struct InputFile { @@ -736,7 +738,7 @@ AVBufferRef *hw_device_for_filter(void); * is transferred to the decoder. */ int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx, - AVDictionary **dec_opts, int flags); + AVDictionary **dec_opts, int flags, const DecoderOpts *o); void dec_free(Decoder **pdec); int dec_add_filter(Decoder *dec, InputFilter *ifilter); diff --git a/fftools/ffmpeg_dec.c b/fftools/ffmpeg_dec.c index b66c0e35ee..791df8d98c 100644 --- a/fftools/ffmpeg_dec.c +++ b/fftools/ffmpeg_dec.c @@ -48,7 +48,10 @@ typedef struct DecoderPriv { // a combination of DECODER_FLAG_*, provided to dec_open() int flags; - enum AVPixelFormat hwaccel_pix_fmt; + enum AVPixelFormat hwaccel_pix_fmt; + enum HWAccelID hwaccel_id; + enum AVHWDeviceType hwaccel_device_type; + enum AVPixelFormat hwaccel_output_format; // pts/estimated duration of the last decoded frame // * in decoder timebase for video, @@ -267,9 +270,9 @@ static int64_t video_duration_estimate(const InputStream *ist, const AVFrame *fr static int hwaccel_retrieve_data(AVCodecContext *avctx, AVFrame *input) { - InputStream *ist = avctx->opaque; + DecoderPriv *dp = avctx->opaque; AVFrame *output = NULL; - enum AVPixelFormat output_format = ist->hwaccel_output_format; + enum AVPixelFormat output_format = dp->hwaccel_output_format; int err; if (input->format == output_format) { @@ -746,8 +749,7 @@ finish: static enum AVPixelFormat get_format(AVCodecContext *s, const enum AVPixelFormat *pix_fmts) { - InputStream *ist = s->opaque; - DecoderPriv *dp = dp_from_dec(ist->decoder); + DecoderPriv *dp = s->opaque; const enum AVPixelFormat *p; for (p = pix_fmts; *p != AV_PIX_FMT_NONE; p++) { @@ -758,8 +760,8 @@ static enum AVPixelFormat get_format(AVCodecContext *s, const enum AVPixelFormat if (!(desc->flags & AV_PIX_FMT_FLAG_HWACCEL)) break; - if (ist->hwaccel_id == HWACCEL_GENERIC || - ist->hwaccel_id == HWACCEL_AUTO) { + if (dp->hwaccel_id == HWACCEL_GENERIC || + dp->hwaccel_id == HWACCEL_AUTO) { for (i = 0;; i++) { config = avcodec_get_hw_config(s->codec, i); if (!config) @@ -771,7 +773,7 @@ static enum AVPixelFormat get_format(AVCodecContext *s, const enum AVPixelFormat break; } } - if (config && config->device_type == ist->hwaccel_device_type) { + if (config && config->device_type == dp->hwaccel_device_type) { dp->hwaccel_pix_fmt = *p; break; } @@ -797,21 +799,22 @@ static HWDevice *hw_device_match_by_codec(const AVCodec *codec) } } -static int hw_device_setup_for_decode(InputStream *ist, DecoderPriv *dp) +static int hw_device_setup_for_decode(InputStream *ist, DecoderPriv *dp, + const char *hwaccel_device) { const AVCodecHWConfig *config; enum AVHWDeviceType type; HWDevice *dev = NULL; int err, auto_device = 0; - if (ist->hwaccel_device) { - dev = hw_device_get_by_name(ist->hwaccel_device); + if (hwaccel_device) { + dev = hw_device_get_by_name(hwaccel_device); if (!dev) { - if (ist->hwaccel_id == HWACCEL_AUTO) { + if (dp->hwaccel_id == HWACCEL_AUTO) { auto_device = 1; - } else if (ist->hwaccel_id == HWACCEL_GENERIC) { - type = ist->hwaccel_device_type; - err = hw_device_init_from_type(type, ist->hwaccel_device, + } else if (dp->hwaccel_id == HWACCEL_GENERIC) { + type = dp->hwaccel_device_type; + err = hw_device_init_from_type(type, hwaccel_device, &dev); } else { // This will be dealt with by API-specific initialisation @@ -819,22 +822,22 @@ static int hw_device_setup_for_decode(InputStream *ist, DecoderPriv *dp) return 0; } } else { - if (ist->hwaccel_id == HWACCEL_AUTO) { - ist->hwaccel_device_type = dev->type; - } else if (ist->hwaccel_device_type != dev->type) { + if (dp->hwaccel_id == HWACCEL_AUTO) { + dp->hwaccel_device_type = dev->type; + } else if (dp->hwaccel_device_type != dev->type) { av_log(dp, AV_LOG_ERROR, "Invalid hwaccel device " "specified for decoder: device %s of type %s is not " "usable with hwaccel %s.\n", dev->name, av_hwdevice_get_type_name(dev->type), - av_hwdevice_get_type_name(ist->hwaccel_device_type)); + av_hwdevice_get_type_name(dp->hwaccel_device_type)); return AVERROR(EINVAL); } } } else { - if (ist->hwaccel_id == HWACCEL_AUTO) { + if (dp->hwaccel_id == HWACCEL_AUTO) { auto_device = 1; - } else if (ist->hwaccel_id == HWACCEL_GENERIC) { - type = ist->hwaccel_device_type; + } else if (dp->hwaccel_id == HWACCEL_GENERIC) { + type = dp->hwaccel_device_type; dev = hw_device_get_by_type(type); // When "-qsv_device device" is used, an internal QSV device named @@ -884,17 +887,17 @@ static int hw_device_setup_for_decode(InputStream *ist, DecoderPriv *dp) break; type = config->device_type; // Try to make a new device of this type. - err = hw_device_init_from_type(type, ist->hwaccel_device, + err = hw_device_init_from_type(type, hwaccel_device, &dev); if (err < 0) { // Can't make a device of this type. continue; } - if (ist->hwaccel_device) { + if (hwaccel_device) { av_log(dp, AV_LOG_INFO, "Using auto " "hwaccel type %s with new device created " "from %s.\n", av_hwdevice_get_type_name(type), - ist->hwaccel_device); + hwaccel_device); } else { av_log(dp, AV_LOG_INFO, "Using auto " "hwaccel type %s with new default device.\n", @@ -902,11 +905,11 @@ static int hw_device_setup_for_decode(InputStream *ist, DecoderPriv *dp) } } if (dev) { - ist->hwaccel_device_type = type; + dp->hwaccel_device_type = type; } else { av_log(dp, AV_LOG_INFO, "Auto hwaccel " "disabled: no device found.\n"); - ist->hwaccel_id = HWACCEL_NONE; + dp->hwaccel_id = HWACCEL_NONE; return 0; } } @@ -940,7 +943,7 @@ static const AVClass dec_class = { }; int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx, - AVDictionary **dec_opts, int flags) + AVDictionary **dec_opts, int flags, const DecoderOpts *o) { DecoderPriv *dp; const AVCodec *codec = ist->dec; @@ -958,6 +961,10 @@ int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx, dp->dec.class = &dec_class; dp->log_parent = ist; + dp->hwaccel_id = o->hwaccel_id; + dp->hwaccel_device_type = o->hwaccel_device_type; + dp->hwaccel_output_format = o->hwaccel_output_format; + snprintf(dp->log_name, sizeof(dp->log_name), "dec:%s", codec->name); if (codec->type == AVMEDIA_TYPE_SUBTITLE && @@ -984,7 +991,7 @@ int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx, return ret; } - dp->dec_ctx->opaque = ist; + dp->dec_ctx->opaque = dp; dp->dec_ctx->get_format = get_format; if (dp->dec_ctx->codec_id == AV_CODEC_ID_DVB_SUBTITLE && @@ -1005,7 +1012,7 @@ int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx, av_dict_set(dec_opts, "flags", "+copy_opaque", AV_DICT_MULTIKEY); - ret = hw_device_setup_for_decode(ist, dp); + ret = hw_device_setup_for_decode(ist, dp, o->hwaccel_device); if (ret < 0) { av_log(dp, AV_LOG_ERROR, "Hardware device setup failed for decoder: %s\n", diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index 729d7e476b..0f426e3c2e 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -72,6 +72,8 @@ typedef struct DemuxStream { const AVCodecDescriptor *codec_desc; + DecoderOpts dec_opts; + AVBSFContext *bsf; /* number of packets successfully read for this stream */ @@ -823,7 +825,7 @@ static void ist_free(InputStream **pist) av_dict_free(&ist->decoder_opts); av_freep(&ist->filters); av_freep(&ist->outputs); - av_freep(&ist->hwaccel_device); + av_freep(&ds->dec_opts.hwaccel_device); avcodec_parameters_free(&ist->par); @@ -905,7 +907,7 @@ static int ist_use(InputStream *ist, int decoding_needed) return ret; ret = dec_open(ist, d->sch, ds->sch_idx_dec, - &ist->decoder_opts, dec_flags); + &ist->decoder_opts, dec_flags, &ds->dec_opts); if (ret < 0) return ret; @@ -1166,25 +1168,25 @@ static int ist_add(const OptionsContext *o, Demuxer *d, AVStream *st) "WARNING: defaulting hwaccel_output_format to cuda for compatibility " "with old commandlines. This behaviour is DEPRECATED and will be removed " "in the future. Please explicitly set \"-hwaccel_output_format cuda\".\n"); - ist->hwaccel_output_format = AV_PIX_FMT_CUDA; + ds->dec_opts.hwaccel_output_format = AV_PIX_FMT_CUDA; } else if (!hwaccel_output_format && hwaccel && !strcmp(hwaccel, "qsv")) { av_log(ist, AV_LOG_WARNING, "WARNING: defaulting hwaccel_output_format to qsv for compatibility " "with old commandlines. This behaviour is DEPRECATED and will be removed " "in the future. Please explicitly set \"-hwaccel_output_format qsv\".\n"); - ist->hwaccel_output_format = AV_PIX_FMT_QSV; + ds->dec_opts.hwaccel_output_format = AV_PIX_FMT_QSV; } else if (!hwaccel_output_format && hwaccel && !strcmp(hwaccel, "mediacodec")) { // There is no real AVHWFrameContext implementation. Set // hwaccel_output_format to avoid av_hwframe_transfer_data error. - ist->hwaccel_output_format = AV_PIX_FMT_MEDIACODEC; + ds->dec_opts.hwaccel_output_format = AV_PIX_FMT_MEDIACODEC; } else if (hwaccel_output_format) { - ist->hwaccel_output_format = av_get_pix_fmt(hwaccel_output_format); - if (ist->hwaccel_output_format == AV_PIX_FMT_NONE) { + ds->dec_opts.hwaccel_output_format = av_get_pix_fmt(hwaccel_output_format); + if (ds->dec_opts.hwaccel_output_format == AV_PIX_FMT_NONE) { av_log(ist, AV_LOG_FATAL, "Unrecognised hwaccel output " "format: %s", hwaccel_output_format); } } else { - ist->hwaccel_output_format = AV_PIX_FMT_NONE; + ds->dec_opts.hwaccel_output_format = AV_PIX_FMT_NONE; } if (hwaccel) { @@ -1193,17 +1195,17 @@ static int ist_add(const OptionsContext *o, Demuxer *d, AVStream *st) hwaccel = "cuda"; if (!strcmp(hwaccel, "none")) - ist->hwaccel_id = HWACCEL_NONE; + ds->dec_opts.hwaccel_id = HWACCEL_NONE; else if (!strcmp(hwaccel, "auto")) - ist->hwaccel_id = HWACCEL_AUTO; + ds->dec_opts.hwaccel_id = HWACCEL_AUTO; else { enum AVHWDeviceType type = av_hwdevice_find_type_by_name(hwaccel); if (type != AV_HWDEVICE_TYPE_NONE) { - ist->hwaccel_id = HWACCEL_GENERIC; - ist->hwaccel_device_type = type; + ds->dec_opts.hwaccel_id = HWACCEL_GENERIC; + ds->dec_opts.hwaccel_device_type = type; } - if (!ist->hwaccel_id) { + if (!ds->dec_opts.hwaccel_id) { av_log(ist, AV_LOG_FATAL, "Unrecognized hwaccel: %s.\n", hwaccel); av_log(ist, AV_LOG_FATAL, "Supported hwaccels: "); @@ -1220,14 +1222,14 @@ static int ist_add(const OptionsContext *o, Demuxer *d, AVStream *st) MATCH_PER_STREAM_OPT(hwaccel_devices, str, hwaccel_device, ic, st); if (hwaccel_device) { - ist->hwaccel_device = av_strdup(hwaccel_device); - if (!ist->hwaccel_device) + ds->dec_opts.hwaccel_device = av_strdup(hwaccel_device); + if (!ds->dec_opts.hwaccel_device) return AVERROR(ENOMEM); } } - ret = choose_decoder(o, ic, st, ist->hwaccel_id, ist->hwaccel_device_type, - &ist->dec); + ret = choose_decoder(o, ic, st, ds->dec_opts.hwaccel_id, + ds->dec_opts.hwaccel_device_type, &ist->dec); if (ret < 0) return ret;

1 0

fftools/ffmpeg: move hwaccel_retrieve_data() from ffmpeg_hw to ffmpeg_dec
by Anton Khirnov 30 Jan '24

30 Jan '24

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Wed Jan 17 11:09:27 2024 +0100| [a3a9c4ae66e474c51aa36b9c0b8ee5c1419559f1] | committer: Anton Khirnov fftools/ffmpeg: move hwaccel_retrieve_data() from ffmpeg_hw to ffmpeg_dec This function is decoding-only and has no interaction with the rest of ffmpeg_hw. It thus belongs more properly in ffmpeg_dec. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a3a9c4ae66e474c51… --- fftools/ffmpeg.h | 2 -- fftools/ffmpeg_dec.c | 42 ++++++++++++++++++++++++++++++++++++++++++ fftools/ffmpeg_hw.c | 42 ------------------------------------------ 3 files changed, 42 insertions(+), 44 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index e87af70698..80c09d1662 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -731,8 +731,6 @@ void hw_device_free_all(void); */ AVBufferRef *hw_device_for_filter(void); -int hwaccel_retrieve_data(AVCodecContext *avctx, AVFrame *input); - /** * @param dec_opts Dictionary filled with decoder options. Its ownership * is transferred to the decoder. diff --git a/fftools/ffmpeg_dec.c b/fftools/ffmpeg_dec.c index 6eb3213161..b66c0e35ee 100644 --- a/fftools/ffmpeg_dec.c +++ b/fftools/ffmpeg_dec.c @@ -265,6 +265,48 @@ static int64_t video_duration_estimate(const InputStream *ist, const AVFrame *fr return FFMAX(dp->last_frame_duration_est, 1); } +static int hwaccel_retrieve_data(AVCodecContext *avctx, AVFrame *input) +{ + InputStream *ist = avctx->opaque; + AVFrame *output = NULL; + enum AVPixelFormat output_format = ist->hwaccel_output_format; + int err; + + if (input->format == output_format) { + // Nothing to do. + return 0; + } + + output = av_frame_alloc(); + if (!output) + return AVERROR(ENOMEM); + + output->format = output_format; + + err = av_hwframe_transfer_data(output, input, 0); + if (err < 0) { + av_log(avctx, AV_LOG_ERROR, "Failed to transfer data to " + "output frame: %d.\n", err); + goto fail; + } + + err = av_frame_copy_props(output, input); + if (err < 0) { + av_frame_unref(output); + goto fail; + } + + av_frame_unref(input); + av_frame_move_ref(input, output); + av_frame_free(&output); + + return 0; + +fail: + av_frame_free(&output); + return err; +} + static int video_frame_process(InputStream *ist, AVFrame *frame) { DecoderPriv *dp = dp_from_dec(ist->decoder); diff --git a/fftools/ffmpeg_hw.c b/fftools/ffmpeg_hw.c index 46bc7e39c2..8608d24517 100644 --- a/fftools/ffmpeg_hw.c +++ b/fftools/ffmpeg_hw.c @@ -297,48 +297,6 @@ void hw_device_free_all(void) nb_hw_devices = 0; } -int hwaccel_retrieve_data(AVCodecContext *avctx, AVFrame *input) -{ - InputStream *ist = avctx->opaque; - AVFrame *output = NULL; - enum AVPixelFormat output_format = ist->hwaccel_output_format; - int err; - - if (input->format == output_format) { - // Nothing to do. - return 0; - } - - output = av_frame_alloc(); - if (!output) - return AVERROR(ENOMEM); - - output->format = output_format; - - err = av_hwframe_transfer_data(output, input, 0); - if (err < 0) { - av_log(avctx, AV_LOG_ERROR, "Failed to transfer data to " - "output frame: %d.\n", err); - goto fail; - } - - err = av_frame_copy_props(output, input); - if (err < 0) { - av_frame_unref(output); - goto fail; - } - - av_frame_unref(input); - av_frame_move_ref(input, output); - av_frame_free(&output); - - return 0; - -fail: - av_frame_free(&output); - return err; -} - AVBufferRef *hw_device_for_filter(void) { // Pick the last hardware device if the user doesn't pick the device for

1 0

fftools/ffmpeg_dec: replace InputFile.format_nots with a decoder flag
by Anton Khirnov 30 Jan '24

30 Jan '24

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Wed Jan 17 11:00:26 2024 +0100| [ebb8a58c8f24ddc548388500b6d9e9bacd241c05] | committer: Anton Khirnov fftools/ffmpeg_dec: replace InputFile.format_nots with a decoder flag Reduces the need to access InputFile from decoding. This is a step towards decoupling Decoder and InputStream. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ebb8a58c8f24ddc54… --- fftools/ffmpeg.h | 5 ++--- fftools/ffmpeg_dec.c | 8 ++++---- fftools/ffmpeg_demux.c | 5 ++--- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 8b7560b359..e87af70698 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -282,6 +282,8 @@ typedef struct FilterGraph { enum DecoderFlags { DECODER_FLAG_FIX_SUB_DURATION = (1 << 0), + // input timestamps are unreliable (guessed by demuxer) + DECODER_FLAG_TS_UNRELIABLE = (1 << 1), }; typedef struct Decoder { @@ -362,9 +364,6 @@ typedef struct InputFile { int index; - // input format has no timestamps - int format_nots; - AVFormatContext *ctx; int64_t input_ts_offset; int input_sync_ref; diff --git a/fftools/ffmpeg_dec.c b/fftools/ffmpeg_dec.c index e6a2d92c81..6eb3213161 100644 --- a/fftools/ffmpeg_dec.c +++ b/fftools/ffmpeg_dec.c @@ -216,7 +216,7 @@ static void audio_ts_process(DecoderPriv *dp, AVFrame *frame) static int64_t video_duration_estimate(const InputStream *ist, const AVFrame *frame) { const DecoderPriv *dp = dp_from_dec(ist->decoder); - const InputFile *ifile = ist->file; + const int ts_unreliable = dp->flags & DECODER_FLAG_TS_UNRELIABLE; int64_t codec_duration = 0; // XXX lavf currently makes up frame durations when they are not provided by @@ -226,7 +226,7 @@ static int64_t video_duration_estimate(const InputStream *ist, const AVFrame *fr // durations, then this should be simplified. // prefer frame duration for containers with timestamps - if (frame->duration > 0 && (!ifile->format_nots || ist->framerate.num)) + if (frame->duration > 0 && (!ts_unreliable || ist->framerate.num)) return frame->duration; if (dp->dec_ctx->framerate.den && dp->dec_ctx->framerate.num) { @@ -238,7 +238,7 @@ static int64_t video_duration_estimate(const InputStream *ist, const AVFrame *fr } // prefer codec-layer duration for containers without timestamps - if (codec_duration > 0 && ifile->format_nots) + if (codec_duration > 0 && ts_unreliable) return codec_duration; // when timestamps are available, repeat last frame's actual duration @@ -466,7 +466,7 @@ static int packet_decode(InputStream *ist, AVPacket *pkt, AVFrame *frame) if (pkt && pkt->size == 0) return 0; - if (pkt && ifile->format_nots) { + if (pkt && (dp->flags & DECODER_FLAG_TS_UNRELIABLE)) { pkt->pts = AV_NOPTS_VALUE; pkt->dts = AV_NOPTS_VALUE; } diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index d804358d55..729d7e476b 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -891,7 +891,8 @@ static int ist_use(InputStream *ist, int decoding_needed) if (decoding_needed && ds->sch_idx_dec < 0) { int is_audio = ist->st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO; - int dec_flags = !!ist->fix_sub_duration * DECODER_FLAG_FIX_SUB_DURATION; + int dec_flags = (!!ist->fix_sub_duration * DECODER_FLAG_FIX_SUB_DURATION) | + (!!(d->f.ctx->iformat->flags & AVFMT_NOTIMESTAMPS) * DECODER_FLAG_TS_UNRELIABLE); ret = sch_add_dec(d->sch, decoder_thread, ist, d->loop && is_audio); if (ret < 0) @@ -1698,8 +1699,6 @@ int ifile_open(const OptionsContext *o, const char *filename, Scheduler *sch) d->min_pts = (Timestamp){ .ts = AV_NOPTS_VALUE, .tb = (AVRational){ 1, 1 } }; d->max_pts = (Timestamp){ .ts = AV_NOPTS_VALUE, .tb = (AVRational){ 1, 1 } }; - f->format_nots = !!(ic->iformat->flags & AVFMT_NOTIMESTAMPS); - d->readrate = o->readrate ? o->readrate : 0.0; if (d->readrate < 0.0f) { av_log(d, AV_LOG_ERROR, "Option -readrate is %0.3f; it must be non-negative.\n", d->readrate);

1 0