virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

fftools/ffmpeg: use an int for nb_threads

Browse Source 
Removes unnecessary allocations.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2025-02-14 13:17:43 -03:00
parent b92577405b
commit 0e7c2a6287
3 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fftools/ffmpeg.h
View File

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

16
fftools/ffmpeg_filter.c
View File

@ -60,7 +60,7 @@ typedef struct FilterGraphPriv {
const char *graph_desc; const char *graph_desc;
char *nb_threads; int nb_threads;
// frame for temporarily holding output from the filtergraph // frame for temporarily holding output from the filtergraph
AVFrame *frame; AVFrame *frame;
@ -1042,7 +1042,6 @@ void fg_free(FilterGraph **pfg)
} }
av_freep(&fg->outputs); av_freep(&fg->outputs);
av_freep(&fgp->graph_desc); av_freep(&fgp->graph_desc);
av_freep(&fgp->nb_threads);
av_frame_free(&fgp->frame); av_frame_free(&fgp->frame);
av_frame_free(&fgp->frame_enc); av_frame_free(&fgp->frame_enc);
@ -1097,6 +1096,7 @@ int fg_create(FilterGraph **pfg, char *graph_desc, Scheduler *sch)
fg->class = &fg_class; fg->class = &fg_class;
fgp->graph_desc = graph_desc; fgp->graph_desc = graph_desc;
fgp->disable_conversions = !auto_conversion_filters; fgp->disable_conversions = !auto_conversion_filters;
fgp->nb_threads = -1;
fgp->sch = sch; fgp->sch = sch;
snprintf(fgp->log_name, sizeof(fgp->log_name), "fc#%d", fg->index); snprintf(fgp->log_name, sizeof(fgp->log_name), "fc#%d", fg->index);
@ -1247,12 +1247,8 @@ int fg_create_simple(FilterGraph **pfg,
if (ret < 0) if (ret < 0)
return ret; return ret;
if (opts->nb_threads) { if (opts->nb_threads >= 0)
av_freep(&fgp->nb_threads); fgp->nb_threads = opts->nb_threads;
fgp->nb_threads = av_strdup(opts->nb_threads);
if (!fgp->nb_threads)
return AVERROR(ENOMEM);
}
return 0; return 0;
} }
@ -1936,8 +1932,8 @@ static int configure_filtergraph(FilterGraph *fg, FilterGraphThread *fgt)
ret = av_opt_set(fgt->graph, "threads", filter_nbthreads, 0); ret = av_opt_set(fgt->graph, "threads", filter_nbthreads, 0);
if (ret < 0) if (ret < 0)
goto fail; goto fail;
} else if (fgp->nb_threads) { } else if (fgp->nb_threads >= 0) {
ret = av_opt_set(fgt->graph, "threads", fgp->nb_threads, 0); ret = av_opt_set_int(fgt->graph, "threads", fgp->nb_threads, 0);
if (ret < 0) if (ret < 0)
return ret; return ret;
} }

4
fftools/ffmpeg_mux_init.c
View File

@ -930,6 +930,7 @@ ost_bind_filter(const Muxer *mux, MuxStream *ms, OutputFilter *ofilter,
.ts_offset = mux->of.start_time == AV_NOPTS_VALUE ? .ts_offset = mux->of.start_time == AV_NOPTS_VALUE ?
0 : mux->of.start_time, 0 : mux->of.start_time,
.vs = vs, .vs = vs,
.nb_threads = -1,
.flags = OFILTER_FLAG_DISABLE_CONVERT * !!keep_pix_fmt | .flags = OFILTER_FLAG_DISABLE_CONVERT * !!keep_pix_fmt |
OFILTER_FLAG_AUTOSCALE * !!autoscale | OFILTER_FLAG_AUTOSCALE * !!autoscale |
@ -982,7 +983,7 @@ ost_bind_filter(const Muxer *mux, MuxStream *ms, OutputFilter *ofilter,
} }
if (threads_manual) { if (threads_manual) {
ret = av_opt_get(enc_ctx, "threads", 0, (uint8_t**)&opts.nb_threads); ret = av_opt_get_int(enc_ctx, "threads", 0, &opts.nb_threads);
if (ret < 0) if (ret < 0)
return ret; return ret;
} }
@ -1002,7 +1003,6 @@ ost_bind_filter(const Muxer *mux, MuxStream *ms, OutputFilter *ofilter,
ost->filter = ost->fg_simple->outputs[0]; ost->filter = ost->fg_simple->outputs[0];
} }
av_freep(&opts.nb_threads);
if (ret < 0) if (ret < 0)
return ret; return ret;