virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-06-04 05:57:49 +02:00
Code Issues Releases Activity

avfilter/vf_transpose_vt: fix output frame dimension

Browse Source 
Create a new hardware frame context when necessary.

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

47
libavfilter/vf_transpose_vt.c
View File

@ -102,6 +102,39 @@ fail:
return ret; return ret;
} }
static int transpose_vt_recreate_hw_ctx(AVFilterLink *outlink)
{
AVFilterContext *avctx = outlink->src;
AVFilterLink *inlink = outlink->src->inputs[0];
AVHWFramesContext *hw_frame_ctx_in;
AVHWFramesContext *hw_frame_ctx_out;
int err;
av_buffer_unref(&outlink->hw_frames_ctx);
hw_frame_ctx_in = (AVHWFramesContext *)inlink->hw_frames_ctx->data;
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;
}
static int transpose_vt_config_output(AVFilterLink *outlink) static int transpose_vt_config_output(AVFilterLink *outlink)
{ {
int err; int err;
@ -113,6 +146,9 @@ static int transpose_vt_config_output(AVFilterLink *outlink)
CFBooleanRef hflip = kCFBooleanFalse; CFBooleanRef hflip = kCFBooleanFalse;
int swap_w_h = 0; int swap_w_h = 0;
av_buffer_unref(&outlink->hw_frames_ctx);
outlink->hw_frames_ctx = av_buffer_ref(inlink->hw_frames_ctx);
if ((inlink->w >= inlink->h && s->passthrough == TRANSPOSE_PT_TYPE_LANDSCAPE) || if ((inlink->w >= inlink->h && s->passthrough == TRANSPOSE_PT_TYPE_LANDSCAPE) ||
(inlink->w <= inlink->h && s->passthrough == TRANSPOSE_PT_TYPE_PORTRAIT)) { (inlink->w <= inlink->h && s->passthrough == TRANSPOSE_PT_TYPE_PORTRAIT)) {
av_log(avctx, AV_LOG_VERBOSE, av_log(avctx, AV_LOG_VERBOSE,
@ -175,12 +211,12 @@ static int transpose_vt_config_output(AVFilterLink *outlink)
return AVERROR_EXTERNAL; return AVERROR_EXTERNAL;
} }
if (swap_w_h) { if (!swap_w_h)
outlink->w = inlink->h; return 0;
outlink->h = inlink->w;
}
return 0; outlink->w = inlink->h;
outlink->h = inlink->w;
return transpose_vt_recreate_hw_ctx(outlink);
} }
#define OFFSET(x) offsetof(TransposeVtContext, x) #define OFFSET(x) offsetof(TransposeVtContext, x)
@ -244,4 +280,5 @@ const AVFilter ff_vf_transpose_vt = {
FILTER_SINGLE_PIXFMT(AV_PIX_FMT_VIDEOTOOLBOX), FILTER_SINGLE_PIXFMT(AV_PIX_FMT_VIDEOTOOLBOX),
.priv_class = &transpose_vt_class, .priv_class = &transpose_vt_class,
.flags = AVFILTER_FLAG_HWDEVICE, .flags = AVFILTER_FLAG_HWDEVICE,
.flags_internal = FF_FILTER_FLAG_HWFRAME_AWARE,
}; };