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

fftools/ffmpeg: refactor disabling decoder threading for attached pictures
by Anton Khirnov 30 Jan '24

30 Jan '24

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Wed Jan 17 10:53:19 2024 +0100| [a938f47916f1035a9d89e3b0ce9fbf04915956d9] | committer: Anton Khirnov fftools/ffmpeg: refactor disabling decoder threading for attached pictures * as this decision is based on demuxing information, move it from the decoder to the demuxer * as the issue being addressed is latency added by frame threading, we only need to disable frame threading, not all threading > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a938f47916f1035a9… --- fftools/ffmpeg_dec.c | 3 --- fftools/ffmpeg_demux.c | 5 +++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/fftools/ffmpeg_dec.c b/fftools/ffmpeg_dec.c index 52d966008e..e6a2d92c81 100644 --- a/fftools/ffmpeg_dec.c +++ b/fftools/ffmpeg_dec.c @@ -960,9 +960,6 @@ int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx, if (!av_dict_get(*dec_opts, "threads", NULL, 0)) av_dict_set(dec_opts, "threads", "auto", 0); - /* Attached pics are sparse, therefore we would not want to delay their decoding till EOF. */ - if (ist->st->disposition & AV_DISPOSITION_ATTACHED_PIC) - av_dict_set(dec_opts, "threads", "1", 0); av_dict_set(dec_opts, "flags", "+copy_opaque", AV_DICT_MULTIKEY); diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index 02add669a0..d804358d55 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -1259,6 +1259,11 @@ static int ist_add(const OptionsContext *o, Demuxer *d, AVStream *st) if (o->bitexact) av_dict_set(&ist->decoder_opts, "flags", "+bitexact", AV_DICT_MULTIKEY); + /* Attached pics are sparse, therefore we would not want to delay their decoding + * till EOF. */ + if (ist->st->disposition & AV_DISPOSITION_ATTACHED_PIC) + av_dict_set(&ist->decoder_opts, "thread_type", "-frame", 0); + switch (par->codec_type) { case AVMEDIA_TYPE_VIDEO: MATCH_PER_STREAM_OPT(frame_rates, str, framerate, ic, st);

1 0

fftools/ffmpeg_dec: stop accesing InputStream.fix_sub_duration
by Anton Khirnov 30 Jan '24

30 Jan '24

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Wed Jan 17 10:44:52 2024 +0100| [474ca6c71e84b283fe72760ef368d5d730888dab] | committer: Anton Khirnov fftools/ffmpeg_dec: stop accesing InputStream.fix_sub_duration Pass this information to dec_open() instead. This is a step towards decoupling Decoder and InputStream. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=474ca6c71e84b283f… --- fftools/ffmpeg.h | 6 +++++- fftools/ffmpeg_dec.c | 13 +++++++++---- fftools/ffmpeg_demux.c | 3 ++- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index db9bd8cc7a..8b7560b359 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -280,6 +280,10 @@ typedef struct FilterGraph { int nb_outputs; } FilterGraph; +enum DecoderFlags { + DECODER_FLAG_FIX_SUB_DURATION = (1 << 0), +}; + typedef struct Decoder { const AVClass *class; @@ -735,7 +739,7 @@ int hwaccel_retrieve_data(AVCodecContext *avctx, AVFrame *input); * is transferred to the decoder. */ int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx, - AVDictionary **dec_opts); + AVDictionary **dec_opts, int flags); 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 2fb9e45529..52d966008e 100644 --- a/fftools/ffmpeg_dec.c +++ b/fftools/ffmpeg_dec.c @@ -45,6 +45,9 @@ typedef struct DecoderPriv { // override output video sample aspect ratio with this value AVRational sar_override; + // a combination of DECODER_FLAG_*, provided to dec_open() + int flags; + enum AVPixelFormat hwaccel_pix_fmt; // pts/estimated duration of the last decoded frame @@ -326,7 +329,7 @@ static int process_subtitle(InputStream *ist, AVFrame *frame) const AVSubtitle *subtitle = (AVSubtitle*)frame->buf[0]->data; int ret = 0; - if (ist->fix_sub_duration) { + if (dp->flags & DECODER_FLAG_FIX_SUB_DURATION) { AVSubtitle *sub_prev = dp->sub_prev[0]->buf[0] ? (AVSubtitle*)dp->sub_prev[0]->buf[0]->data : NULL; int end = 1; @@ -372,7 +375,7 @@ static int fix_sub_duration_heartbeat(InputStream *ist, int64_t signal_pts) (AVSubtitle*)dp->sub_prev[0]->buf[0]->data : NULL; AVSubtitle *subtitle; - if (!ist->fix_sub_duration || !prev_subtitle || + if (!(dp->flags & DECODER_FLAG_FIX_SUB_DURATION) || !prev_subtitle || !prev_subtitle->num_rects || signal_pts <= prev_subtitle->pts) return 0; @@ -895,7 +898,7 @@ static const AVClass dec_class = { }; int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx, - AVDictionary **dec_opts) + AVDictionary **dec_opts, int flags) { DecoderPriv *dp; const AVCodec *codec = ist->dec; @@ -909,12 +912,14 @@ int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx, dp->sch = sch; dp->sch_idx = sch_idx; + dp->flags = flags; dp->dec.class = &dec_class; dp->log_parent = ist; snprintf(dp->log_name, sizeof(dp->log_name), "dec:%s", codec->name); - if (codec->type == AVMEDIA_TYPE_SUBTITLE && ist->fix_sub_duration) { + 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++) { dp->sub_prev[i] = av_frame_alloc(); if (!dp->sub_prev[i]) diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index a58217223b..02add669a0 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -891,6 +891,7 @@ 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; ret = sch_add_dec(d->sch, decoder_thread, ist, d->loop && is_audio); if (ret < 0) @@ -903,7 +904,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); + &ist->decoder_opts, dec_flags); if (ret < 0) return ret;

1 0

fftools/ffmpeg_dec: override video SAR with AVCodecParameters value
by Anton Khirnov 30 Jan '24

30 Jan '24

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Wed Jan 17 10:33:00 2024 +0100| [924a6f3cc7788e2d258348b1547a49805091ea2d] | committer: Anton Khirnov fftools/ffmpeg_dec: override video SAR with AVCodecParameters value Rather than access the AVStream one. This is a step towards decoupling Decoder and InputStream. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=924a6f3cc7788e2d2… --- fftools/ffmpeg_dec.c | 9 +++++++-- fftools/ffmpeg_demux.c | 3 +++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/fftools/ffmpeg_dec.c b/fftools/ffmpeg_dec.c index c80b6eddea..2fb9e45529 100644 --- a/fftools/ffmpeg_dec.c +++ b/fftools/ffmpeg_dec.c @@ -42,6 +42,9 @@ typedef struct DecoderPriv { AVFrame *frame; AVPacket *pkt; + // override output video sample aspect ratio with this value + AVRational sar_override; + enum AVPixelFormat hwaccel_pix_fmt; // pts/estimated duration of the last decoded frame @@ -311,8 +314,8 @@ static int video_frame_process(InputStream *ist, AVFrame *frame) frame->time_base.num, frame->time_base.den); } - if (ist->st->sample_aspect_ratio.num) - frame->sample_aspect_ratio = ist->st->sample_aspect_ratio; + if (dp->sar_override.num) + frame->sample_aspect_ratio = dp->sar_override; return 0; } @@ -922,6 +925,8 @@ int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx, return AVERROR(ENOMEM); } + dp->sar_override = ist->par->sample_aspect_ratio; + dp->dec_ctx = avcodec_alloc_context3(codec); if (!dp->dec_ctx) return AVERROR(ENOMEM); diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index 11db118b72..a58217223b 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -1336,6 +1336,9 @@ static int ist_add(const OptionsContext *o, Demuxer *d, AVStream *st) return ret; } + if (ist->st->sample_aspect_ratio.num) + ist->par->sample_aspect_ratio = ist->st->sample_aspect_ratio; + MATCH_PER_STREAM_OPT(bitstream_filters, str, bsfs, ic, st); if (bsfs) { ret = av_bsf_list_parse_str(bsfs, &ds->bsf);

1 0

fftools/ffmpeg: move decoder existence check to a more appropriate place
by Anton Khirnov 30 Jan '24

30 Jan '24

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Thu Jan 11 12:19:37 2024 +0100| [b2a0a2e6f531afa75c59c917c53b8ccee07d3655] | committer: Anton Khirnov fftools/ffmpeg: move decoder existence check to a more appropriate place > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b2a0a2e6f531afa75… --- fftools/ffmpeg_dec.c | 7 ------- fftools/ffmpeg_demux.c | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/fftools/ffmpeg_dec.c b/fftools/ffmpeg_dec.c index 1c5030d933..c80b6eddea 100644 --- a/fftools/ffmpeg_dec.c +++ b/fftools/ffmpeg_dec.c @@ -898,13 +898,6 @@ int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx, const AVCodec *codec = ist->dec; int ret; - if (!codec) { - av_log(ist, AV_LOG_ERROR, - "Decoding requested, but no decoder found for: %s\n", - avcodec_get_name(ist->par->codec_id)); - return AVERROR(EINVAL); - } - ret = dec_alloc(&ist->decoder); if (ret < 0) return ret; diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index 5a58bb735a..11db118b72 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -866,6 +866,13 @@ static int ist_use(InputStream *ist, int decoding_needed) return AVERROR(EINVAL); } + if (decoding_needed && !ist->dec) { + av_log(ist, AV_LOG_ERROR, + "Decoding requested, but no decoder found for: %s\n", + avcodec_get_name(ist->par->codec_id)); + return AVERROR(EINVAL); + } + if (ds->sch_idx_stream < 0) { ret = sch_add_demux_stream(d->sch, d->f.index); if (ret < 0)

1 0

fftools/ffmpeg_dec: drop a useless log message
by Anton Khirnov 30 Jan '24

30 Jan '24

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Thu Jan 11 12:05:58 2024 +0100| [217b8757db6280fae49e8c3cbbf3cdb7fcb02607] | committer: Anton Khirnov fftools/ffmpeg_dec: drop a useless log message > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=217b8757db6280fae… --- fftools/ffmpeg_dec.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/fftools/ffmpeg_dec.c b/fftools/ffmpeg_dec.c index e2d503f441..1c5030d933 100644 --- a/fftools/ffmpeg_dec.c +++ b/fftools/ffmpeg_dec.c @@ -263,18 +263,6 @@ static int video_frame_process(InputStream *ist, AVFrame *frame) { DecoderPriv *dp = dp_from_dec(ist->decoder); - if (dp->dec_ctx->width != frame->width || - dp->dec_ctx->height != frame->height || - dp->dec_ctx->pix_fmt != frame->format) { - av_log(dp, AV_LOG_DEBUG, "Frame parameters mismatch context %d,%d,%d != %d,%d,%d\n", - frame->width, - frame->height, - frame->format, - dp->dec_ctx->width, - dp->dec_ctx->height, - dp->dec_ctx->pix_fmt); - } - #if FFMPEG_OPT_TOP if(ist->top_field_first>=0) { av_log(dp, AV_LOG_WARNING, "-top is deprecated, use the setfield filter instead\n");

1 0

fftools/ffmpeg_dec: drop useless and racy code
by Anton Khirnov 30 Jan '24

30 Jan '24

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Thu Jan 11 12:04:56 2024 +0100| [27de2aacd15c78015327cfcc7e890b25d5295b02] | committer: Anton Khirnov fftools/ffmpeg_dec: drop useless and racy code Setting demuxer's video_delay from the decoder cannot accomplish anything meaningful and is racy, as they run in different threads. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=27de2aacd15c78015… --- fftools/ffmpeg_dec.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/fftools/ffmpeg_dec.c b/fftools/ffmpeg_dec.c index 58be466e4c..e2d503f441 100644 --- a/fftools/ffmpeg_dec.c +++ b/fftools/ffmpeg_dec.c @@ -263,21 +263,6 @@ static int video_frame_process(InputStream *ist, AVFrame *frame) { DecoderPriv *dp = dp_from_dec(ist->decoder); - // The following line may be required in some cases where there is no parser - // or the parser does not has_b_frames correctly - if (ist->par->video_delay < dp->dec_ctx->has_b_frames) { - if (dp->dec_ctx->codec_id == AV_CODEC_ID_H264) { - ist->par->video_delay = dp->dec_ctx->has_b_frames; - } else - av_log(dp->dec_ctx, AV_LOG_WARNING, - "video_delay is larger in decoder than demuxer %d > %d.\n" - "If you want to help, upload a sample " - "of this file to https://streams.videolan.org/upload/ " - "and contact the ffmpeg-devel mailing list. (ffmpeg-devel(a)ffmpeg.org)\n", - dp->dec_ctx->has_b_frames, - ist->par->video_delay); - } - if (dp->dec_ctx->width != frame->width || dp->dec_ctx->height != frame->height || dp->dec_ctx->pix_fmt != frame->format) {

1 0

fftools/ffmpeg_dec: move decoding counters from InputStream to Decoder
by Anton Khirnov 30 Jan '24

30 Jan '24

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Thu Jan 11 10:45:18 2024 +0100| [9be3f80527e2d5918825f1405b720d5f6dcb5e16] | committer: Anton Khirnov fftools/ffmpeg_dec: move decoding counters from InputStream to Decoder This is a step towards decoupling Decoder and InputStream. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9be3f80527e2d5918… --- fftools/ffmpeg.h | 11 +++++------ fftools/ffmpeg_dec.c | 16 ++++++++-------- fftools/ffmpeg_demux.c | 4 ++-- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 227929b022..db9bd8cc7a 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -285,6 +285,11 @@ typedef struct Decoder { const uint8_t *subtitle_header; int subtitle_header_size; + + // number of frames/samples retrieved from the decoder + uint64_t frames_decoded; + uint64_t samples_decoded; + uint64_t decode_errors; } Decoder; typedef struct InputStream { @@ -346,12 +351,6 @@ typedef struct InputStream { enum AVHWDeviceType hwaccel_device_type; char *hwaccel_device; enum AVPixelFormat hwaccel_output_format; - - /* stats */ - // number of frames/samples retrieved from the decoder - uint64_t frames_decoded; - uint64_t samples_decoded; - uint64_t decode_errors; } InputStream; typedef struct InputFile { diff --git a/fftools/ffmpeg_dec.c b/fftools/ffmpeg_dec.c index 8a7d82244b..58be466e4c 100644 --- a/fftools/ffmpeg_dec.c +++ b/fftools/ffmpeg_dec.c @@ -445,14 +445,14 @@ static int transcode_subtitles(InputStream *ist, const AVPacket *pkt, if (ret < 0) { av_log(dp, AV_LOG_ERROR, "Error decoding subtitles: %s\n", av_err2str(ret)); - ist->decode_errors++; + dp->dec.decode_errors++; return exit_on_error ? ret : 0; } if (!got_output) return pkt ? 0 : AVERROR_EOF; - ist->frames_decoded++; + dp->dec.frames_decoded++; // XXX the queue for transferring data to consumers runs // on AVFrames, so we wrap AVSubtitle in an AVBufferRef and put that @@ -512,7 +512,7 @@ static int packet_decode(InputStream *ist, AVPacket *pkt, AVFrame *frame) pkt ? "packet" : "EOF", av_err2str(ret)); if (ret != AVERROR_EOF) { - ist->decode_errors++; + dp->dec.decode_errors++; if (!exit_on_error) ret = 0; } @@ -537,7 +537,7 @@ static int packet_decode(InputStream *ist, AVPacket *pkt, AVFrame *frame) return ret; } else if (ret < 0) { av_log(dp, AV_LOG_ERROR, "Decoding error: %s\n", av_err2str(ret)); - ist->decode_errors++; + dp->dec.decode_errors++; if (exit_on_error) return ret; @@ -567,7 +567,7 @@ static int packet_decode(InputStream *ist, AVPacket *pkt, AVFrame *frame) frame->time_base = dec->pkt_timebase; if (dec->codec_type == AVMEDIA_TYPE_AUDIO) { - ist->samples_decoded += frame->nb_samples; + dp->dec.samples_decoded += frame->nb_samples; audio_ts_process(dp, frame); } else { @@ -579,7 +579,7 @@ static int packet_decode(InputStream *ist, AVPacket *pkt, AVFrame *frame) } } - ist->frames_decoded++; + dp->dec.frames_decoded++; ret = sch_dec_send(dp->sch, dp->sch_idx, frame); if (ret < 0) { @@ -707,8 +707,8 @@ void *decoder_thread(void *arg) } ret = 0; - err_rate = (ist->frames_decoded || ist->decode_errors) ? - ist->decode_errors / (ist->frames_decoded + ist->decode_errors) : 0.f; + err_rate = (dp->dec.frames_decoded || dp->dec.decode_errors) ? + dp->dec.decode_errors / (dp->dec.frames_decoded + dp->dec.decode_errors) : 0.f; if (err_rate > max_error_rate) { av_log(dp, AV_LOG_FATAL, "Decode error rate %g exceeds maximum %g\n", err_rate, max_error_rate); diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index b2cbde2aa5..5a58bb735a 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -796,9 +796,9 @@ static void demux_final_stats(Demuxer *d) if (ist->decoding_needed) { av_log(f, AV_LOG_VERBOSE, "%"PRIu64" frames decoded; %"PRIu64" decode errors", - ist->frames_decoded, ist->decode_errors); + ist->decoder->frames_decoded, ist->decoder->decode_errors); if (type == AVMEDIA_TYPE_AUDIO) - av_log(f, AV_LOG_VERBOSE, " (%"PRIu64" samples)", ist->samples_decoded); + av_log(f, AV_LOG_VERBOSE, " (%"PRIu64" samples)", ist->decoder->samples_decoded); av_log(f, AV_LOG_VERBOSE, "; "); }

1 0

fftools/ffmpeg_dec: pass decoder options as an argument to dec_open()
by Anton Khirnov 30 Jan '24

30 Jan '24

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Thu Jan 11 10:45:18 2024 +0100| [5b0e4f945eadb0c416180c0e20f5622062cc16f4] | committer: Anton Khirnov fftools/ffmpeg_dec: pass decoder options as an argument to dec_open() Rather than access the dictionary in InputStream. This is a step towards decoupling Decoder and InputStream. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5b0e4f945eadb0c41… --- fftools/ffmpeg.h | 7 ++++++- fftools/ffmpeg_dec.c | 17 +++++++++-------- fftools/ffmpeg_demux.c | 3 ++- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 9e29ae1785..227929b022 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -731,7 +731,12 @@ AVBufferRef *hw_device_for_filter(void); int hwaccel_retrieve_data(AVCodecContext *avctx, AVFrame *input); -int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx); +/** + * @param dec_opts Dictionary filled with decoder options. Its ownership + * is transferred to the decoder. + */ +int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx, + AVDictionary **dec_opts); 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 3323493475..8a7d82244b 100644 --- a/fftools/ffmpeg_dec.c +++ b/fftools/ffmpeg_dec.c @@ -918,7 +918,8 @@ static const AVClass dec_class = { .item_name = dec_item_name, }; -int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx) +int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx, + AVDictionary **dec_opts) { DecoderPriv *dp; const AVCodec *codec = ist->dec; @@ -970,7 +971,7 @@ int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx) if (dp->dec_ctx->codec_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); + 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 " @@ -981,13 +982,13 @@ int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx) * audio, and video decoders such as cuvid or mediacodec */ dp->dec_ctx->pkt_timebase = ist->st->time_base; - if (!av_dict_get(ist->decoder_opts, "threads", NULL, 0)) - av_dict_set(&ist->decoder_opts, "threads", "auto", 0); + if (!av_dict_get(*dec_opts, "threads", NULL, 0)) + av_dict_set(dec_opts, "threads", "auto", 0); /* Attached pics are sparse, therefore we would not want to delay their decoding till EOF. */ if (ist->st->disposition & AV_DISPOSITION_ATTACHED_PIC) - av_dict_set(&ist->decoder_opts, "threads", "1", 0); + av_dict_set(dec_opts, "threads", "1", 0); - av_dict_set(&ist->decoder_opts, "flags", "+copy_opaque", AV_DICT_MULTIKEY); + av_dict_set(dec_opts, "flags", "+copy_opaque", AV_DICT_MULTIKEY); ret = hw_device_setup_for_decode(ist, dp); if (ret < 0) { @@ -997,13 +998,13 @@ int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx) return ret; } - if ((ret = avcodec_open2(dp->dec_ctx, codec, &ist->decoder_opts)) < 0) { + if ((ret = avcodec_open2(dp->dec_ctx, codec, dec_opts)) < 0) { av_log(dp, AV_LOG_ERROR, "Error while opening decoder: %s\n", av_err2str(ret)); return ret; } - ret = check_avoptions(ist->decoder_opts); + ret = check_avoptions(*dec_opts); if (ret < 0) return ret; diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index 8e904d2150..b2cbde2aa5 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -895,7 +895,8 @@ static int ist_use(InputStream *ist, int decoding_needed) if (ret < 0) return ret; - ret = dec_open(ist, d->sch, ds->sch_idx_dec); + ret = dec_open(ist, d->sch, ds->sch_idx_dec, + &ist->decoder_opts); if (ret < 0) return ret;

