har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'c6bc18bc121ea66df715123c59f7ef9542c0914a'

Browse Source 
* commit 'c6bc18bc121ea66df715123c59f7ef9542c0914a':
  vf_hwupload/hwmap: Support setting a fixed pool size

Merged-by: Mark Thompson <sw@jkqxz.net>
This commit is contained in:
Mark Thompson 2018-02-12 22:56:12 +00:00
commit b668a1c8b3
2 changed files with 9 additions and 1 deletions

7
libavfilter/vf_hwmap.c

@ -143,7 +143,9 @@ static int hwmap_config_output(AVFilterLink *outlink)
frames->sw_format = hwfc->sw_format; frames->sw_format = hwfc->sw_format;
frames->width = hwfc->width; frames->width = hwfc->width;
frames->height = hwfc->height; frames->height = hwfc->height;
frames->initial_pool_size = 64;
if (avctx->extra_hw_frames >= 0)
frames->initial_pool_size = 2 + avctx->extra_hw_frames;
err = av_hwframe_ctx_init(ctx->hwframes_ref); err = av_hwframe_ctx_init(ctx->hwframes_ref);
if (err < 0) { if (err < 0) {
@ -223,6 +225,9 @@ static int hwmap_config_output(AVFilterLink *outlink)
hwfc->width = inlink->w; hwfc->width = inlink->w;
hwfc->height = inlink->h; hwfc->height = inlink->h;
if (avctx->extra_hw_frames >= 0)
hwfc->initial_pool_size = 2 + avctx->extra_hw_frames;
err = av_hwframe_ctx_init(ctx->hwframes_ref); err = av_hwframe_ctx_init(ctx->hwframes_ref);
if (err < 0) { if (err < 0) {
av_log(avctx, AV_LOG_ERROR, "Failed to create frame " av_log(avctx, AV_LOG_ERROR, "Failed to create frame "

3
libavfilter/vf_hwupload.c

@ -131,6 +131,9 @@ static int hwupload_config_output(AVFilterLink *outlink)
ctx->hwframes->width = inlink->w; ctx->hwframes->width = inlink->w;
ctx->hwframes->height = inlink->h; ctx->hwframes->height = inlink->h;
if (avctx->extra_hw_frames >= 0)
ctx->hwframes->initial_pool_size = 2 + avctx->extra_hw_frames;
err = av_hwframe_ctx_init(ctx->hwframes_ref); err = av_hwframe_ctx_init(ctx->hwframes_ref);
if (err < 0) if (err < 0)
goto fail; goto fail;