RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avfilter/vf_scale_vt: fix output frame dimension 

The output frame dimension is incorrect because it shares hardware
frame context with input.

Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
This commit is contained in:
Zhao Zhili 2023-08-18 22:24:06 +08:00
parent e79bd1f1b1
commit 9b543881ef
1 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libavfilter/vf_scale_vt.c
View File

@ -177,6 +177,8 @@ static int scale_vt_config_output(AVFilterLink *outlink)
AVFilterContext *avctx = outlink->src; AVFilterContext *avctx = outlink->src;
ScaleVtContext *s = avctx->priv; ScaleVtContext *s = avctx->priv;
AVFilterLink *inlink = outlink->src->inputs[0]; AVFilterLink *inlink = outlink->src->inputs[0];
AVHWFramesContext *hw_frame_ctx_in;
AVHWFramesContext *hw_frame_ctx_out;
err = ff_scale_eval_dimensions(s, s->w_expr, s->h_expr, inlink, outlink, err = ff_scale_eval_dimensions(s, s->w_expr, s->h_expr, inlink, outlink,
&s->output_width, &s->output_width,
@ -194,6 +196,28 @@ static int scale_vt_config_output(AVFilterLink *outlink)
outlink->sample_aspect_ratio = inlink->sample_aspect_ratio; outlink->sample_aspect_ratio = inlink->sample_aspect_ratio;
} }
hw_frame_ctx_in = (AVHWFramesContext *)inlink->hw_frames_ctx->data;
av_buffer_unref(&outlink->hw_frames_ctx);
outlink->hw_frames_ctx = av_hwframe_ctx_alloc(hw_frame_ctx_in->device_ref);
hw_frame_ctx_out = (AVHWFramesContext *)outlink->hw_frames_ctx->data;
hw_frame_ctx_out->format = AV_PIX_FMT_VIDEOTOOLBOX;
hw_frame_ctx_out->sw_format = hw_frame_ctx_in->sw_format;
hw_frame_ctx_out->width = outlink->w;
hw_frame_ctx_out->height = outlink->h;
err = ff_filter_init_hw_frames(avctx, outlink, 1);
if (err < 0)
return err;
err = av_hwframe_ctx_init(outlink->hw_frames_ctx);
if (err < 0) {
av_log(avctx, AV_LOG_ERROR,
"Failed to init videotoolbox frame context, %s\n",
av_err2str(err));
return err;
}
return 0; return 0;
} }
@ -242,4 +266,5 @@ const AVFilter ff_vf_scale_vt = {
FILTER_SINGLE_PIXFMT(AV_PIX_FMT_VIDEOTOOLBOX), FILTER_SINGLE_PIXFMT(AV_PIX_FMT_VIDEOTOOLBOX),
.priv_class = &scale_vt_class, .priv_class = &scale_vt_class,
.flags = AVFILTER_FLAG_HWDEVICE, .flags = AVFILTER_FLAG_HWDEVICE,
.flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE,
}; };