[FFmpeg-devel] [PATCH] avcodec/pictordec: Remove mid exit branch

[FFmpeg-devel] [PATCH] avcodec/pictordec: Remove mid exit branch

[Michael Niedermayer]

This causes the RLE decoder to exit before applying the last RLE run
All images i tested with are unchanged, this makes the special case
for handling the last run unused for non truncated images.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/pictordec.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/libavcodec/pictordec.c b/libavcodec/pictordec.c
index 09229b94fd..27f5b96571 100644
--- a/libavcodec/pictordec.c
+++ b/libavcodec/pictordec.c
@@ -246,8 +246,6 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame,
                         run = bytestream2_get_le16(&s->g);
                     val = bytestream2_get_byte(&s->g);
                 }
-                if (!bytestream2_get_bytes_left(&s->g))
-                    break;
 
                 if (bits_per_plane == 8) {
                     picmemset_8bpp(s, frame, val, run, &x, &y);
-- 
2.17.1

_______________________________________________
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".

Re: [FFmpeg-devel] [PATCH] avcodec/pictordec: Remove mid exit branch

[Peter Ross]

On Fri, Nov 25, 2022 at 09:18:33PM +0100, Michael Niedermayer wrote:
> This causes the RLE decoder to exit before applying the last RLE run
> All images i tested with are unchanged, this makes the special case
> for handling the last run unused for non truncated images.
> 
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/pictordec.c | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/libavcodec/pictordec.c b/libavcodec/pictordec.c
> index 09229b94fd..27f5b96571 100644
> --- a/libavcodec/pictordec.c
> +++ b/libavcodec/pictordec.c
> @@ -246,8 +246,6 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame,
>                          run = bytestream2_get_le16(&s->g);
>                      val = bytestream2_get_byte(&s->g);
>                  }
> -                if (!bytestream2_get_bytes_left(&s->g))
> -                    break;
>  
>                  if (bits_per_plane == 8) {
>                      picmemset_8bpp(s, frame, val, run, &x, &y);
> -- 
> 2.17.1

ok

-- Peter
(A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B)
_______________________________________________
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".

Re: [FFmpeg-devel] [PATCH] avcodec/pictordec: Remove mid exit branch

[Michael Niedermayer]

[-- Attachment #1.1: Type: text/plain, Size: 1394 bytes --]

On Sat, Nov 26, 2022 at 10:43:34AM +1100, Peter Ross wrote:
> On Fri, Nov 25, 2022 at 09:18:33PM +0100, Michael Niedermayer wrote:
> > This causes the RLE decoder to exit before applying the last RLE run
> > All images i tested with are unchanged, this makes the special case
> > for handling the last run unused for non truncated images.
> > 
> > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> > ---
> >  libavcodec/pictordec.c | 2 --
> >  1 file changed, 2 deletions(-)
> > 
> > diff --git a/libavcodec/pictordec.c b/libavcodec/pictordec.c
> > index 09229b94fd..27f5b96571 100644
> > --- a/libavcodec/pictordec.c
> > +++ b/libavcodec/pictordec.c
> > @@ -246,8 +246,6 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame,
> >                          run = bytestream2_get_le16(&s->g);
> >                      val = bytestream2_get_byte(&s->g);
> >                  }
> > -                if (!bytestream2_get_bytes_left(&s->g))
> > -                    break;
> >  
> >                  if (bits_per_plane == 8) {
> >                      picmemset_8bpp(s, frame, val, run, &x, &y);
> > -- 
> > 2.17.1
> 
> ok

will apply

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

it is not once nor twice but times without number that the same ideas make
their appearance in the world. -- Aristotle

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

_______________________________________________
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".