Message ID | 1560235949-29164-1-git-send-email-shaofei.wang@intel.com |
---|---|
State | New |
Headers | show |
Hello here, A simple ping about this patch Please feel free to ask if you have any question
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?
> -----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.
*bump* This patch fixes vp8d output corruption in multi-thread mode. This bug has existed for way too long. > -----Original Message----- > From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of Wang, Shaofei > Sent: Monday, July 01, 2019 1:22 AM > 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 > > > -----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. > _______________________________________________ > 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".
> *bump* > > This patch fixes vp8d output corruption in multi-thread mode. This bug has > existed for way too long. This patch works fine for me too, could someone in MAINTAINERS take a look at this patch and merge it if no problem? Thanks Haihao > > > -----Original Message----- > > From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of Wang, > > Shaofei > > Sent: Monday, July 01, 2019 1:22 AM > > 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 > > > > > -----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. > > _______________________________________________ > > 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".
I tested: PASS: make THREADS=2 THREAD_TYPE=frame fate-vp8 PASS: make THREADS=1 THREAD_TYPE=frame fate-vp8 PASS: make THREADS=8 THREAD_TYPE=frame fate-vp8 PASS: make THREADS=6 THREAD_TYPE=frame fate-vp8 FAIL: make THREADS=2 THREAD_TYPE=tile fate-vp8 FAIL: make THREADS=1 THREAD_TYPE=tile fate-vp8 FAIL: make THREADS=8 THREAD_TYPE=tile fate-vp8 FAIL: make THREADS=6 THREAD_TYPE=tile fate-vp8 The vp8-2451 case fails, above, for tile thread type *without* this patch, too. This patch also fixes the issues reported at: https://github.com/intel/media-driver/issues/1028 and https://github.com/intel/media-driver/issues/1028#issuecomment-695033952 Regards, U. Artie > -----Original Message----- > From: Xiang, Haihao <haihao.xiang@intel.com> > Sent: Monday, September 21, 2020 8:09 PM > To: ffmpeg-devel@ffmpeg.org; Eoff, Ullysses A <ullysses.a.eoff@intel.com> > Subject: Re: [FFmpeg-devel] [PATCH v3] libavcodec/vp8dec: fix the multi-thread HWAccel decode error > > > > *bump* > > > > This patch fixes vp8d output corruption in multi-thread mode. This bug has > > existed for way too long. > > This patch works fine for me too, could someone in MAINTAINERS take a look at > this patch and merge it if no problem? > > Thanks > Haihao > > > > > > -----Original Message----- > > > From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of Wang, > > > Shaofei > > > Sent: Monday, July 01, 2019 1:22 AM > > > 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 > > > > > > > -----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. > > > _______________________________________________ > > > 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".
> -----Original Message----- > From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of Eoff, Ullysses A > Sent: Wednesday, September 23, 2020 10:33 AM > To: Xiang, Haihao <haihao.xiang@intel.com>; ffmpeg-devel@ffmpeg.org > Subject: Re: [FFmpeg-devel] [PATCH v3] libavcodec/vp8dec: fix the multi-thread HWAccel decode error > > I tested: > > PASS: make THREADS=2 THREAD_TYPE=frame fate-vp8 > PASS: make THREADS=1 THREAD_TYPE=frame fate-vp8 > PASS: make THREADS=8 THREAD_TYPE=frame fate-vp8 > PASS: make THREADS=6 THREAD_TYPE=frame fate-vp8 > > FAIL: make THREADS=2 THREAD_TYPE=tile fate-vp8 > FAIL: make THREADS=1 THREAD_TYPE=tile fate-vp8 > FAIL: make THREADS=8 THREAD_TYPE=tile fate-vp8 > FAIL: make THREADS=6 THREAD_TYPE=tile fate-vp8 > > The vp8-2451 case fails, above, for tile thread type *without* this patch, too. > > This patch also fixes the issues reported at: > > https://github.com/intel/media-driver/issues/1028 and > https://github.com/intel/media-driver/issues/1028#issuecomment-695033952 > > Regards, > U. Artie > Oops, it is "slice" not "tile" (thanks BBB for your help), so: PASS: make THREADS=2 THREAD_TYPE=slice fate-vp8 PASS: make THREADS=1 THREAD_TYPE=slice fate-vp8 PASS: make THREADS=8 THREAD_TYPE=slice fate-vp8 PASS: make THREADS=6 THREAD_TYPE=slice fate-vp8 Cheers, U. Artie
Hi, On Wed, Sep 23, 2020 at 1:48 PM Eoff, Ullysses A <ullysses.a.eoff@intel.com> wrote: > > -----Original Message----- > > From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of Eoff, > Ullysses A > > Sent: Wednesday, September 23, 2020 10:33 AM > > To: Xiang, Haihao <haihao.xiang@intel.com>; ffmpeg-devel@ffmpeg.org > > Subject: Re: [FFmpeg-devel] [PATCH v3] libavcodec/vp8dec: fix the > multi-thread HWAccel decode error > > > > I tested: > > > > PASS: make THREADS=2 THREAD_TYPE=frame fate-vp8 > > PASS: make THREADS=1 THREAD_TYPE=frame fate-vp8 > > PASS: make THREADS=8 THREAD_TYPE=frame fate-vp8 > > PASS: make THREADS=6 THREAD_TYPE=frame fate-vp8 > > > > FAIL: make THREADS=2 THREAD_TYPE=tile fate-vp8 > > FAIL: make THREADS=1 THREAD_TYPE=tile fate-vp8 > > FAIL: make THREADS=8 THREAD_TYPE=tile fate-vp8 > > FAIL: make THREADS=6 THREAD_TYPE=tile fate-vp8 > > > > The vp8-2451 case fails, above, for tile thread type *without* this > patch, too. > > > > This patch also fixes the issues reported at: > > > > https://github.com/intel/media-driver/issues/1028 and > > https://github.com/intel/media-driver/issues/1028#issuecomment-695033952 > > > > Regards, > > U. Artie > > > > Oops, it is "slice" not "tile" (thanks BBB for your help), so: > > PASS: make THREADS=2 THREAD_TYPE=slice fate-vp8 > PASS: make THREADS=1 THREAD_TYPE=slice fate-vp8 > PASS: make THREADS=8 THREAD_TYPE=slice fate-vp8 > PASS: make THREADS=6 THREAD_TYPE=slice fate-vp8 Merged. Ronald
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);