ffmpeg | branch: master | Anton Khirnov <an...@khirnov.net> | Thu Apr 4 11:30:18 2024 +0200| [f2c919252da460f89f7281c769d3005e35d95b85] | committer: Anton Khirnov
fftools/ffmpeg_filter: accept encoder thread count through OutputFilterOptions Stop digging through encoder options manually. Will allow decoupling filtering from encoding in future commits. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f2c919252da460f89f7281c769d3005e35d95b85 --- fftools/ffmpeg.h | 2 ++ fftools/ffmpeg_filter.c | 20 ++++++++++++++------ fftools/ffmpeg_mux_init.c | 5 +++++ 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 7135d9563c..f77ec956b3 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -291,6 +291,8 @@ typedef struct OutputFilterOptions { AVDictionary *sws_opts; AVDictionary *swr_opts; + const char *nb_threads; + // A combination of OFilterFlags. unsigned flags; diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index ec17e99494..9fc6e32960 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -59,6 +59,8 @@ typedef struct FilterGraphPriv { const char *graph_desc; + char *nb_threads; + // frame for temporarily holding output from the filtergraph AVFrame *frame; // frame for sending output to the encoder @@ -976,6 +978,7 @@ void fg_free(FilterGraph **pfg) } av_freep(&fg->outputs); av_freep(&fgp->graph_desc); + av_freep(&fgp->nb_threads); av_frame_free(&fgp->frame); av_frame_free(&fgp->frame_enc); @@ -1165,6 +1168,13 @@ int init_simple_filtergraph(InputStream *ist, OutputStream *ost, if (ret < 0) return ret; + if (opts->nb_threads) { + av_freep(&fgp->nb_threads); + fgp->nb_threads = av_strdup(opts->nb_threads); + if (!fgp->nb_threads) + return AVERROR(ENOMEM); + } + return 0; } @@ -1735,17 +1745,15 @@ static int configure_filtergraph(FilterGraph *fg, FilterGraphThread *fgt) if (simple) { OutputFilterPriv *ofp = ofp_from_ofilter(fg->outputs[0]); - OutputStream *ost = fg->outputs[0]->ost; if (filter_nbthreads) { ret = av_opt_set(fgt->graph, "threads", filter_nbthreads, 0); if (ret < 0) goto fail; - } else { - const AVDictionaryEntry *e = NULL; - e = av_dict_get(ost->encoder_opts, "threads", NULL, 0); - if (e) - av_opt_set(fgt->graph, "threads", e->value, 0); + } else if (fgp->nb_threads) { + ret = av_opt_set(fgt->graph, "threads", fgp->nb_threads, 0); + if (ret < 0) + return ret; } if (av_dict_count(ofp->sws_opts)) { diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index ffcc20a504..10421ae1b0 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -1370,6 +1370,7 @@ static int ost_add(Muxer *mux, const OptionsContext *o, enum AVMediaType type, if (ost->enc && (type == AVMEDIA_TYPE_VIDEO || type == AVMEDIA_TYPE_AUDIO)) { + const AVDictionaryEntry *e; char name[16]; OutputFilterOptions opts = { .enc = enc, @@ -1395,6 +1396,10 @@ static int ost_add(Muxer *mux, const OptionsContext *o, enum AVMediaType type, snprintf(name, sizeof(name), "#%d:%d", mux->of.index, ost->index); + e = av_dict_get(ost->encoder_opts, "threads", NULL, 0); + if (e) + opts.nb_threads = e->value; + // MJPEG encoder exports a full list of supported pixel formats, // but the full-range ones are experimental-only. // Restrict the auto-conversion list unless -strict experimental _______________________________________________ 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".