| Message ID | 20230929083213.1254-1-d.kozinski@samsung.com |
|---|---|
| State | Accepted |
| Commit | 3ba3e188b32a48cfca36f02ea9671e22f4c2482c |
| Headers | show |
| Series | [FFmpeg-devel,v1] avcodec/hevcpred_template: Removed unreachable code | expand |
| 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 |
Hi, On Fri, Sep 29, 2023 at 4:32 AM Dawid Kozinski <d.kozinski@samsung.com> wrote: > Signed-off-by: Dawid Kozinski <d.kozinski@samsung.com> > --- > libavcodec/hevcpred_template.c | 11 ++++------- > 1 file changed, 4 insertions(+), 7 deletions(-) > > diff --git a/libavcodec/hevcpred_template.c > b/libavcodec/hevcpred_template.c > index 16d1c7f35f..46bd806523 100644 > --- a/libavcodec/hevcpred_template.c > +++ b/libavcodec/hevcpred_template.c > @@ -213,13 +213,10 @@ do { \ > j = 0; > while (j < size_max_x && !IS_INTRA(j, -1)) > j++; > - if (j > 0) > - if (cand_up_left) { > - EXTEND_LEFT_CIP(top, j, j + 1); > - } else { > - EXTEND_LEFT_CIP(top, j, j); > - top[-1] = top[0]; > - } > + if (j > 0) { > + EXTEND_LEFT_CIP(top, j, j); > + top[-1] = top[0]; > + } > left[-1] = top[-1]; > } > left[-1] = top[-1]; > -- > 2.25.1 > LGTM. Can you merge yourself, or do you need me to merge for you? Ronald
> -----Original Message----- > From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of Ronald > S. Bultje > Sent: poniedziałek, 2 października 2023 15:49 > To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> > Cc: Dawid Kozinski <d.kozinski@samsung.com>; d.frankiewic@samsung.com > Subject: Re: [FFmpeg-devel] [PATCH v1] avcodec/hevcpred_template: Removed > unreachable code > > Hi, > > On Fri, Sep 29, 2023 at 4:32 AM Dawid Kozinski <d.kozinski@samsung.com> > wrote: > > > Signed-off-by: Dawid Kozinski <d.kozinski@samsung.com> > > --- > > libavcodec/hevcpred_template.c | 11 ++++------- > > 1 file changed, 4 insertions(+), 7 deletions(-) > > > > diff --git a/libavcodec/hevcpred_template.c > > b/libavcodec/hevcpred_template.c index 16d1c7f35f..46bd806523 100644 > > --- a/libavcodec/hevcpred_template.c > > +++ b/libavcodec/hevcpred_template.c > > @@ -213,13 +213,10 @@ do { \ > > j = 0; > > while (j < size_max_x && !IS_INTRA(j, -1)) > > j++; > > - if (j > 0) > > - if (cand_up_left) { > > - EXTEND_LEFT_CIP(top, j, j + 1); > > - } else { > > - EXTEND_LEFT_CIP(top, j, j); > > - top[-1] = top[0]; > > - } > > + if (j > 0) { > > + EXTEND_LEFT_CIP(top, j, j); > > + top[-1] = top[0]; > > + } > > left[-1] = top[-1]; > > } > > left[-1] = top[-1]; > > -- > > 2.25.1 > > > > LGTM. > > Can you merge yourself, or do you need me to merge for you? Thank you for review. If you can, merge it, please. Dawid > > Ronald > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://protect2.fireeye.com/v1/url?k=d33121fa-8cad08d0-d330aab5- > 000babe598f7-032ae0d1a82bd0a7&q=1&e=1c6b6f88-d7aa-4952-9930- > 83712a0c6be3&u=https%3A%2F%2Fffmpeg.org%2Fmailman%2Flistinfo%2Fffmp > eg-devel > > To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org > with subject "unsubscribe".
Hi, On Tue, Oct 3, 2023 at 4:15 AM Dawid Kozinski/Multimedia (PLT) /SRPOL/Staff Engineer/Samsung Electronics <d.kozinski@samsung.com> wrote: > > > > > -----Original Message----- > > From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of Ronald > > S. Bultje > > Sent: poniedziałek, 2 października 2023 15:49 > > To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> > > Cc: Dawid Kozinski <d.kozinski@samsung.com>; d.frankiewic@samsung.com > > Subject: Re: [FFmpeg-devel] [PATCH v1] avcodec/hevcpred_template: Removed > > unreachable code > > > > Hi, > > > > On Fri, Sep 29, 2023 at 4:32 AM Dawid Kozinski <d.kozinski@samsung.com> > > wrote: > > > > > Signed-off-by: Dawid Kozinski <d.kozinski@samsung.com> > > > --- > > > libavcodec/hevcpred_template.c | 11 ++++------- > > > 1 file changed, 4 insertions(+), 7 deletions(-) > > > > > > diff --git a/libavcodec/hevcpred_template.c > > > b/libavcodec/hevcpred_template.c index 16d1c7f35f..46bd806523 100644 > > > --- a/libavcodec/hevcpred_template.c > > > +++ b/libavcodec/hevcpred_template.c > > > @@ -213,13 +213,10 @@ do { \ > > > j = 0; > > > while (j < size_max_x && !IS_INTRA(j, -1)) > > > j++; > > > - if (j > 0) > > > - if (cand_up_left) { > > > - EXTEND_LEFT_CIP(top, j, j + 1); > > > - } else { > > > - EXTEND_LEFT_CIP(top, j, j); > > > - top[-1] = top[0]; > > > - } > > > + if (j > 0) { > > > + EXTEND_LEFT_CIP(top, j, j); > > > + top[-1] = top[0]; > > > + } > > > left[-1] = top[-1]; > > > } > > > left[-1] = top[-1]; > > > -- > > > 2.25.1 > > > > > > > LGTM. > > > > Can you merge yourself, or do you need me to merge for you? > > Thank you for review. > If you can, merge it, please. > Done. Ronald
diff --git a/libavcodec/hevcpred_template.c b/libavcodec/hevcpred_template.c index 16d1c7f35f..46bd806523 100644 --- a/libavcodec/hevcpred_template.c +++ b/libavcodec/hevcpred_template.c @@ -213,13 +213,10 @@ do { \ j = 0; while (j < size_max_x && !IS_INTRA(j, -1)) j++; - if (j > 0) - if (cand_up_left) { - EXTEND_LEFT_CIP(top, j, j + 1); - } else { - EXTEND_LEFT_CIP(top, j, j); - top[-1] = top[0]; - } + if (j > 0) { + EXTEND_LEFT_CIP(top, j, j); + top[-1] = top[0]; + } left[-1] = top[-1]; } left[-1] = top[-1];
Signed-off-by: Dawid Kozinski <d.kozinski@samsung.com> --- libavcodec/hevcpred_template.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)