> -----Original Message----- > From: ffmpeg-devel [mailto:ffmpeg-devel-boun...@ffmpeg.org] On Behalf > Of Mark Thompson > Sent: Sunday, March 17, 2019 21:59 > To: ffmpeg-devel@ffmpeg.org > Subject: Re: [FFmpeg-devel] [PATCH 1/2] lavf/vf_vpp_qsv: add transpose > support for QSV VPP > > On 15/03/2019 16:34, Linjie Fu wrote: > > Add transpose support for qsv_vpp: > > - rotation: [0, 3] support clockwise rotation of 0, 90, 180, 270; > > - mirror: [0, 1] support horizontal mirroring; > > > > ffmpeg -hwaccel qsv -v verbose -c:v h264_qsv -i input.h264 > > -vf 'format=qsv,vpp_qsv=rotation=1' -c:v h264_qsv output.h264 > > ffmpeg -hwaccel qsv -v verbose -c:v h264_qsv -i input.h264 > > -vf 'format=qsv,vpp_qsv=mirror=1' -c:v h264_qsv output.h264 > > ffmpeg -hwaccel qsv -v verbose -c:v h264_qsv -i input.h264 > > -vf 'format=qsv,vpp_qsv=rotation=2,vpp_qsv=mirror=1' -c:v h264_qsv > output.h264 > > > > Signed-off-by: Linjie Fu <linjie...@intel.com> > > --- > > libavfilter/vf_vpp_qsv.c | 45 > ++++++++++++++++++++++++++++++++++++++-- > > 1 file changed, 43 insertions(+), 2 deletions(-) > > > > diff --git a/libavfilter/vf_vpp_qsv.c b/libavfilter/vf_vpp_qsv.c > > index 41a9f38962..edbe944321 100644 > > --- a/libavfilter/vf_vpp_qsv.c > > +++ b/libavfilter/vf_vpp_qsv.c > > @@ -41,7 +41,9 @@ > > #define FLAGS (AV_OPT_FLAG_VIDEO_PARAM | > AV_OPT_FLAG_FILTERING_PARAM) > > > > /* number of video enhancement filters */ > > -#define ENH_FILTERS_COUNT (5) > > +#define ENH_FILTERS_COUNT (7) > > +#define QSV_HAVE_ROTATION QSV_VERSION_ATLEAST(1, 17) > > +#define QSV_HAVE_MIRRORING QSV_VERSION_ATLEAST(1, 19) > > > > typedef struct VPPContext{ > > const AVClass *class; > > @@ -54,6 +56,8 @@ typedef struct VPPContext{ > > mfxExtVPPDenoise denoise_conf; > > mfxExtVPPDetail detail_conf; > > mfxExtVPPProcAmp procamp_conf; > > + mfxExtVPPRotation rotation_conf; > > + mfxExtVPPMirroring mirroring_conf; > > > > int out_width; > > int out_height; > > @@ -70,6 +74,9 @@ typedef struct VPPContext{ > > int crop_x; > > int crop_y; > > > > + int rotation; /* rotation mode : 0=0, 1=90, 2=180, 3=270 > > */ > > + int mirror; /* mirror mode : 0=off, 1=HORIZONTAL */ > > + > > /* param for the procamp */ > > int procamp; /* enable procamp */ > > float hue; > > @@ -95,6 +102,9 @@ static const AVOption options[] = { > > { "contrast", "ProcAmp contrast", OFFSET(contrast), > AV_OPT_TYPE_FLOAT, { .dbl = 1.0 }, 0.0, 10.0, .flags = FLAGS}, > > { "brightness", "ProcAmp brightness", OFFSET(brightness), > AV_OPT_TYPE_FLOAT, { .dbl = 0.0 }, -100.0, 100.0, .flags = FLAGS}, > > > > + { "rotation", "clockwise rotation: 90 * [0, 3]", OFFSET(rotation), > AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 3, .flags = FLAGS}, > > + { "mirror", "horizontal mirror [0, 1]", OFFSET(mirror), > AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, .flags = FLAGS}, > > Please use the same names as other filters doing transpose/rotate > operations. > Is it acceptable updating the names into "rotate" and "hflip" separately? Or they should be combined into "transpose" like vaapi_transpose does? > > I think there should be something to make the default behaviour for the > cases where you would expect the axes to be swapped to do that. It would > be surprising for rotating a portait 1080x1920 input to produce a squashed > 1080x1920 output rather than 1920x1080.
Thanks, will add FFSWAP(int, vpp->out_width, vpp->out_height) to swap width and height for clock/cclock rotation. _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
