[FFmpeg-devel,v2] lavc/vaapi_encode: grow packet if vaMapBuffer returns multiple buffers

Submitted by Linjie Fu on May 31, 2019, 12:34 a.m.

Details

Message ID 1559262871-3764-1-git-send-email-linjie.fu@intel.com
State New
Headers show

Commit Message

Linjie Fu May 31, 2019, 12:34 a.m.
It seems that VA_CODED_BUF_STATUS_SINGLE_NALU allows driver to map
buffer for each slice.

Currently, assigning new buffer for pkt when multiple buffer returns
from vaMapBuffer will cover the previous encoded pkt data and lead
to encode issues.

Iterate through the buf_list first to find out the total buffer size
needed for the pkt, allocate the whole pkt to avoid repeated reallocation
and memcpy, then copy data from each buf to pkt.

Signed-off-by: Linjie Fu <linjie.fu@intel.com>
---
[v2]: allocate the whole pkt to avoid repeated reallocation
and memcpy

 libavcodec/vaapi_encode.c | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

Comments

Linjie Fu June 4, 2019, 9:10 a.m.
> -----Original Message-----
> From: Fu, Linjie
> Sent: Friday, May 31, 2019 08:35
> To: ffmpeg-devel@ffmpeg.org
> Cc: Fu, Linjie <linjie.fu@intel.com>
> Subject: [PATCH,v2] lavc/vaapi_encode: grow packet if vaMapBuffer returns
> multiple buffers
> 
> It seems that VA_CODED_BUF_STATUS_SINGLE_NALU allows driver to map
> buffer for each slice.
> 
> Currently, assigning new buffer for pkt when multiple buffer returns
> from vaMapBuffer will cover the previous encoded pkt data and lead
> to encode issues.
> 
> Iterate through the buf_list first to find out the total buffer size
> needed for the pkt, allocate the whole pkt to avoid repeated reallocation
> and memcpy, then copy data from each buf to pkt.
> 
> Signed-off-by: Linjie Fu <linjie.fu@intel.com>
> ---
> [v2]: allocate the whole pkt to avoid repeated reallocation
> and memcpy
> 
>  libavcodec/vaapi_encode.c | 18 +++++++++++++-----
>  1 file changed, 13 insertions(+), 5 deletions(-)
> 
> diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c
> index 2dda451..9c9e5dd 100644
> --- a/libavcodec/vaapi_encode.c
> +++ b/libavcodec/vaapi_encode.c
> @@ -489,6 +489,8 @@ static int vaapi_encode_output(AVCodecContext
> *avctx,
>      VAAPIEncodeContext *ctx = avctx->priv_data;
>      VACodedBufferSegment *buf_list, *buf;
>      VAStatus vas;
> +    int total_size = 0;
> +    uint8_t *ptr;
>      int err;
> 
>      err = vaapi_encode_wait(avctx, pic);
> @@ -505,15 +507,21 @@ static int vaapi_encode_output(AVCodecContext
> *avctx,
>          goto fail;
>      }
> 
> +    for (buf = buf_list; buf; buf = buf->next)
> +        total_size += buf->size;
> +
> +    err = av_new_packet(pkt, total_size);
> +    ptr = pkt->data;
> +
> +    if (err < 0)
> +        goto fail_mapped;
> +
>      for (buf = buf_list; buf; buf = buf->next) {
>          av_log(avctx, AV_LOG_DEBUG, "Output buffer: %u bytes "
>                 "(status %08x).\n", buf->size, buf->status);
> 
> -        err = av_new_packet(pkt, buf->size);
> -        if (err < 0)
> -            goto fail_mapped;
> -
> -        memcpy(pkt->data, buf->buf, buf->size);
> +        memcpy(ptr, buf->buf, buf->size);
> +        ptr += buf->size;
>      }
> 
>      if (pic->type == PICTURE_TYPE_IDR)
> --
> 2.7.4

Ping?
This can fix the encoding issue for vaapi_vp8:
ffmpeg -hwaccel vaapi -vaapi_device /dev/dri/renderD128 -v verbose -f rawvideo -pix_fmt yuv420p -s:v 1280x720 -i ./input_I420.yuv -vf 'format=nv12,hwupload' -c:v vp8_vaapi -rc_mode CQP -g 1 -global_quality 14 -loop_filter_sharpness 0 -loop_filter_level 0 -vframes 10 -y out.ivf
Linjie Fu Aug. 6, 2019, 8:11 a.m.
> -----Original Message-----

> From: ffmpeg-devel [mailto:ffmpeg-devel-bounces@ffmpeg.org] On Behalf

> Of Fu, Linjie

> Sent: Tuesday, June 4, 2019 17:11

> To: ffmpeg-devel@ffmpeg.org

> Cc: Mark Thompson <sw@jkqxz.net>

> Subject: Re: [FFmpeg-devel] [PATCH, v2] lavc/vaapi_encode: grow packet if

> vaMapBuffer returns multiple buffers

> 

> > -----Original Message-----

> > From: Fu, Linjie

> > Sent: Friday, May 31, 2019 08:35

> > To: ffmpeg-devel@ffmpeg.org

> > Cc: Fu, Linjie <linjie.fu@intel.com>

> > Subject: [PATCH,v2] lavc/vaapi_encode: grow packet if vaMapBuffer

> returns

> > multiple buffers

> >

> > It seems that VA_CODED_BUF_STATUS_SINGLE_NALU allows driver to

> map

> > buffer for each slice.

> >

> > Currently, assigning new buffer for pkt when multiple buffer returns

> > from vaMapBuffer will cover the previous encoded pkt data and lead

> > to encode issues.

> >

> > Iterate through the buf_list first to find out the total buffer size

> > needed for the pkt, allocate the whole pkt to avoid repeated reallocation

> > and memcpy, then copy data from each buf to pkt.

> >

> > Signed-off-by: Linjie Fu <linjie.fu@intel.com>

> > ---

> > [v2]: allocate the whole pkt to avoid repeated reallocation

> > and memcpy

> >

> >  libavcodec/vaapi_encode.c | 18 +++++++++++++-----

> >  1 file changed, 13 insertions(+), 5 deletions(-)

> >

> > diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c

> > index 2dda451..9c9e5dd 100644

> > --- a/libavcodec/vaapi_encode.c

> > +++ b/libavcodec/vaapi_encode.c

> > @@ -489,6 +489,8 @@ static int vaapi_encode_output(AVCodecContext

> > *avctx,

> >      VAAPIEncodeContext *ctx = avctx->priv_data;

> >      VACodedBufferSegment *buf_list, *buf;

> >      VAStatus vas;

> > +    int total_size = 0;

> > +    uint8_t *ptr;

> >      int err;

> >

> >      err = vaapi_encode_wait(avctx, pic);

> > @@ -505,15 +507,21 @@ static int vaapi_encode_output(AVCodecContext

> > *avctx,

> >          goto fail;

> >      }

> >

> > +    for (buf = buf_list; buf; buf = buf->next)

> > +        total_size += buf->size;

> > +

> > +    err = av_new_packet(pkt, total_size);

> > +    ptr = pkt->data;

> > +

> > +    if (err < 0)

> > +        goto fail_mapped;

> > +

> >      for (buf = buf_list; buf; buf = buf->next) {

> >          av_log(avctx, AV_LOG_DEBUG, "Output buffer: %u bytes "

> >                 "(status %08x).\n", buf->size, buf->status);

> >

> > -        err = av_new_packet(pkt, buf->size);

> > -        if (err < 0)

> > -            goto fail_mapped;

> > -

> > -        memcpy(pkt->data, buf->buf, buf->size);

> > +        memcpy(ptr, buf->buf, buf->size);

> > +        ptr += buf->size;

> >      }

> >

> >      if (pic->type == PICTURE_TYPE_IDR)

> > --

> > 2.7.4

> 

> Ping?

> This can fix the encoding issue for vaapi_vp8:

> ffmpeg -hwaccel vaapi -vaapi_device /dev/dri/renderD128 -v verbose -f

> rawvideo -pix_fmt yuv420p -s:v 1280x720 -i ./input_I420.yuv -vf

> 'format=nv12,hwupload' -c:v vp8_vaapi -rc_mode CQP -g 1 -global_quality 14

> -loop_filter_sharpness 0 -loop_filter_level 0 -vframes 10 -y out.ivf


Media driver will return 2 buffers in fact. The first buffer is VACodedBufferSegment
buffer which includes encoded output. And the second buffer is extra VACodedBufferVP9Status.
https://github.com/intel/media-driver/issues/624

Fixes vp8 encoding issues for core platforms(Kaby Lake) and could be verified.
Ping?

- linjie
Linjie Fu Aug. 19, 2019, 2:04 a.m.
> -----Original Message-----

> From: ffmpeg-devel [mailto:ffmpeg-devel-bounces@ffmpeg.org] On Behalf

> Of Fu, Linjie

> Sent: Tuesday, August 6, 2019 16:12

> To: FFmpeg development discussions and patches <ffmpeg-

> devel@ffmpeg.org>; Mark Thompson <sw@jkqxz.net>

> Subject: Re: [FFmpeg-devel] [PATCH, v2] lavc/vaapi_encode: grow packet if

> vaMapBuffer returns multiple buffers

> 

> > -----Original Message-----

> > From: ffmpeg-devel [mailto:ffmpeg-devel-bounces@ffmpeg.org] On

> Behalf

> > Of Fu, Linjie

> > Sent: Tuesday, June 4, 2019 17:11

> > To: ffmpeg-devel@ffmpeg.org

> > Cc: Mark Thompson <sw@jkqxz.net>

> > Subject: Re: [FFmpeg-devel] [PATCH, v2] lavc/vaapi_encode: grow packet

> if

> > vaMapBuffer returns multiple buffers

> >

> > > -----Original Message-----

> > > From: Fu, Linjie

> > > Sent: Friday, May 31, 2019 08:35

> > > To: ffmpeg-devel@ffmpeg.org

> > > Cc: Fu, Linjie <linjie.fu@intel.com>

> > > Subject: [PATCH,v2] lavc/vaapi_encode: grow packet if vaMapBuffer

> > returns

> > > multiple buffers

> > >

> > > It seems that VA_CODED_BUF_STATUS_SINGLE_NALU allows driver to

> > map

> > > buffer for each slice.

> > >

> > > Currently, assigning new buffer for pkt when multiple buffer returns

> > > from vaMapBuffer will cover the previous encoded pkt data and lead

> > > to encode issues.

> > >

> > > Iterate through the buf_list first to find out the total buffer size

> > > needed for the pkt, allocate the whole pkt to avoid repeated reallocation

> > > and memcpy, then copy data from each buf to pkt.

> > >

> > > Signed-off-by: Linjie Fu <linjie.fu@intel.com>

> > > ---

> > > [v2]: allocate the whole pkt to avoid repeated reallocation

> > > and memcpy

> > >

> > >  libavcodec/vaapi_encode.c | 18 +++++++++++++-----

> > >  1 file changed, 13 insertions(+), 5 deletions(-)

> > >

> > > diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c

> > > index 2dda451..9c9e5dd 100644

> > > --- a/libavcodec/vaapi_encode.c

> > > +++ b/libavcodec/vaapi_encode.c

> > > @@ -489,6 +489,8 @@ static int vaapi_encode_output(AVCodecContext

> > > *avctx,

> > >      VAAPIEncodeContext *ctx = avctx->priv_data;

> > >      VACodedBufferSegment *buf_list, *buf;

> > >      VAStatus vas;

> > > +    int total_size = 0;

> > > +    uint8_t *ptr;

> > >      int err;

> > >

> > >      err = vaapi_encode_wait(avctx, pic);

> > > @@ -505,15 +507,21 @@ static int

> vaapi_encode_output(AVCodecContext

> > > *avctx,

> > >          goto fail;

> > >      }

> > >

> > > +    for (buf = buf_list; buf; buf = buf->next)

> > > +        total_size += buf->size;

> > > +

> > > +    err = av_new_packet(pkt, total_size);

> > > +    ptr = pkt->data;

> > > +

> > > +    if (err < 0)

> > > +        goto fail_mapped;

> > > +

> > >      for (buf = buf_list; buf; buf = buf->next) {

> > >          av_log(avctx, AV_LOG_DEBUG, "Output buffer: %u bytes "

> > >                 "(status %08x).\n", buf->size, buf->status);

> > >

> > > -        err = av_new_packet(pkt, buf->size);

> > > -        if (err < 0)

> > > -            goto fail_mapped;

> > > -

> > > -        memcpy(pkt->data, buf->buf, buf->size);

> > > +        memcpy(ptr, buf->buf, buf->size);

> > > +        ptr += buf->size;

> > >      }

> > >

> > >      if (pic->type == PICTURE_TYPE_IDR)

> > > --

> > > 2.7.4

> >

> > Ping?

> > This can fix the encoding issue for vaapi_vp8:

> > ffmpeg -hwaccel vaapi -vaapi_device /dev/dri/renderD128 -v verbose -f

> > rawvideo -pix_fmt yuv420p -s:v 1280x720 -i ./input_I420.yuv -vf

> > 'format=nv12,hwupload' -c:v vp8_vaapi -rc_mode CQP -g 1 -global_quality

> 14

> > -loop_filter_sharpness 0 -loop_filter_level 0 -vframes 10 -y out.ivf

> 

> Media driver will return 2 buffers in fact. The first buffer is

> VACodedBufferSegment

> buffer which includes encoded output. And the second buffer is extra

> VACodedBufferVP9Status.

> https://github.com/intel/media-driver/issues/624

> 

> Fixes vp8 encoding issues for core platforms(Kaby Lake) and could be verified.

> Ping?

> 

Another ping?
Had passed the regression patch check in https://github.com/intel-media-ci/ffmpeg/pull/44

- linjie
Linjie Fu Sept. 12, 2019, 4:57 a.m.
> -----Original Message-----

> From: ffmpeg-devel [mailto:ffmpeg-devel-bounces@ffmpeg.org] On Behalf

> Of Fu, Linjie

> Sent: Monday, August 19, 2019 10:04

> To: FFmpeg development discussions and patches <ffmpeg-

> devel@ffmpeg.org>; Mark Thompson <sw@jkqxz.net>

> Subject: Re: [FFmpeg-devel] [PATCH, v2] lavc/vaapi_encode: grow packet if

> vaMapBuffer returns multiple buffers

> 

> > -----Original Message-----

> > From: ffmpeg-devel [mailto:ffmpeg-devel-bounces@ffmpeg.org] On

> Behalf

> > Of Fu, Linjie

> > Sent: Tuesday, August 6, 2019 16:12

> > To: FFmpeg development discussions and patches <ffmpeg-

> > devel@ffmpeg.org>; Mark Thompson <sw@jkqxz.net>

> > Subject: Re: [FFmpeg-devel] [PATCH, v2] lavc/vaapi_encode: grow packet

> if

> > vaMapBuffer returns multiple buffers

> >

> > > -----Original Message-----

> > > From: ffmpeg-devel [mailto:ffmpeg-devel-bounces@ffmpeg.org] On

> > Behalf

> > > Of Fu, Linjie

> > > Sent: Tuesday, June 4, 2019 17:11

> > > To: ffmpeg-devel@ffmpeg.org

> > > Cc: Mark Thompson <sw@jkqxz.net>

> > > Subject: Re: [FFmpeg-devel] [PATCH, v2] lavc/vaapi_encode: grow

> packet

> > if

> > > vaMapBuffer returns multiple buffers

> > >

> > > > -----Original Message-----

> > > > From: Fu, Linjie

> > > > Sent: Friday, May 31, 2019 08:35

> > > > To: ffmpeg-devel@ffmpeg.org

> > > > Cc: Fu, Linjie <linjie.fu@intel.com>

> > > > Subject: [PATCH,v2] lavc/vaapi_encode: grow packet if vaMapBuffer

> > > returns

> > > > multiple buffers

> > > >

> > > > It seems that VA_CODED_BUF_STATUS_SINGLE_NALU allows driver to

> > > map

> > > > buffer for each slice.

> > > >

> > > > Currently, assigning new buffer for pkt when multiple buffer returns

> > > > from vaMapBuffer will cover the previous encoded pkt data and lead

> > > > to encode issues.

> > > >

> > > > Iterate through the buf_list first to find out the total buffer size

> > > > needed for the pkt, allocate the whole pkt to avoid repeated

> reallocation

> > > > and memcpy, then copy data from each buf to pkt.

> > > >

> > > > Signed-off-by: Linjie Fu <linjie.fu@intel.com>

> > > > ---

> > > > [v2]: allocate the whole pkt to avoid repeated reallocation

> > > > and memcpy

> > > >

> > > >  libavcodec/vaapi_encode.c | 18 +++++++++++++-----

> > > >  1 file changed, 13 insertions(+), 5 deletions(-)

> > > >

> > > > diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c

> > > > index 2dda451..9c9e5dd 100644

> > > > --- a/libavcodec/vaapi_encode.c

> > > > +++ b/libavcodec/vaapi_encode.c

> > > > @@ -489,6 +489,8 @@ static int

> vaapi_encode_output(AVCodecContext

> > > > *avctx,

> > > >      VAAPIEncodeContext *ctx = avctx->priv_data;

> > > >      VACodedBufferSegment *buf_list, *buf;

> > > >      VAStatus vas;

> > > > +    int total_size = 0;

> > > > +    uint8_t *ptr;

> > > >      int err;

> > > >

> > > >      err = vaapi_encode_wait(avctx, pic);

> > > > @@ -505,15 +507,21 @@ static int

> > vaapi_encode_output(AVCodecContext

> > > > *avctx,

> > > >          goto fail;

> > > >      }

> > > >

> > > > +    for (buf = buf_list; buf; buf = buf->next)

> > > > +        total_size += buf->size;

> > > > +

> > > > +    err = av_new_packet(pkt, total_size);

> > > > +    ptr = pkt->data;

> > > > +

> > > > +    if (err < 0)

> > > > +        goto fail_mapped;

> > > > +

> > > >      for (buf = buf_list; buf; buf = buf->next) {

> > > >          av_log(avctx, AV_LOG_DEBUG, "Output buffer: %u bytes "

> > > >                 "(status %08x).\n", buf->size, buf->status);

> > > >

> > > > -        err = av_new_packet(pkt, buf->size);

> > > > -        if (err < 0)

> > > > -            goto fail_mapped;

> > > > -

> > > > -        memcpy(pkt->data, buf->buf, buf->size);

> > > > +        memcpy(ptr, buf->buf, buf->size);

> > > > +        ptr += buf->size;

> > > >      }

> > > >

> > > >      if (pic->type == PICTURE_TYPE_IDR)

> > > > --

> > > > 2.7.4

> > >

> > > Ping?

> > > This can fix the encoding issue for vaapi_vp8:

> > > ffmpeg -hwaccel vaapi -vaapi_device /dev/dri/renderD128 -v verbose -f

> > > rawvideo -pix_fmt yuv420p -s:v 1280x720 -i ./input_I420.yuv -vf

> > > 'format=nv12,hwupload' -c:v vp8_vaapi -rc_mode CQP -g 1 -

> global_quality

> > 14

> > > -loop_filter_sharpness 0 -loop_filter_level 0 -vframes 10 -y out.ivf

> >

> > Media driver will return 2 buffers in fact. The first buffer is

> > VACodedBufferSegment

> > buffer which includes encoded output. And the second buffer is extra

> > VACodedBufferVP9Status.

> > https://github.com/intel/media-driver/issues/624

> >

> > Fixes vp8 encoding issues for core platforms(Kaby Lake) and could be

> verified.

> > Ping?

> >

> Another ping?

> Had passed the regression patch check in https://github.com/intel-media-

> ci/ffmpeg/pull/44

> 

ping x 4?
This fixes  vp8/vp9 encoding.

- linjie
Zhong Li Sept. 12, 2019, 4:04 p.m.
> From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of Linjie Fu

> Sent: Friday, May 31, 2019 8:35 AM

> To: ffmpeg-devel@ffmpeg.org

> Cc: Fu, Linjie <linjie.fu@intel.com>

> Subject: [FFmpeg-devel] [PATCH, v2] lavc/vaapi_encode: grow packet if

> vaMapBuffer returns multiple buffers

> 

> It seems that VA_CODED_BUF_STATUS_SINGLE_NALU allows driver to map

> buffer for each slice.

> 

> Currently, assigning new buffer for pkt when multiple buffer returns from

> vaMapBuffer will cover the previous encoded pkt data and lead to encode issues.

> 

> Iterate through the buf_list first to find out the total buffer size needed for the

> pkt, allocate the whole pkt to avoid repeated reallocation and memcpy, then copy

> data from each buf to pkt.

> 

> Signed-off-by: Linjie Fu <linjie.fu@intel.com>

> ---

> [v2]: allocate the whole pkt to avoid repeated reallocation and memcpy

> 

>  libavcodec/vaapi_encode.c | 18 +++++++++++++-----

>  1 file changed, 13 insertions(+), 5 deletions(-)

> 

> diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c index

> 2dda451..9c9e5dd 100644

> --- a/libavcodec/vaapi_encode.c

> +++ b/libavcodec/vaapi_encode.c

> @@ -489,6 +489,8 @@ static int vaapi_encode_output(AVCodecContext *avctx,

>      VAAPIEncodeContext *ctx = avctx->priv_data;

>      VACodedBufferSegment *buf_list, *buf;

>      VAStatus vas;

> +    int total_size = 0;

> +    uint8_t *ptr;

>      int err;

> 

>      err = vaapi_encode_wait(avctx, pic); @@ -505,15 +507,21 @@ static int

> vaapi_encode_output(AVCodecContext *avctx,

>          goto fail;

>      }

> 

> +    for (buf = buf_list; buf; buf = buf->next)

> +        total_size += buf->size;

> +

> +    err = av_new_packet(pkt, total_size);

> +    ptr = pkt->data;

> +

> +    if (err < 0)

> +        goto fail_mapped;

> +

>      for (buf = buf_list; buf; buf = buf->next) {

>          av_log(avctx, AV_LOG_DEBUG, "Output buffer: %u bytes "

>                 "(status %08x).\n", buf->size, buf->status);

> 

> -        err = av_new_packet(pkt, buf->size);

> -        if (err < 0)

> -            goto fail_mapped;

> -

> -        memcpy(pkt->data, buf->buf, buf->size);

> +        memcpy(ptr, buf->buf, buf->size);

> +        ptr += buf->size;

>      }

> 

>      if (pic->type == PICTURE_TYPE_IDR)

> --

> 2.7.4


LGTM

Patch hide | download patch | download mbox

diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c
index 2dda451..9c9e5dd 100644
--- a/libavcodec/vaapi_encode.c
+++ b/libavcodec/vaapi_encode.c
@@ -489,6 +489,8 @@  static int vaapi_encode_output(AVCodecContext *avctx,
     VAAPIEncodeContext *ctx = avctx->priv_data;
     VACodedBufferSegment *buf_list, *buf;
     VAStatus vas;
+    int total_size = 0;
+    uint8_t *ptr;
     int err;
 
     err = vaapi_encode_wait(avctx, pic);
@@ -505,15 +507,21 @@  static int vaapi_encode_output(AVCodecContext *avctx,
         goto fail;
     }
 
+    for (buf = buf_list; buf; buf = buf->next)
+        total_size += buf->size;
+
+    err = av_new_packet(pkt, total_size);
+    ptr = pkt->data;
+
+    if (err < 0)
+        goto fail_mapped;
+
     for (buf = buf_list; buf; buf = buf->next) {
         av_log(avctx, AV_LOG_DEBUG, "Output buffer: %u bytes "
                "(status %08x).\n", buf->size, buf->status);
 
-        err = av_new_packet(pkt, buf->size);
-        if (err < 0)
-            goto fail_mapped;
-
-        memcpy(pkt->data, buf->buf, buf->size);
+        memcpy(ptr, buf->buf, buf->size);
+        ptr += buf->size;
     }
 
     if (pic->type == PICTURE_TYPE_IDR)