[FFmpeg-devel] [PATCH] lavu/hwcontext_qsv: Fix the realign check for hwupload

[Fu, Linjie]

> -----Original Message-----
> From: ffmpeg-devel [mailto:ffmpeg-devel-bounces at ffmpeg.org] On Behalf
> Of Carl Eugen Hoyos
> Sent: Wednesday, April 10, 2019 19:35
> To: FFmpeg development discussions and patches <ffmpeg-
> devel at ffmpeg.org>
> Subject: Re: [FFmpeg-devel] [PATCH] lavu/hwcontext_qsv: Fix the realign
> check for hwupload
> 
> 2019-04-10 13:26 GMT+02:00, Linjie Fu <linjie.fu at intel.com>:
> > Fix the aligned check in hwupload, input surface should be 16 aligned
> > too.
> >
> > Fix #7830.
> >
> > Signed-off-by: Linjie Fu <linjie.fu at intel.com>
> > ---
> >  libavutil/hwcontext_qsv.c | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c
> > index b6d8bfe2bf..bc6236f25d 100644
> > --- a/libavutil/hwcontext_qsv.c
> > +++ b/libavutil/hwcontext_qsv.c
> > @@ -892,7 +892,8 @@ static int
> qsv_transfer_data_to(AVHWFramesContext *ctx,
> > AVFrame *dst,
> >          return ret;
> >
> >
> > -    if (src->height & 16 || src->linesize[0] & 16) {
> > +    if (src->height % 16 || src->width % 16 ||
> > +                            src->linesize[0] % 16) {
> 
> & 15?

& 15 seems to be better, thanks.

Linjie