diff mbox series

[FFmpeg-devel] libavfilter/qsvvpp: Use different alignment for YUV420P format

Message ID 20221129080702.323228-1-wenbin.chen@intel.com
State New
Headers show
Series [FFmpeg-devel] libavfilter/qsvvpp: Use different alignment for YUV420P format | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Chen, Wenbin Nov. 29, 2022, 8:07 a.m. UTC
From: Wenbin Chen <wenbin.chen@intel.com>

When process yuv420 frames, FFmpeg use same alignment on Y/U/V
planes. VPL and MSDK use Y plane's pitch / 2 as U/V planes's
pitch, which make U/V planes 16-bytes aligned. We need to set
a separate alignment to meet runtime's behaviour.

Now the commandline works fine:
ffmpeg -f rawvideo -pix_fmt yuv420p -s:v 3082x1884 \
-i ./3082x1884.yuv -vf 'vpp_qsv=w=2466:h=1508' -f rawvideo \
-pix_fmt yuv420p 2466_1508.yuv

Signed-off-by: Wenbin Chen <wenbin.chen@intel.com>
---
 libavfilter/qsvvpp.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

Comments

James Almer Nov. 29, 2022, 12:31 p.m. UTC | #1
On 11/29/2022 5:07 AM, wenbin.chen-at-intel.com@ffmpeg.org wrote:
> From: Wenbin Chen <wenbin.chen@intel.com>
> 
> When process yuv420 frames, FFmpeg use same alignment on Y/U/V
> planes. VPL and MSDK use Y plane's pitch / 2 as U/V planes's
> pitch, which make U/V planes 16-bytes aligned. We need to set
> a separate alignment to meet runtime's behaviour.
> 
> Now the commandline works fine:
> ffmpeg -f rawvideo -pix_fmt yuv420p -s:v 3082x1884 \
> -i ./3082x1884.yuv -vf 'vpp_qsv=w=2466:h=1508' -f rawvideo \
> -pix_fmt yuv420p 2466_1508.yuv
> 
> Signed-off-by: Wenbin Chen <wenbin.chen@intel.com>
> ---
>   libavfilter/qsvvpp.c | 12 +++++++++---
>   1 file changed, 9 insertions(+), 3 deletions(-)
> 
> diff --git a/libavfilter/qsvvpp.c b/libavfilter/qsvvpp.c
> index 8428ee89ab..ad09114cb7 100644
> --- a/libavfilter/qsvvpp.c
> +++ b/libavfilter/qsvvpp.c
> @@ -408,9 +408,15 @@ static QSVFrame *submit_frame(QSVVPPContext *s, AVFilterLink *inlink, AVFrame *p
>       } else {
>           /* make a copy if the input is not padded as libmfx requires */
>           if (picref->height & 31 || picref->linesize[0] & 31) {
> -            qsv_frame->frame = ff_get_video_buffer(inlink,
> -                                                   FFALIGN(inlink->w, 32),
> -                                                   FFALIGN(inlink->h, 32));
> +            /* When process YUV420 frames, FFmpeg uses same alignment on Y/U/V
> +             * planes. VPL and MSDK use Y plane's pitch / 2 as U/V planes's
> +             * pitch, which makes U/V planes 16-bytes aligned. We need to set a
> +             * separate alignment to meet runtime's behaviour.
> +             */
> +            qsv_frame->frame = ff_default_get_video_buffer2(inlink,

I think the proper way to do this is by setting a custom AVFilterPad 
get_buffer.video() callback, which will be called instead of 
ff_default_get_video_buffer() (Which uses an automatically chosen 
alignment at runtime) by ff_get_video_buffer().

See other filters like vf_pad, vf_transpose_vaapi, etc.

> +                                                FFALIGN(inlink->w, 32),
> +                                                FFALIGN(inlink->h, 32),
> +                                                16);
>               if (!qsv_frame->frame)
>                   return NULL;
>
Chen, Wenbin Nov. 30, 2022, 4:08 a.m. UTC | #2
> On 11/29/2022 5:07 AM, wenbin.chen-at-intel.com@ffmpeg.org wrote:
> > From: Wenbin Chen <wenbin.chen@intel.com>
> >
> > When process yuv420 frames, FFmpeg use same alignment on Y/U/V
> > planes. VPL and MSDK use Y plane's pitch / 2 as U/V planes's
> > pitch, which make U/V planes 16-bytes aligned. We need to set
> > a separate alignment to meet runtime's behaviour.
> >
> > Now the commandline works fine:
> > ffmpeg -f rawvideo -pix_fmt yuv420p -s:v 3082x1884 \
> > -i ./3082x1884.yuv -vf 'vpp_qsv=w=2466:h=1508' -f rawvideo \
> > -pix_fmt yuv420p 2466_1508.yuv
> >
> > Signed-off-by: Wenbin Chen <wenbin.chen@intel.com>
> > ---
> >   libavfilter/qsvvpp.c | 12 +++++++++---
> >   1 file changed, 9 insertions(+), 3 deletions(-)
> >
> > diff --git a/libavfilter/qsvvpp.c b/libavfilter/qsvvpp.c
> > index 8428ee89ab..ad09114cb7 100644
> > --- a/libavfilter/qsvvpp.c
> > +++ b/libavfilter/qsvvpp.c
> > @@ -408,9 +408,15 @@ static QSVFrame *submit_frame(QSVVPPContext
> *s, AVFilterLink *inlink, AVFrame *p
> >       } else {
> >           /* make a copy if the input is not padded as libmfx requires */
> >           if (picref->height & 31 || picref->linesize[0] & 31) {
> > -            qsv_frame->frame = ff_get_video_buffer(inlink,
> > -                                                   FFALIGN(inlink->w, 32),
> > -                                                   FFALIGN(inlink->h, 32));
> > +            /* When process YUV420 frames, FFmpeg uses same alignment on
> Y/U/V
> > +             * planes. VPL and MSDK use Y plane's pitch / 2 as U/V planes's
> > +             * pitch, which makes U/V planes 16-bytes aligned. We need to set
> a
> > +             * separate alignment to meet runtime's behaviour.
> > +             */
> > +            qsv_frame->frame = ff_default_get_video_buffer2(inlink,
> 
> I think the proper way to do this is by setting a custom AVFilterPad
> get_buffer.video() callback, which will be called instead of
> ff_default_get_video_buffer() (Which uses an automatically chosen
> alignment at runtime) by ff_get_video_buffer().
> 
> See other filters like vf_pad, vf_transpose_vaapi, etc.

Thanks for your advice. I will try it.
> 
> > +                                                FFALIGN(inlink->w, 32),
> > +                                                FFALIGN(inlink->h, 32),
> > +                                                16);
> >               if (!qsv_frame->frame)
> >                   return NULL;
> >
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> 
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
diff mbox series

Patch

diff --git a/libavfilter/qsvvpp.c b/libavfilter/qsvvpp.c
index 8428ee89ab..ad09114cb7 100644
--- a/libavfilter/qsvvpp.c
+++ b/libavfilter/qsvvpp.c
@@ -408,9 +408,15 @@  static QSVFrame *submit_frame(QSVVPPContext *s, AVFilterLink *inlink, AVFrame *p
     } else {
         /* make a copy if the input is not padded as libmfx requires */
         if (picref->height & 31 || picref->linesize[0] & 31) {
-            qsv_frame->frame = ff_get_video_buffer(inlink,
-                                                   FFALIGN(inlink->w, 32),
-                                                   FFALIGN(inlink->h, 32));
+            /* When process YUV420 frames, FFmpeg uses same alignment on Y/U/V
+             * planes. VPL and MSDK use Y plane's pitch / 2 as U/V planes's
+             * pitch, which makes U/V planes 16-bytes aligned. We need to set a
+             * separate alignment to meet runtime's behaviour.
+             */
+            qsv_frame->frame = ff_default_get_video_buffer2(inlink,
+                                                FFALIGN(inlink->w, 32),
+                                                FFALIGN(inlink->h, 32),
+                                                16);
             if (!qsv_frame->frame)
                 return NULL;