1 0

fftools/ffmpeg_dec: add an AVClass to Decoder
by Anton Khirnov 30 Jan '24

30 Jan '24

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Thu Jan 11 10:45:18 2024 +0100| [7ecd45587fbcb004a68ac4f75a5c4290b3f64d1f] | committer: Anton Khirnov fftools/ffmpeg_dec: add an AVClass to Decoder Log decoder messages to the decoder rather than InputStream. This is a step towards decoupling Decoder and InputStream. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7ecd45587fbcb004a… --- fftools/ffmpeg.h | 2 ++ fftools/ffmpeg_dec.c | 92 +++++++++++++++++++++++++++++++++------------------- 2 files changed, 60 insertions(+), 34 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index f0f57d48bc..9e29ae1785 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -281,6 +281,8 @@ typedef struct FilterGraph { } FilterGraph; typedef struct Decoder { + const AVClass *class; + const uint8_t *subtitle_header; int subtitle_header_size; } Decoder; diff --git a/fftools/ffmpeg_dec.c b/fftools/ffmpeg_dec.c index 79c9a7bb7e..3323493475 100644 --- a/fftools/ffmpeg_dec.c +++ b/fftools/ffmpeg_dec.c @@ -59,6 +59,9 @@ typedef struct DecoderPriv { Scheduler *sch; unsigned sch_idx; + + void *log_parent; + char log_name[32]; } DecoderPriv; static DecoderPriv *dp_from_dec(Decoder *d) @@ -124,7 +127,7 @@ fail: return AVERROR(ENOMEM); } -static AVRational audio_samplerate_update(void *logctx, DecoderPriv *dp, +static AVRational audio_samplerate_update(DecoderPriv *dp, const AVFrame *frame) { const int prev = dp->last_frame_tb.den; @@ -139,7 +142,7 @@ static AVRational audio_samplerate_update(void *logctx, DecoderPriv *dp, gcd = av_gcd(prev, sr); if (prev / gcd >= INT_MAX / sr) { - av_log(logctx, AV_LOG_WARNING, + av_log(dp, AV_LOG_WARNING, "Audio timestamps cannot be represented exactly after " "sample rate change: %d -> %d\n", prev, sr); @@ -167,7 +170,7 @@ finish: return dp->last_frame_tb; } -static void audio_ts_process(void *logctx, DecoderPriv *dp, AVFrame *frame) +static void audio_ts_process(DecoderPriv *dp, AVFrame *frame) { AVRational tb_filter = (AVRational){1, frame->sample_rate}; AVRational tb; @@ -176,7 +179,7 @@ static void audio_ts_process(void *logctx, DecoderPriv *dp, AVFrame *frame) // on samplerate change, choose a new internal timebase for timestamp // generation that can represent timestamps from all the samplerates // seen so far - tb = audio_samplerate_update(logctx, dp, frame); + tb = audio_samplerate_update(dp, frame); pts_pred = dp->last_frame_pts == AV_NOPTS_VALUE ? 0 : dp->last_frame_pts + dp->last_frame_duration_est; @@ -278,7 +281,7 @@ static int video_frame_process(InputStream *ist, AVFrame *frame) if (dp->dec_ctx->width != frame->width || dp->dec_ctx->height != frame->height || dp->dec_ctx->pix_fmt != frame->format) { - av_log(NULL, AV_LOG_DEBUG, "Frame parameters mismatch context %d,%d,%d != %d,%d,%d\n", + av_log(dp, AV_LOG_DEBUG, "Frame parameters mismatch context %d,%d,%d != %d,%d,%d\n", frame->width, frame->height, frame->format, @@ -289,7 +292,7 @@ static int video_frame_process(InputStream *ist, AVFrame *frame) #if FFMPEG_OPT_TOP if(ist->top_field_first>=0) { - av_log(ist, 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; } #endif @@ -320,7 +323,7 @@ static int video_frame_process(InputStream *ist, AVFrame *frame) dp->last_frame_tb = frame->time_base; if (debug_ts) { - av_log(ist, AV_LOG_INFO, + av_log(dp, AV_LOG_INFO, "decoder -> pts:%s pts_time:%s " "pkt_dts:%s pkt_dts_time:%s " "duration:%s duration_time:%s " @@ -355,7 +358,7 @@ static int process_subtitle(InputStream *ist, AVFrame *frame) end = av_rescale(subtitle->pts - sub_prev->pts, 1000, AV_TIME_BASE); if (end < sub_prev->end_display_time) { - av_log(NULL, AV_LOG_DEBUG, + av_log(dp, AV_LOG_DEBUG, "Subtitle duration reduced from %"PRId32" to %d%s\n", sub_prev->end_display_time, end, end <= 0 ? ", dropping it" : ""); @@ -440,8 +443,8 @@ static int transcode_subtitles(InputStream *ist, const AVPacket *pkt, av_packet_free(&flush_pkt); if (ret < 0) { - av_log(ist, AV_LOG_ERROR, "Error decoding subtitles: %s\n", - av_err2str(ret)); + av_log(dp, AV_LOG_ERROR, "Error decoding subtitles: %s\n", + av_err2str(ret)); ist->decode_errors++; return exit_on_error ? ret : 0; } @@ -501,11 +504,11 @@ static int packet_decode(InputStream *ist, AVPacket *pkt, AVFrame *frame) // In particular, we don't expect AVERROR(EAGAIN), because we read all // decoded frames with avcodec_receive_frame() until done. if (ret == AVERROR(EAGAIN)) { - av_log(ist, AV_LOG_FATAL, "A decoder returned an unexpected error code. " - "This is a bug, please report it.\n"); + av_log(dp, AV_LOG_FATAL, "A decoder returned an unexpected error code. " + "This is a bug, please report it.\n"); return AVERROR_BUG; } - av_log(ist, AV_LOG_ERROR, "Error submitting %s to decoder: %s\n", + av_log(dp, AV_LOG_ERROR, "Error submitting %s to decoder: %s\n", pkt ? "packet" : "EOF", av_err2str(ret)); if (ret != AVERROR_EOF) { @@ -533,7 +536,7 @@ static int packet_decode(InputStream *ist, AVPacket *pkt, AVFrame *frame) } else if (ret == AVERROR_EOF) { return ret; } else if (ret < 0) { - av_log(ist, AV_LOG_ERROR, "Decoding error: %s\n", av_err2str(ret)); + av_log(dp, AV_LOG_ERROR, "Decoding error: %s\n", av_err2str(ret)); ist->decode_errors++; if (exit_on_error) @@ -543,7 +546,7 @@ static int packet_decode(InputStream *ist, AVPacket *pkt, AVFrame *frame) } if (frame->decode_error_flags || (frame->flags & AV_FRAME_FLAG_CORRUPT)) { - av_log(ist, exit_on_error ? AV_LOG_FATAL : AV_LOG_WARNING, + av_log(dp, exit_on_error ? AV_LOG_FATAL : AV_LOG_WARNING, "corrupt decoded frame\n"); if (exit_on_error) return AVERROR_INVALIDDATA; @@ -566,12 +569,12 @@ static int packet_decode(InputStream *ist, AVPacket *pkt, AVFrame *frame) if (dec->codec_type == AVMEDIA_TYPE_AUDIO) { ist->samples_decoded += frame->nb_samples; - audio_ts_process(ist, dp, frame); + audio_ts_process(dp, frame); } else { ret = video_frame_process(ist, frame); if (ret < 0) { - av_log(NULL, AV_LOG_FATAL, "Error while processing the decoded " - "data for stream #%d:%d\n", ifile->index, ist->index); + av_log(dp, AV_LOG_FATAL, + "Error while processing the decoded data\n"); return ret; } } @@ -644,7 +647,7 @@ void *decoder_thread(void *arg) (intptr_t)dt.pkt->opaque == PKT_OPAQUE_FIX_SUB_DURATION); flush_buffers = input_status >= 0 && !have_data; if (!have_data) - av_log(ist, AV_LOG_VERBOSE, "Decoder thread received %s packet\n", + av_log(dp, AV_LOG_VERBOSE, "Decoder thread received %s packet\n", flush_buffers ? "flush" : "EOF"); ret = packet_decode(ist, have_data ? dt.pkt : NULL, dt.frame); @@ -661,7 +664,7 @@ void *decoder_thread(void *arg) } if (ret == AVERROR_EOF) { - av_log(ist, AV_LOG_VERBOSE, "Decoder returned EOF, %s\n", + av_log(dp, AV_LOG_VERBOSE, "Decoder returned EOF, %s\n", flush_buffers ? "resetting" : "finishing"); if (!flush_buffers) @@ -675,7 +678,7 @@ void *decoder_thread(void *arg) avcodec_flush_buffers(dp->dec_ctx); } else if (ret < 0) { - av_log(ist, AV_LOG_ERROR, "Error processing packet in decoder: %s\n", + av_log(dp, AV_LOG_ERROR, "Error processing packet in decoder: %s\n", av_err2str(ret)); break; } @@ -698,7 +701,7 @@ void *decoder_thread(void *arg) ret = sch_dec_send(dp->sch, dp->sch_idx, dt.frame); if (ret < 0 && ret != AVERROR_EOF) { - av_log(NULL, AV_LOG_FATAL, + av_log(dp, AV_LOG_FATAL, "Error signalling EOF timestamp: %s\n", av_err2str(ret)); goto finish; } @@ -707,11 +710,11 @@ void *decoder_thread(void *arg) err_rate = (ist->frames_decoded || ist->decode_errors) ? ist->decode_errors / (ist->frames_decoded + ist->decode_errors) : 0.f; if (err_rate > max_error_rate) { - av_log(ist, AV_LOG_FATAL, "Decode error rate %g exceeds maximum %g\n", + av_log(dp, AV_LOG_FATAL, "Decode error rate %g exceeds maximum %g\n", err_rate, max_error_rate); ret = FFMPEG_ERROR_RATE_EXCEEDED; } else if (err_rate) - av_log(ist, AV_LOG_VERBOSE, "Decode error rate %g\n", err_rate); + av_log(dp, AV_LOG_VERBOSE, "Decode error rate %g\n", err_rate); } finish: @@ -798,7 +801,7 @@ static int hw_device_setup_for_decode(InputStream *ist, DecoderPriv *dp) if (ist->hwaccel_id == HWACCEL_AUTO) { ist->hwaccel_device_type = dev->type; } else if (ist->hwaccel_device_type != dev->type) { - av_log(NULL, AV_LOG_ERROR, "Invalid hwaccel device " + 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), @@ -849,7 +852,7 @@ static int hw_device_setup_for_decode(InputStream *ist, DecoderPriv *dp) type = config->device_type; dev = hw_device_get_by_type(type); if (dev) { - av_log(NULL, AV_LOG_INFO, "Using auto " + av_log(dp, AV_LOG_INFO, "Using auto " "hwaccel type %s with existing device %s.\n", av_hwdevice_get_type_name(type), dev->name); } @@ -867,12 +870,12 @@ static int hw_device_setup_for_decode(InputStream *ist, DecoderPriv *dp) continue; } if (ist->hwaccel_device) { - av_log(NULL, AV_LOG_INFO, "Using auto " + 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); } else { - av_log(NULL, AV_LOG_INFO, "Using auto " + av_log(dp, AV_LOG_INFO, "Using auto " "hwaccel type %s with new default device.\n", av_hwdevice_get_type_name(type)); } @@ -880,7 +883,7 @@ static int hw_device_setup_for_decode(InputStream *ist, DecoderPriv *dp) if (dev) { ist->hwaccel_device_type = type; } else { - av_log(NULL, AV_LOG_INFO, "Auto hwaccel " + av_log(dp, AV_LOG_INFO, "Auto hwaccel " "disabled: no device found.\n"); ist->hwaccel_id = HWACCEL_NONE; return 0; @@ -888,7 +891,7 @@ static int hw_device_setup_for_decode(InputStream *ist, DecoderPriv *dp) } if (!dev) { - av_log(NULL, AV_LOG_ERROR, "No device available " + 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); return err; @@ -901,6 +904,20 @@ static int hw_device_setup_for_decode(InputStream *ist, DecoderPriv *dp) return 0; } +static const char *dec_item_name(void *obj) +{ + const DecoderPriv *dp = obj; + + return dp->log_name; +} + +static const AVClass dec_class = { + .class_name = "Decoder", + .version = LIBAVUTIL_VERSION_INT, + .parent_log_context_offset = offsetof(DecoderPriv, log_parent), + .item_name = dec_item_name, +}; + int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx) { DecoderPriv *dp; @@ -922,6 +939,11 @@ int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx) dp->sch = sch; dp->sch_idx = sch_idx; + dp->dec.class = &dec_class; + dp->log_parent = ist; + + snprintf(dp->log_name, sizeof(dp->log_name), "dec:%s", codec->name); + if (codec->type == AVMEDIA_TYPE_SUBTITLE && ist->fix_sub_duration) { for (int i = 0; i < FF_ARRAY_ELEMS(dp->sub_prev); i++) { dp->sub_prev[i] = av_frame_alloc(); @@ -939,7 +961,7 @@ int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx) ret = avcodec_parameters_to_context(dp->dec_ctx, ist->par); if (ret < 0) { - av_log(ist, AV_LOG_ERROR, "Error initializing the decoder context.\n"); + av_log(dp, AV_LOG_ERROR, "Error initializing the decoder context.\n"); return ret; } @@ -950,7 +972,9 @@ int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx) (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(NULL, 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"); + 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 @@ -967,14 +991,14 @@ int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx) ret = hw_device_setup_for_decode(ist, dp); if (ret < 0) { - av_log(ist, AV_LOG_ERROR, + av_log(dp, AV_LOG_ERROR, "Hardware device setup failed for decoder: %s\n", av_err2str(ret)); return ret; } if ((ret = avcodec_open2(dp->dec_ctx, codec, &ist->decoder_opts)) < 0) { - av_log(ist, AV_LOG_ERROR, "Error while opening decoder: %s\n", + av_log(dp, AV_LOG_ERROR, "Error while opening decoder: %s\n", av_err2str(ret)); return ret; }

1 0

fftools/ffmpeg: make decoding AVCodecContext private to the decoder
by Anton Khirnov 30 Jan '24

30 Jan '24

ffmpeg | branch: master | Anton Khirnov <anton(a)khirnov.net> | Wed Jan 10 14:54:34 2024 +0100| [f2a2094c477df952348ea1de79c839e813ca5db3] | committer: Anton Khirnov fftools/ffmpeg: make decoding AVCodecContext private to the decoder > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f2a2094c477df9523… --- fftools/ffmpeg.h | 3 +- fftools/ffmpeg_dec.c | 90 +++++++++++++++++++++++++++++++------------------- fftools/ffmpeg_demux.c | 16 ++------- 3 files changed, 60 insertions(+), 49 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 4c9424d02f..f0f57d48bc 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -306,7 +306,6 @@ typedef struct InputStream { */ AVCodecParameters *par; Decoder *decoder; - AVCodecContext *dec_ctx; const AVCodec *dec; AVRational framerate_guessed; @@ -733,6 +732,8 @@ int hwaccel_retrieve_data(AVCodecContext *avctx, AVFrame *input); int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx); void dec_free(Decoder **pdec); +int dec_add_filter(Decoder *dec, InputFilter *ifilter); + int enc_alloc(Encoder **penc, const AVCodec *codec, Scheduler *sch, unsigned sch_idx); void enc_free(Encoder **penc); diff --git a/fftools/ffmpeg_dec.c b/fftools/ffmpeg_dec.c index 74f85f2ff7..79c9a7bb7e 100644 --- a/fftools/ffmpeg_dec.c +++ b/fftools/ffmpeg_dec.c @@ -37,6 +37,8 @@ typedef struct DecoderPriv { Decoder dec; + AVCodecContext *dec_ctx; + AVFrame *frame; AVPacket *pkt; @@ -79,6 +81,8 @@ void dec_free(Decoder **pdec) return; dp = dp_from_dec(dec); + avcodec_free_context(&dp->dec_ctx); + av_frame_free(&dp->frame); av_packet_free(&dp->pkt); @@ -216,9 +220,9 @@ static int64_t video_duration_estimate(const InputStream *ist, const AVFrame *fr if (frame->duration > 0 && (!ifile->format_nots || ist->framerate.num)) return frame->duration; - if (ist->dec_ctx->framerate.den && ist->dec_ctx->framerate.num) { + if (dp->dec_ctx->framerate.den && dp->dec_ctx->framerate.num) { int fields = frame->repeat_pict + 2; - AVRational field_rate = av_mul_q(ist->dec_ctx->framerate, + AVRational field_rate = av_mul_q(dp->dec_ctx->framerate, (AVRational){ 2, 1 }); codec_duration = av_rescale_q(fields, av_inv_q(field_rate), frame->time_base); @@ -258,29 +262,29 @@ static int video_frame_process(InputStream *ist, AVFrame *frame) // The following line may be required in some cases where there is no parser // or the parser does not has_b_frames correctly - if (ist->par->video_delay < ist->dec_ctx->has_b_frames) { - if (ist->dec_ctx->codec_id == AV_CODEC_ID_H264) { - ist->par->video_delay = ist->dec_ctx->has_b_frames; + if (ist->par->video_delay < dp->dec_ctx->has_b_frames) { + if (dp->dec_ctx->codec_id == AV_CODEC_ID_H264) { + ist->par->video_delay = dp->dec_ctx->has_b_frames; } else - av_log(ist->dec_ctx, AV_LOG_WARNING, + av_log(dp->dec_ctx, AV_LOG_WARNING, "video_delay is larger in decoder than demuxer %d > %d.\n" "If you want to help, upload a sample " "of this file to https://streams.videolan.org/upload/ " "and contact the ffmpeg-devel mailing list. (ffmpeg-devel(a)ffmpeg.org)\n", - ist->dec_ctx->has_b_frames, + dp->dec_ctx->has_b_frames, ist->par->video_delay); } - if (ist->dec_ctx->width != frame->width || - ist->dec_ctx->height != frame->height || - ist->dec_ctx->pix_fmt != frame->format) { + if (dp->dec_ctx->width != frame->width || + dp->dec_ctx->height != frame->height || + dp->dec_ctx->pix_fmt != frame->format) { av_log(NULL, AV_LOG_DEBUG, "Frame parameters mismatch context %d,%d,%d != %d,%d,%d\n", frame->width, frame->height, frame->format, - ist->dec_ctx->width, - ist->dec_ctx->height, - ist->dec_ctx->pix_fmt); + dp->dec_ctx->width, + dp->dec_ctx->height, + dp->dec_ctx->pix_fmt); } #if FFMPEG_OPT_TOP @@ -291,7 +295,7 @@ static int video_frame_process(InputStream *ist, AVFrame *frame) #endif if (frame->format == dp->hwaccel_pix_fmt) { - int err = hwaccel_retrieve_data(ist->dec_ctx, frame); + int err = hwaccel_retrieve_data(dp->dec_ctx, frame); if (err < 0) return err; } @@ -431,7 +435,7 @@ static int transcode_subtitles(InputStream *ist, const AVPacket *pkt, return AVERROR(ENOMEM); } - ret = avcodec_decode_subtitle2(ist->dec_ctx, &subtitle, &got_output, + ret = avcodec_decode_subtitle2(dp->dec_ctx, &subtitle, &got_output, pkt ? pkt : flush_pkt); av_packet_free(&flush_pkt); @@ -457,8 +461,8 @@ static int transcode_subtitles(InputStream *ist, const AVPacket *pkt, return ret; } - frame->width = ist->dec_ctx->width; - frame->height = ist->dec_ctx->height; + frame->width = dp->dec_ctx->width; + frame->height = dp->dec_ctx->height; return process_subtitle(ist, frame); } @@ -467,7 +471,7 @@ static int packet_decode(InputStream *ist, AVPacket *pkt, AVFrame *frame) { const InputFile *ifile = ist->file; DecoderPriv *dp = dp_from_dec(ist->decoder); - AVCodecContext *dec = ist->dec_ctx; + AVCodecContext *dec = dp->dec_ctx; const char *type_desc = av_get_media_type_string(dec->codec_type); int ret; @@ -582,11 +586,11 @@ static int packet_decode(InputStream *ist, AVPacket *pkt, AVFrame *frame) } } -static void dec_thread_set_name(const InputStream *ist) +static void dec_thread_set_name(const InputStream *ist, const DecoderPriv *dp) { char name[16]; snprintf(name, sizeof(name), "dec%d:%d:%s", ist->file->index, ist->index, - ist->dec_ctx->codec->name); + dp->dec_ctx->codec->name); ff_thread_setname(name); } @@ -628,7 +632,7 @@ void *decoder_thread(void *arg) if (ret < 0) goto finish; - dec_thread_set_name(ist); + dec_thread_set_name(ist, dp); while (!input_status) { int flush_buffers, have_data; @@ -669,7 +673,7 @@ void *decoder_thread(void *arg) dt.pkt->time_base = dp->last_frame_tb; } - avcodec_flush_buffers(ist->dec_ctx); + avcodec_flush_buffers(dp->dec_ctx); } else if (ret < 0) { av_log(ist, AV_LOG_ERROR, "Error processing packet in decoder: %s\n", av_err2str(ret)); @@ -769,7 +773,7 @@ static HWDevice *hw_device_match_by_codec(const AVCodec *codec) } } -static int hw_device_setup_for_decode(InputStream *ist) +static int hw_device_setup_for_decode(InputStream *ist, DecoderPriv *dp) { const AVCodecHWConfig *config; enum AVHWDeviceType type; @@ -890,8 +894,8 @@ static int hw_device_setup_for_decode(InputStream *ist) return err; } - ist->dec_ctx->hw_device_ctx = av_buffer_ref(dev->device_ref); - if (!ist->dec_ctx->hw_device_ctx) + dp->dec_ctx->hw_device_ctx = av_buffer_ref(dev->device_ref); + if (!dp->dec_ctx->hw_device_ctx) return AVERROR(ENOMEM); return 0; @@ -906,7 +910,7 @@ int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx) if (!codec) { av_log(ist, AV_LOG_ERROR, "Decoding requested, but no decoder found for: %s\n", - avcodec_get_name(ist->dec_ctx->codec_id)); + avcodec_get_name(ist->par->codec_id)); return AVERROR(EINVAL); } @@ -929,10 +933,20 @@ int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx) return AVERROR(ENOMEM); } - ist->dec_ctx->opaque = ist; - ist->dec_ctx->get_format = get_format; + dp->dec_ctx = avcodec_alloc_context3(codec); + if (!dp->dec_ctx) + return AVERROR(ENOMEM); + + ret = avcodec_parameters_to_context(dp->dec_ctx, ist->par); + if (ret < 0) { + av_log(ist, AV_LOG_ERROR, "Error initializing the decoder context.\n"); + return ret; + } + + dp->dec_ctx->opaque = ist; + dp->dec_ctx->get_format = get_format; - if (ist->dec_ctx->codec_id == AV_CODEC_ID_DVB_SUBTITLE && + if (dp->dec_ctx->codec_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) @@ -941,7 +955,7 @@ int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx) /* Useful for subtitles retiming by lavf (FIXME), skipping samples in * audio, and video decoders such as cuvid or mediacodec */ - ist->dec_ctx->pkt_timebase = ist->st->time_base; + dp->dec_ctx->pkt_timebase = ist->st->time_base; if (!av_dict_get(ist->decoder_opts, "threads", NULL, 0)) av_dict_set(&ist->decoder_opts, "threads", "auto", 0); @@ -951,7 +965,7 @@ int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx) av_dict_set(&ist->decoder_opts, "flags", "+copy_opaque", AV_DICT_MULTIKEY); - ret = hw_device_setup_for_decode(ist); + ret = hw_device_setup_for_decode(ist, dp); if (ret < 0) { av_log(ist, AV_LOG_ERROR, "Hardware device setup failed for decoder: %s\n", @@ -959,7 +973,7 @@ int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx) return ret; } - if ((ret = avcodec_open2(ist->dec_ctx, codec, &ist->decoder_opts)) < 0) { + if ((ret = avcodec_open2(dp->dec_ctx, codec, &ist->decoder_opts)) < 0) { av_log(ist, AV_LOG_ERROR, "Error while opening decoder: %s\n", av_err2str(ret)); return ret; @@ -969,8 +983,16 @@ int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx) if (ret < 0) return ret; - dp->dec.subtitle_header = ist->dec_ctx->subtitle_header; - dp->dec.subtitle_header_size = ist->dec_ctx->subtitle_header_size; + dp->dec.subtitle_header = dp->dec_ctx->subtitle_header; + dp->dec.subtitle_header_size = dp->dec_ctx->subtitle_header_size; return 0; } + +int dec_add_filter(Decoder *dec, InputFilter *ifilter) +{ + DecoderPriv *dp = dp_from_dec(dec); + + // initialize fallback parameters for filtering + return ifilter_parameters_from_dec(ifilter, dp->dec_ctx); +} diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index 16d4f67e59..8e904d2150 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -825,7 +825,6 @@ static void ist_free(InputStream **pist) av_freep(&ist->outputs); av_freep(&ist->hwaccel_device); - avcodec_free_context(&ist->dec_ctx); avcodec_parameters_free(&ist->par); av_bsf_free(&ds->bsf); @@ -886,16 +885,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; - ist->dec_ctx = avcodec_alloc_context3(ist->dec); - if (!ist->dec_ctx) - return AVERROR(ENOMEM); - - ret = avcodec_parameters_to_context(ist->dec_ctx, ist->par); - if (ret < 0) { - av_log(ist, AV_LOG_ERROR, "Error initializing the decoder context.\n"); - return ret; - } - ret = sch_add_dec(d->sch, decoder_thread, ist, d->loop && is_audio); if (ret < 0) return ret; @@ -950,12 +939,11 @@ int ist_filter_add(InputStream *ist, InputFilter *ifilter, int is_simple) ist->filters[ist->nb_filters - 1] = ifilter; - // initialize fallback parameters for filtering - ret = ifilter_parameters_from_dec(ifilter, ist->dec_ctx); + ret = dec_add_filter(ist->decoder, ifilter); if (ret < 0) return ret; - if (ist->dec_ctx->codec_type == AVMEDIA_TYPE_SUBTITLE) { + if (ist->par->codec_type == AVMEDIA_TYPE_SUBTITLE) { if (!d->pkt_heartbeat) { d->pkt_heartbeat = av_packet_alloc(); if (!d->pkt_heartbeat)

1 0