[FFmpeg-devel,v3] libavcodec/vp8dec: fix the multi-thread HWAccel decode error

Submitted by Shaofei Wang on June 11, 2019, 6:52 a.m.

Details

Message ID 1560235949-29164-1-git-send-email-shaofei.wang@intel.com
State New
Headers show

Commit Message

Shaofei Wang June 11, 2019, 6:52 a.m.
Fix the issue: https://github.com/intel/media-driver/issues/317

the root cause is update_dimensions will be called multple times
when decoder thread number is not only 1, but update_dimensions
call get_pixel_format in each decode thread will trigger the
hwaccel_uninit/hwaccel_init more than once. But only one hwaccel
should be shared with all decode threads.
in current context,
there are 3 situations in the update_dimensions():
1. First time calling. No matter single thread or multithread,
   get_pixel_format() should be called after dimensions were
   set;
2. Dimention changed at the runtime. Dimention need to be
   updated when macroblocks_base is already allocated,
   get_pixel_format() should be called to recreate new frames
   according to updated dimension;
3. Multithread first time calling. After decoder init, the
   other threads will call update_dimensions() at first time
   to allocate macroblocks_base and set dimensions.
   But get_pixel_format() is shouldn't be called due to low
   level frames and context are already created.

In this fix, we only call update_dimensions as need.

Signed-off-by: Wang, Shaofei <shaofei.wang@intel.com>
Reviewed-by: Jun, Zhao <jun.zhao@intel.com>
Reviewed-by: Haihao Xiang <haihao.xiang@intel.com>
---
Updated typo in the commit message

 libavcodec/vp8.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

Comments

Shaofei Wang July 1, 2019, 6:38 a.m.
Hello here,
A simple ping about this patch
Please feel free to ask if you have any question
mypopy@gmail.com July 1, 2019, 7:28 a.m.
On Mon, Jul 1, 2019 at 2:38 PM Wang, Shaofei <shaofei.wang@intel.com> wrote:
>
> Hello here,
> A simple ping about this patch
> Please feel free to ask if you have any question
Is it this patch https://patchwork.ffmpeg.org/patch/13723/ fix the same issue?
Shaofei Wang July 1, 2019, 8:22 a.m.
> -----Original Message-----

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

> mypopy@gmail.com

> Sent: Monday, July 1, 2019 3:28 PM

> To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>

> Cc: Xiang, Haihao <haihao.xiang@intel.com>

> Subject: Re: [FFmpeg-devel] [PATCH v3] libavcodec/vp8dec: fix the

> multi-thread HWAccel decode error

> 

> On Mon, Jul 1, 2019 at 2:38 PM Wang, Shaofei <shaofei.wang@intel.com>

> wrote:

> Is it this patch https://patchwork.ffmpeg.org/patch/13723/ fix the same

> issue?

It won't fix this issue in vp8.

Patch hide | download patch | download mbox

diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c
index ba79e5f..0a7f38b 100644
--- a/libavcodec/vp8.c
+++ b/libavcodec/vp8.c
@@ -187,7 +187,7 @@  static av_always_inline
 int update_dimensions(VP8Context *s, int width, int height, int is_vp7)
 {
     AVCodecContext *avctx = s->avctx;
-    int i, ret;
+    int i, ret, dim_reset = 0;
 
     if (width  != s->avctx->width || ((width+15)/16 != s->mb_width || (height+15)/16 != s->mb_height) && s->macroblocks_base ||
         height != s->avctx->height) {
@@ -196,9 +196,12 @@  int update_dimensions(VP8Context *s, int width, int height, int is_vp7)
         ret = ff_set_dimensions(s->avctx, width, height);
         if (ret < 0)
             return ret;
+
+        dim_reset = (s->macroblocks_base != NULL);
     }
 
-    if (!s->actually_webp && !is_vp7) {
+    if ((s->pix_fmt == AV_PIX_FMT_NONE || dim_reset) &&
+         !s->actually_webp && !is_vp7) {
         s->pix_fmt = get_pixel_format(s);
         if (s->pix_fmt < 0)
             return AVERROR(EINVAL);