virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-07-11 14:30:22 +02:00
Code Issues Releases Activity

Merge commit '6d86cef06ba36c0ed591e14a2382e9630059fc5d'

Browse Source 
* commit '6d86cef06ba36c0ed591e14a2382e9630059fc5d':
  lavfi: Add support for increasing hardware frame pool sizes

Merged-by: Mark Thompson <sw@jkqxz.net>
This commit is contained in:
Mark Thompson
2018-02-12 22:28:12 +00:00
parent 9471122a1b 6d86cef06b
commit bcab11a1a2
5 changed files with 60 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
libavfilter/avfilter.c
View File

@ -676,6 +676,8 @@ static const AVOption avfilter_options[] = {
{ "enable", "set enable expression", OFFSET(enable_str), AV_OPT_TYPE_STRING, {.str=NULL}, .flags = FLAGS },
{ "threads", "Allowed number of threads", OFFSET(nb_threads), AV_OPT_TYPE_INT,
{ .i64 = 0 }, 0, INT_MAX, FLAGS },
{ "extra_hw_frames", "Number of extra hardware frames to allocate for the user",
OFFSET(extra_hw_frames), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, FLAGS },
{ NULL },
};
@ -1663,3 +1665,24 @@ const AVClass *avfilter_get_class(void)
{
return &avfilter_class;
}
int ff_filter_init_hw_frames(AVFilterContext *avctx, AVFilterLink *link,
int default_pool_size)
{
AVHWFramesContext *frames;
// Must already be set by caller.
av_assert0(link->hw_frames_ctx);
frames = (AVHWFramesContext*)link->hw_frames_ctx->data;
if (frames->initial_pool_size == 0) {
// Dynamic allocation is necessarily supported.
} else if (avctx->extra_hw_frames >= 0) {
frames->initial_pool_size += avctx->extra_hw_frames;
} else {
frames->initial_pool_size = default_pool_size;
}
return 0;
}