virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

fftools/ffmpeg_filter: accept encoder thread count through OutputFilterOptions

Browse Source 
Stop digging through encoder options manually.

Will allow decoupling filtering from encoding in future commits.
This commit is contained in:
Anton Khirnov 2024-04-04 11:30:18 +02:00
parent bfeb751171
commit f2c919252d
3 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fftools/ffmpeg.h
View File

@ -291,6 +291,8 @@ typedef struct OutputFilterOptions {
AVDictionary *sws_opts;
AVDictionary *swr_opts;
const char *nb_threads;
// A combination of OFilterFlags.
unsigned flags;

20
fftools/ffmpeg_filter.c
View File

@ -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)) {

5
fftools/ffmpeg_mux_init.c
View File

@ -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