[FFmpeg-devel] [PATCH 1/3] avcodec/ilbcdec: Remove dead code

[FFmpeg-devel] [PATCH 1/3] avcodec/ilbcdec: Remove dead code

[Michael Niedermayer]

Yes the same dead code is in "iLBC Speech Coder ANSI-C Source Code"

Fixes: CID1509370 Logically dead code

Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/ilbcdec.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/libavcodec/ilbcdec.c b/libavcodec/ilbcdec.c
index 4ecdff41831..ba1da168bc0 100644
--- a/libavcodec/ilbcdec.c
+++ b/libavcodec/ilbcdec.c
@@ -1095,12 +1095,6 @@ static void do_plc(int16_t *plc_residual,      /* (o) concealed residual */
 
         if (s->consPLICount * s->block_samples > 320) {
             use_gain = 29491;   /* 0.9 in Q15 */
-        } else if (s->consPLICount * s->block_samples > 640) {
-            use_gain = 22938;   /* 0.7 in Q15 */
-        } else if (s->consPLICount * s->block_samples > 960) {
-            use_gain = 16384;   /* 0.5 in Q15 */
-        } else if (s->consPLICount * s->block_samples > 1280) {
-            use_gain = 0;       /* 0.0 in Q15 */
         }
 
         /* Compute mixing factor of picth repeatition and noise:
-- 
2.43.2

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

[FFmpeg-devel] [PATCH 2/3] avcodec/jpeg2000dec: remove ST=3 case

[Michael Niedermayer]

Fixes: CID1460979 Logically dead code

Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/jpeg2000dec.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c
index 28bf6be2fef..135537b52fb 100644
--- a/libavcodec/jpeg2000dec.c
+++ b/libavcodec/jpeg2000dec.c
@@ -835,9 +835,6 @@ static int get_tlm(Jpeg2000DecoderContext *s, int n)
         case 2:
             bytestream2_get_be16(&s->g);
             break;
-        case 3:
-            bytestream2_get_be32(&s->g);
-            break;
         }
         if (SP == 0) {
             bytestream2_get_be16(&s->g);
-- 
2.43.2

_______________________________________________
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 2/3] avcodec/jpeg2000dec: remove ST=3 case

[Tomas Härdin]

fre 2024-05-10 klockan 16:07 +0200 skrev Michael Niedermayer:
> Fixes: CID1460979 Logically dead code
> 
> Sponsored-by: Sovereign Tech Fund
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/jpeg2000dec.c | 3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c
> index 28bf6be2fef..135537b52fb 100644
> --- a/libavcodec/jpeg2000dec.c
> +++ b/libavcodec/jpeg2000dec.c
> @@ -835,9 +835,6 @@ static int get_tlm(Jpeg2000DecoderContext *s, int
> n)
>          case 2:
>              bytestream2_get_be16(&s->g);
>              break;
> -        case 3:
> -            bytestream2_get_be32(&s->g);
> -            break;

Double-checked T.800 table A.34 and indeed ST == 3 is invalid (which is
also checked just above). So looks OK.

/Tomas
_______________________________________________
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 2/3] avcodec/jpeg2000dec: remove ST=3 case

[Michael Niedermayer]

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

On Mon, May 13, 2024 at 10:35:44AM +0200, Tomas Härdin wrote:
> fre 2024-05-10 klockan 16:07 +0200 skrev Michael Niedermayer:
> > Fixes: CID1460979 Logically dead code
> > 
> > Sponsored-by: Sovereign Tech Fund
> > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> > ---
> >  libavcodec/jpeg2000dec.c | 3 ---
> >  1 file changed, 3 deletions(-)
> > 
> > diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c
> > index 28bf6be2fef..135537b52fb 100644
> > --- a/libavcodec/jpeg2000dec.c
> > +++ b/libavcodec/jpeg2000dec.c
> > @@ -835,9 +835,6 @@ static int get_tlm(Jpeg2000DecoderContext *s, int
> > n)
> >          case 2:
> >              bytestream2_get_be16(&s->g);
> >              break;
> > -        case 3:
> > -            bytestream2_get_be32(&s->g);
> > -            break;
> 
> Double-checked T.800 table A.34 and indeed ST == 3 is invalid (which is
> also checked just above). So looks OK.

will apply

thx

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Its not that you shouldnt use gotos but rather that you should write
readable code and code with gotos often but not always is less readable

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

Re: [FFmpeg-devel] [PATCH 2/3] avcodec/jpeg2000dec: remove ST=3 case

[Tomas Härdin]

fre 2024-05-10 klockan 16:07 +0200 skrev Michael Niedermayer:
> Fixes: CID1460979 Logically dead code
> 
> Sponsored-by: Sovereign Tech Fund
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/jpeg2000dec.c | 3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c
> index 28bf6be2fef..135537b52fb 100644
> --- a/libavcodec/jpeg2000dec.c
> +++ b/libavcodec/jpeg2000dec.c
> @@ -835,9 +835,6 @@ static int get_tlm(Jpeg2000DecoderContext *s, int
> n)
>          case 2:
>              bytestream2_get_be16(&s->g);
>              break;
> -        case 3:
> -            bytestream2_get_be32(&s->g);
> -            break;

I will also point out get_tlm() doesn't actually do anything other than
advance the bytestream. We could just as well advance by Ltlm

/Tomas
_______________________________________________
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 2/3] avcodec/jpeg2000dec: remove ST=3 case

[Tomas Härdin]

mån 2024-05-13 klockan 10:51 +0200 skrev Tomas Härdin:
> fre 2024-05-10 klockan 16:07 +0200 skrev Michael Niedermayer:
> > Fixes: CID1460979 Logically dead code
> > 
> > Sponsored-by: Sovereign Tech Fund
> > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> > ---
> >  libavcodec/jpeg2000dec.c | 3 ---
> >  1 file changed, 3 deletions(-)
> > 
> > diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c
> > index 28bf6be2fef..135537b52fb 100644
> > --- a/libavcodec/jpeg2000dec.c
> > +++ b/libavcodec/jpeg2000dec.c
> > @@ -835,9 +835,6 @@ static int get_tlm(Jpeg2000DecoderContext *s,
> > int
> > n)
> >          case 2:
> >              bytestream2_get_be16(&s->g);
> >              break;
> > -        case 3:
> > -            bytestream2_get_be32(&s->g);
> > -            break;
> 
> I will also point out get_tlm() doesn't actually do anything other
> than
> advance the bytestream. We could just as well advance by Ltlm

Correction: it does validate that the TLM marker is correctly
formatted, so that's something at least

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

[FFmpeg-devel] [PATCH 3/3] avcodec/libx264: Check init_get_bits8() return code

[Michael Niedermayer]

Fixes: CID1594529 Unchecked return value

Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/libx264.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index 2715f277f1f..e4938c54a90 100644
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -922,7 +922,9 @@ static int set_avcc_extradata(AVCodecContext *avctx, x264_nal_t *nal, int nnal)
          *
          * +4 to skip until sps id.
          */
-        init_get_bits8(&gbc, sps + 4, sps_nal->i_payload - 4 - 4);
+        ret = init_get_bits8(&gbc, sps + 4, sps_nal->i_payload - 4 - 4);
+        if (ret < 0)
+            return ret;
         // Skip sps id
         get_ue_golomb_31(&gbc);
         chroma_format_idc = get_ue_golomb_31(&gbc);
-- 
2.43.2

_______________________________________________
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 1/3] avcodec/ilbcdec: Remove dead code

[Michael Niedermayer]

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

On Fri, May 10, 2024 at 04:07:03PM +0200, Michael Niedermayer wrote:
> Yes the same dead code is in "iLBC Speech Coder ANSI-C Source Code"
> 
> Fixes: CID1509370 Logically dead code
> 
> Sponsored-by: Sovereign Tech Fund
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/ilbcdec.c | 6 ------
>  1 file changed, 6 deletions(-)

will apply the remaining 2 patches of this set

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Old school: Use the lowest level language in which you can solve the problem
            conveniently.
New school: Use the highest level language in which the latest supercomputer
            can solve the problem without the user falling asleep waiting.

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