[FFmpeg-devel] [PATCH 01/11] MAINTAINERS: Add Timo Rothenpieler to server admins

[FFmpeg-devel] [PATCH 01/11] MAINTAINERS: Add Timo Rothenpieler to server admins

[Michael Niedermayer]

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 MAINTAINERS | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index a82fa58c69f..57f437cd40e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -34,8 +34,8 @@ Miscellaneous Areas
 ===================
 
 documentation                           Stefano Sabatini, Mike Melanson, Timothy Gu, Gyan Doshi
-project server day to day operations    Árpád Gereöffy, Michael Niedermayer, Reimar Doeffinger, Alexander Strasser, Nikolay Aleksandrov
-project server emergencies              Árpád Gereöffy, Reimar Doeffinger, Alexander Strasser, Nikolay Aleksandrov
+project server day to day operations    Árpád Gereöffy, Michael Niedermayer, Reimar Doeffinger, Alexander Strasser, Nikolay Aleksandrov, Timo Rothenpieler
+project server emergencies              Árpád Gereöffy, Reimar Doeffinger, Alexander Strasser, Nikolay Aleksandrov, Timo Rothenpieler
 presets                                 Robert Swain
 metadata subsystem                      Aurelien Jacobs
 release management                      Michael Niedermayer
-- 
2.45.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 02/11] avcodec/vvc/dec: Check ff_init_cabac_decoder() for failure

[Michael Niedermayer]

Fixes: signed integer overflow: 1107820800 + 1107820800 cannot be represented in type 'int'
Fixes: left shift of 1091059712 by 6 places cannot be represented in type 'int'
Fixes: 69910/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VVC_fuzzer-5162839971528704

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/vvc/dec.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/libavcodec/vvc/dec.c b/libavcodec/vvc/dec.c
index a6b601b778c..563f6fcf082 100644
--- a/libavcodec/vvc/dec.c
+++ b/libavcodec/vvc/dec.c
@@ -476,13 +476,14 @@ static int slices_realloc(VVCFrameContext *fc)
     return 0;
 }
 
-static void ep_init_cabac_decoder(SliceContext *sc, const int index,
+static int ep_init_cabac_decoder(SliceContext *sc, const int index,
     const H2645NAL *nal, GetBitContext *gb, const CodedBitstreamUnit *unit)
 {
     const H266RawSlice *slice     = unit->content_ref;
     const H266RawSliceHeader *rsh = sc->sh.r;
     EntryPoint *ep                = sc->eps + index;
     int size;
+    int ret;
 
     if (index < rsh->num_entry_points) {
         int skipped = 0;
@@ -501,8 +502,11 @@ static void ep_init_cabac_decoder(SliceContext *sc, const int index,
         size = get_bits_left(gb) / 8;
     }
     av_assert0(gb->buffer + get_bits_count(gb) / 8 + size <= gb->buffer_end);
-    ff_init_cabac_decoder (&ep->cc, gb->buffer + get_bits_count(gb) / 8, size);
+    ret = ff_init_cabac_decoder (&ep->cc, gb->buffer + get_bits_count(gb) / 8, size);
+    if (ret < 0)
+        return ret;
     skip_bits(gb, size * 8);
+    return 0;
 }
 
 static int slice_init_entry_points(SliceContext *sc,
@@ -538,7 +542,9 @@ static int slice_init_entry_points(SliceContext *sc,
             fc->tab.slice_idx[rs] = sc->slice_idx;
         }
 
-        ep_init_cabac_decoder(sc, i, nal, &gb, unit);
+        ret = ep_init_cabac_decoder(sc, i, nal, &gb, unit);
+        if (ret < 0)
+            return ret;
 
         if (i + 1 < sc->nb_eps)
             ctu_addr = sh->entry_point_start_ctu[i];
-- 
2.45.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 02/11] avcodec/vvc/dec: Check ff_init_cabac_decoder() for failure

[Nuo Mi]

On Mon, Jul 1, 2024 at 7:13 AM Michael Niedermayer <michael@niedermayer.cc>
wrote:

> Fixes: signed integer overflow: 1107820800 + 1107820800 cannot be
> represented in type 'int'
> Fixes: left shift of 1091059712 by 6 places cannot be represented in type
> 'int'
> Fixes:
> 69910/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VVC_fuzzer-5162839971528704
>
LGTM

>
> Found-by: continuous fuzzing process
> https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by
> <https://github.com/google/oss-fuzz/tree/master/projects/ffmpegSigned-off-by>:
> Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/vvc/dec.c | 12 +++++++++---
>  1 file changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/libavcodec/vvc/dec.c b/libavcodec/vvc/dec.c
> index a6b601b778c..563f6fcf082 100644
> --- a/libavcodec/vvc/dec.c
> +++ b/libavcodec/vvc/dec.c
> @@ -476,13 +476,14 @@ static int slices_realloc(VVCFrameContext *fc)
>      return 0;
>  }
>
> -static void ep_init_cabac_decoder(SliceContext *sc, const int index,
> +static int ep_init_cabac_decoder(SliceContext *sc, const int index,
>      const H2645NAL *nal, GetBitContext *gb, const CodedBitstreamUnit
> *unit)
>  {
>      const H266RawSlice *slice     = unit->content_ref;
>      const H266RawSliceHeader *rsh = sc->sh.r;
>      EntryPoint *ep                = sc->eps + index;
>      int size;
> +    int ret;
>
>      if (index < rsh->num_entry_points) {
>          int skipped = 0;
> @@ -501,8 +502,11 @@ static void ep_init_cabac_decoder(SliceContext *sc,
> const int index,
>          size = get_bits_left(gb) / 8;
>      }
>      av_assert0(gb->buffer + get_bits_count(gb) / 8 + size <=
> gb->buffer_end);
> -    ff_init_cabac_decoder (&ep->cc, gb->buffer + get_bits_count(gb) / 8,
> size);
> +    ret = ff_init_cabac_decoder (&ep->cc, gb->buffer + get_bits_count(gb)
> / 8, size);
> +    if (ret < 0)
> +        return ret;
>      skip_bits(gb, size * 8);
> +    return 0;
>  }
>
>  static int slice_init_entry_points(SliceContext *sc,
> @@ -538,7 +542,9 @@ static int slice_init_entry_points(SliceContext *sc,
>              fc->tab.slice_idx[rs] = sc->slice_idx;
>          }
>
> -        ep_init_cabac_decoder(sc, i, nal, &gb, unit);
> +        ret = ep_init_cabac_decoder(sc, i, nal, &gb, unit);
> +        if (ret < 0)
> +            return ret;
>
>          if (i + 1 < sc->nb_eps)
>              ctu_addr = sh->entry_point_start_ctu[i];
> --
> 2.45.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 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 02/11] avcodec/vvc/dec: Check ff_init_cabac_decoder() for failure

[Michael Niedermayer]

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

On Mon, Jul 01, 2024 at 08:54:33PM +0800, Nuo Mi wrote:
> On Mon, Jul 1, 2024 at 7:13 AM Michael Niedermayer <michael@niedermayer.cc>
> wrote:
> 
> > Fixes: signed integer overflow: 1107820800 + 1107820800 cannot be
> > represented in type 'int'
> > Fixes: left shift of 1091059712 by 6 places cannot be represented in type
> > 'int'
> > Fixes:
> > 69910/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VVC_fuzzer-5162839971528704
> >
> LGTM

will apply

thx

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

Good people do not need laws to tell them to act responsibly, while bad
people will find a way around the laws. -- Plato

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

[FFmpeg-devel] [PATCH 03/11] avcodec/aac/aacdec: Check if frame is allocated in frame_configure_elements()

[Michael Niedermayer]

I did not investigate exactly why frame is NULL, happy to provide the sample
if someone wants to investigate further

Fixes: NULL pointer dereference
Fixes: 69893/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AAC_FIXED_fuzzer-4965255361396736

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/aac/aacdec.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavcodec/aac/aacdec.c b/libavcodec/aac/aacdec.c
index ea2ba84a80c..6a70c69034c 100644
--- a/libavcodec/aac/aacdec.c
+++ b/libavcodec/aac/aacdec.c
@@ -186,6 +186,9 @@ static int frame_configure_elements(AVCodecContext *avctx)
         }
     }
 
+    if (!ac->frame)
+        return AVERROR_INVALIDDATA;
+
     /* get output buffer */
     av_frame_unref(ac->frame);
     if (!avctx->ch_layout.nb_channels)
-- 
2.45.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 04/11] tools/target_enc_fuzzer: A64MULTI encoder is very slow, check and adjust threshold

[Michael Niedermayer]

Fixes: Timeout
Fixes: 69097/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_A64MULTI_fuzzer-5062757287264256

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 tools/target_enc_fuzzer.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/tools/target_enc_fuzzer.c b/tools/target_enc_fuzzer.c
index 0345595ada7..c4c2df93a9b 100644
--- a/tools/target_enc_fuzzer.c
+++ b/tools/target_enc_fuzzer.c
@@ -78,6 +78,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
     uint32_t it = 0;
     uint64_t nb_samples = 0;
     AVDictionary *opts = NULL;
+    uint64_t ec_pixels = 0;
 
     if (!c) {
 #define ENCODER_SYMBOL0(CODEC) ff_##CODEC##_encoder
@@ -93,6 +94,9 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
         return 0;
 
     maxpixels = maxpixels_per_frame * maxiteration;
+    switch (c->p.id) {
+    case AV_CODEC_ID_A64_MULTI:         maxpixels  /= 65536;  break;
+    }
 
     maxpixels_per_frame  = FFMIN(maxpixels_per_frame , maxpixels);
 
@@ -168,6 +172,10 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
     frame->height = ctx->height;
 
     while (data < end && it < maxiteration) {
+        ec_pixels += (ctx->width + 32LL) * (ctx->height + 32LL);
+        if (ec_pixels > maxpixels)
+            goto maximums_reached;
+
         res = av_frame_get_buffer(frame, 0);
         if (res < 0)
             error("Failed av_frame_get_buffer");
@@ -192,7 +200,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
 
         av_packet_unref(avpkt);
     }
-
+maximums_reached:
     encode(ctx, NULL, avpkt);
     av_packet_unref(avpkt);
 
-- 
2.45.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 05/11] tools/target_enc_fuzzer: A64MULTI5 encoder is very slow, check and adjust threshold

[Michael Niedermayer]

Fixes: Timeout
Fixes: 68999/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_A64MULTI5_fuzzer-5078418784845824

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 tools/target_enc_fuzzer.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/target_enc_fuzzer.c b/tools/target_enc_fuzzer.c
index c4c2df93a9b..059d7830710 100644
--- a/tools/target_enc_fuzzer.c
+++ b/tools/target_enc_fuzzer.c
@@ -96,6 +96,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
     maxpixels = maxpixels_per_frame * maxiteration;
     switch (c->p.id) {
     case AV_CODEC_ID_A64_MULTI:         maxpixels  /= 65536;  break;
+    case AV_CODEC_ID_A64_MULTI5:        maxpixels  /= 65536;  break;
     }
 
     maxpixels_per_frame  = FFMIN(maxpixels_per_frame , maxpixels);
-- 
2.45.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 06/11] doc/examples/mux: remove nop

[Michael Niedermayer]

Found through code review related to CID1604493 Overflowed constant

Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 doc/examples/mux.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/doc/examples/mux.c b/doc/examples/mux.c
index b034aad56f7..0f3a2bb125f 100644
--- a/doc/examples/mux.c
+++ b/doc/examples/mux.c
@@ -347,8 +347,7 @@ static int write_audio_frame(AVFormatContext *oc, OutputStream *ost)
     if (frame) {
         /* convert samples from native format to destination codec format, using the resampler */
         /* compute destination number of samples */
-        dst_nb_samples = av_rescale_rnd(swr_get_delay(ost->swr_ctx, c->sample_rate) + frame->nb_samples,
-                                        c->sample_rate, c->sample_rate, AV_ROUND_UP);
+        dst_nb_samples = swr_get_delay(ost->swr_ctx, c->sample_rate) + frame->nb_samples;
         av_assert0(dst_nb_samples == frame->nb_samples);
 
         /* when we pass a frame to the encoder, it may keep a reference to it
-- 
2.45.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 06/11] doc/examples/mux: remove nop

[Michael Niedermayer]

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

On Mon, Jul 01, 2024 at 01:12:45AM +0200, Michael Niedermayer wrote:
> Found through code review related to CID1604493 Overflowed constant
> 
> Sponsored-by: Sovereign Tech Fund
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  doc/examples/mux.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)

will apply

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

Many things microsoft did are stupid, but not doing something just because
microsoft did it is even more stupid. If everything ms did were stupid they
would be bankrupt already.

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

[FFmpeg-devel] [PATCH 07/11] doc/examples/vaapi_encode: Try to check fwrite() for failure

[Michael Niedermayer]

Fixes: CID1604548 Unused value

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

diff --git a/doc/examples/vaapi_encode.c b/doc/examples/vaapi_encode.c
index d5f472f6dd8..805db7e5fd8 100644
--- a/doc/examples/vaapi_encode.c
+++ b/doc/examples/vaapi_encode.c
@@ -88,6 +88,10 @@ static int encode_write(AVCodecContext *avctx, AVFrame *frame, FILE *fout)
         enc_pkt->stream_index = 0;
         ret = fwrite(enc_pkt->data, enc_pkt->size, 1, fout);
         av_packet_unref(enc_pkt);
+        if (ret != enc_pkt->size) {
+            ret = AVERROR(EIO);
+            break;
+        }
     }
 
 end:
-- 
2.45.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 07/11] doc/examples/vaapi_encode: Try to check fwrite() for failure

[Rémi Denis-Courmont]

Le 1 juillet 2024 02:12:46 GMT+03:00, Michael Niedermayer <michael@niedermayer.cc> a écrit :
>Fixes: CID1604548 Unused value
>
>Sponsored-by: Sovereign Tech Fund
>Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
>---
> doc/examples/vaapi_encode.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
>diff --git a/doc/examples/vaapi_encode.c b/doc/examples/vaapi_encode.c
>index d5f472f6dd8..805db7e5fd8 100644
>--- a/doc/examples/vaapi_encode.c
>+++ b/doc/examples/vaapi_encode.c
>@@ -88,6 +88,10 @@ static int encode_write(AVCodecContext *avctx, AVFrame *frame, FILE *fout)
>         enc_pkt->stream_index = 0;
>         ret = fwrite(enc_pkt->data, enc_pkt->size, 1, fout);
>         av_packet_unref(enc_pkt);
>+        if (ret != enc_pkt->size) {
>+            ret = AVERROR(EIO);

Err, shouldn't that pass errno rather than blindly (and wrongly) assume that it's EIO? What if the error is ENOSPC?

>+            break;
>+        }
>     }
> 
> end:
_______________________________________________
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 08/11] fftools/ffmpeg: Check read() for failure

[Michael Niedermayer]

Fixes: CID1591932 Ignoring number of bytes read
Untested, this needs a windows machine

Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 fftools/ffmpeg.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
index 88ce3007e83..8674c4d2506 100644
--- a/fftools/ffmpeg.c
+++ b/fftools/ffmpeg.c
@@ -285,8 +285,9 @@ static int read_key(void)
         }
         //Read it
         if(nchars != 0) {
-            read(0, &ch, 1);
-            return ch;
+            if (read(0, &ch, 1) == 1)
+                return ch;
+            return 0;
         }else{
             return -1;
         }
-- 
2.45.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 08/11] fftools/ffmpeg: Check read() for failure

[Anton Khirnov]

Quoting Michael Niedermayer (2024-07-01 01:12:47)
> Fixes: CID1591932 Ignoring number of bytes read
> Untested, this needs a windows machine
> 
> Sponsored-by: Sovereign Tech Fund
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  fftools/ffmpeg.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)

Looks ok.

-- 
Anton Khirnov
_______________________________________________
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 09/11] avcodec/aac/aacdec_lpd: Remove dead code

[Michael Niedermayer]

I dont intend to apply this, this patch is just to show there is dead code
that needs more work in case it has been forgotten

I will mark this as intentional in coverity because obviously its work in progress code
(CID1603198 Logically dead code)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/aac/aacdec_lpd.c | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/libavcodec/aac/aacdec_lpd.c b/libavcodec/aac/aacdec_lpd.c
index 91a32688895..1faaab852f9 100644
--- a/libavcodec/aac/aacdec_lpd.c
+++ b/libavcodec/aac/aacdec_lpd.c
@@ -142,7 +142,6 @@ int ff_aac_parse_fac_data(AACUsacElemData *ce, GetBitContext *gb,
 int ff_aac_ldp_parse_channel_stream(AACDecContext *ac, AACUSACConfig *usac,
                                     AACUsacElemData *ce, GetBitContext *gb)
 {
-    int k;
     const uint8_t *mod;
     int first_ldp_flag;
 
@@ -159,26 +158,7 @@ int ff_aac_ldp_parse_channel_stream(AACDecContext *ac, AACUSACConfig *usac,
     if (first_ldp_flag)
         ce->ldp.last_lpd_mode = -1; /* last_ldp_mode is a **STATEFUL** value */
 
-    k = 0;
-    while (k < 0) {
-        if (!k) {
-            if (ce->ldp.core_mode_last && ce->ldp.fac_data_present)
-                ff_aac_parse_fac_data(ce, gb, 0, usac->core_frame_len/8);
-        } else {
-            if (!ce->ldp.last_lpd_mode && mod[k] > 0 ||
-                ce->ldp.last_lpd_mode && !mod[k])
-                ff_aac_parse_fac_data(ce, gb, 0, usac->core_frame_len/8);
-        }
-        if (!mod[k]) {
-//            parse_acelp_coding();
-            ce->ldp.last_lpd_mode = 0;
-            k++;
-        } else {
-//            parse_tcx_coding();
-            ce->ldp.last_lpd_mode = mod[k];
-            k += (1 << (mod[k] - 1));
-        }
-    }
+
 
 //    parse_lpc_data(first_lpd_flag);
 
-- 
2.45.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 10/11] avcodec/aac/aacdec_usac: Avoid doing the same thing twice each iteration

[Michael Niedermayer]

This requires review by the author of the code, i have just changed
this so it looks plausible, this needs to be checked against the spec

Fixes: CID1603194 Logically dead code

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

diff --git a/libavcodec/aac/aacdec_usac.c b/libavcodec/aac/aacdec_usac.c
index 4856c1786b7..9587348021e 100644
--- a/libavcodec/aac/aacdec_usac.c
+++ b/libavcodec/aac/aacdec_usac.c
@@ -313,12 +313,12 @@ int ff_aac_usac_reset_state(AACDecContext *ac, OutputConfiguration *oc)
                 ff_aac_sbr_config_usac(ac, che, e);
 
             for (int j = 0; j < ch; j++) {
-                SingleChannelElement *sce = &che->ch[ch];
+                SingleChannelElement *sce = &che->ch[j];
                 AACUsacElemData *ue = &sce->ue;
 
                 memset(ue, 0, sizeof(*ue));
 
-                if (!ch)
+                if (!j)
                     ue->noise.seed = 0x3039;
                 else
                     che->ch[1].ue.noise.seed = 0x10932;
-- 
2.45.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 10/11] avcodec/aac/aacdec_usac: Avoid doing the same thing twice each iteration

[Michael Niedermayer]

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

On Mon, Jul 01, 2024 at 01:12:49AM +0200, Michael Niedermayer wrote:
> This requires review by the author of the code, i have just changed
> this so it looks plausible, this needs to be checked against the spec
> 
> Fixes: CID1603194 Logically dead code
> 
> Sponsored-by: Sovereign Tech Fund
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/aac/aacdec_usac.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

ping

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

While the State exists there can be no freedom; when there is freedom there
will be no State. -- Vladimir Lenin

[-- 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 10/11] avcodec/aac/aacdec_usac: Avoid doing the same thing twice each iteration

[Michael Niedermayer]

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

On Sun, Jul 21, 2024 at 03:56:16PM +0200, Michael Niedermayer wrote:
> On Mon, Jul 01, 2024 at 01:12:49AM +0200, Michael Niedermayer wrote:
> > This requires review by the author of the code, i have just changed
> > this so it looks plausible, this needs to be checked against the spec
> > 
> > Fixes: CID1603194 Logically dead code
> > 
> > Sponsored-by: Sovereign Tech Fund
> > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> > ---
> >  libavcodec/aac/aacdec_usac.c | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> ping

hello ?

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

The day soldiers stop bringing you their problems is the day you have stopped 
leading them. They have either lost confidence that you can help or concluded 
you do not care. Either case is a failure of leadership. - Colin Powell

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

[FFmpeg-devel] [PATCH 11/11] avcodec/aac/aacdec_usac: Remove check for impossible sbr_ratio

[Michael Niedermayer]

Fixes: CID1605475 Logically dead code

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

diff --git a/libavcodec/aac/aacdec_usac.c b/libavcodec/aac/aacdec_usac.c
index 9587348021e..10121dbc34f 100644
--- a/libavcodec/aac/aacdec_usac.c
+++ b/libavcodec/aac/aacdec_usac.c
@@ -1676,9 +1676,6 @@ int ff_aac_usac_decode_frame(AVCodecContext *avctx, AACDecContext *ac,
     } else if (sbr_ratio == 3) {
         ratio_mult = 2;
         ratio_dec = 1;
-    } else if (sbr_ratio == 4) {
-        ratio_mult = 4;
-        ratio_dec = 1;
     } else {
         ratio_mult = 1;
         ratio_dec = 1;
-- 
2.45.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 11/11] avcodec/aac/aacdec_usac: Remove check for impossible sbr_ratio

[Lynne via ffmpeg-devel]

[-- Attachment #1.1.1.1: Type: text/plain, Size: 957 bytes --]

On 01/07/2024 01:12, Michael Niedermayer wrote:
> Fixes: CID1605475 Logically dead code
> 
> Sponsored-by: Sovereign Tech Fund
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>   libavcodec/aac/aacdec_usac.c | 3 ---
>   1 file changed, 3 deletions(-)
> 
> diff --git a/libavcodec/aac/aacdec_usac.c b/libavcodec/aac/aacdec_usac.c
> index 9587348021e..10121dbc34f 100644
> --- a/libavcodec/aac/aacdec_usac.c
> +++ b/libavcodec/aac/aacdec_usac.c
> @@ -1676,9 +1676,6 @@ int ff_aac_usac_decode_frame(AVCodecContext *avctx, AACDecContext *ac,
>       } else if (sbr_ratio == 3) {
>           ratio_mult = 2;
>           ratio_dec = 1;
> -    } else if (sbr_ratio == 4) {
> -        ratio_mult = 4;
> -        ratio_dec = 1;
>       } else {
>           ratio_mult = 1;
>           ratio_dec = 1;

Its valid, just not supported at the moment. Maybe just error out with 
PATCHWELCOME?
Or mark it as a false positive?

[-- Attachment #1.1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 637 bytes --]

[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 236 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 11/11] avcodec/aac/aacdec_usac: Remove check for impossible sbr_ratio

[Michael Niedermayer]

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

On Wed, Jul 03, 2024 at 02:49:57AM +0200, Lynne via ffmpeg-devel wrote:
> On 01/07/2024 01:12, Michael Niedermayer wrote:
> > Fixes: CID1605475 Logically dead code
> > 
> > Sponsored-by: Sovereign Tech Fund
> > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> > ---
> >   libavcodec/aac/aacdec_usac.c | 3 ---
> >   1 file changed, 3 deletions(-)
> > 
> > diff --git a/libavcodec/aac/aacdec_usac.c b/libavcodec/aac/aacdec_usac.c
> > index 9587348021e..10121dbc34f 100644
> > --- a/libavcodec/aac/aacdec_usac.c
> > +++ b/libavcodec/aac/aacdec_usac.c
> > @@ -1676,9 +1676,6 @@ int ff_aac_usac_decode_frame(AVCodecContext *avctx, AACDecContext *ac,
> >       } else if (sbr_ratio == 3) {
> >           ratio_mult = 2;
> >           ratio_dec = 1;
> > -    } else if (sbr_ratio == 4) {
> > -        ratio_mult = 4;
> > -        ratio_dec = 1;
> >       } else {
> >           ratio_mult = 1;
> >           ratio_dec = 1;
> 
> Its valid, just not supported at the moment. Maybe just error out with
> PATCHWELCOME?
> Or mark it as a false positive?

yeah, marked as false positive

thx


[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Awnsering whenever a program halts or runs forever is
On a turing machine, in general impossible (turings halting problem).
On any real computer, always possible as a real computer has a finite number
of states N, and will either halt in less than N cycles or never halt.

[-- 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 01/11] MAINTAINERS: Add Timo Rothenpieler to server admins

[Anton Khirnov]

Quoting Michael Niedermayer (2024-07-01 01:12:40)
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  MAINTAINERS | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index a82fa58c69f..57f437cd40e 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -34,8 +34,8 @@ Miscellaneous Areas
>  ===================
>  
>  documentation                           Stefano Sabatini, Mike Melanson, Timothy Gu, Gyan Doshi
> -project server day to day operations    Árpád Gereöffy, Michael Niedermayer, Reimar Doeffinger, Alexander Strasser, Nikolay Aleksandrov
> -project server emergencies              Árpád Gereöffy, Reimar Doeffinger, Alexander Strasser, Nikolay Aleksandrov
> +project server day to day operations    Árpád Gereöffy, Michael Niedermayer, Reimar Doeffinger, Alexander Strasser, Nikolay Aleksandrov, Timo Rothenpieler
> +project server emergencies              Árpád Gereöffy, Reimar Doeffinger, Alexander Strasser, Nikolay Aleksandrov, Timo Rothenpieler

Those lists are getting rather long. Are all these people really active?
If not, the lists should be trimmed down.

-- 
Anton Khirnov
_______________________________________________
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 01/11] MAINTAINERS: Add Timo Rothenpieler to server admins

[Michael Niedermayer]

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

On Mon, Jul 01, 2024 at 01:07:12PM +0200, Anton Khirnov wrote:
> Quoting Michael Niedermayer (2024-07-01 01:12:40)
> > Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> > ---
> >  MAINTAINERS | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/MAINTAINERS b/MAINTAINERS
> > index a82fa58c69f..57f437cd40e 100644
> > --- a/MAINTAINERS
> > +++ b/MAINTAINERS
> > @@ -34,8 +34,8 @@ Miscellaneous Areas
> >  ===================
> >  
> >  documentation                           Stefano Sabatini, Mike Melanson, Timothy Gu, Gyan Doshi
> > -project server day to day operations    Árpád Gereöffy, Michael Niedermayer, Reimar Doeffinger, Alexander Strasser, Nikolay Aleksandrov
> > -project server emergencies              Árpád Gereöffy, Reimar Doeffinger, Alexander Strasser, Nikolay Aleksandrov
> > +project server day to day operations    Árpád Gereöffy, Michael Niedermayer, Reimar Doeffinger, Alexander Strasser, Nikolay Aleksandrov, Timo Rothenpieler
> > +project server emergencies              Árpád Gereöffy, Reimar Doeffinger, Alexander Strasser, Nikolay Aleksandrov, Timo Rothenpieler
> 
> Those lists are getting rather long. Are all these people really active?
> If not, the lists should be trimmed down.

Reimar fixed an issue with the SSL certs less than 2 months ago
Alexander reviewed a patch to our apache configuration half a year ago
Nikolay updated the VM patchwork runs on to Ubuntu 22.04 less than a month ago
Timo setup a fatebeta.service systemd serivce yesterday
Arpad runs one of our name server slaves, he is IIRC not activly maintaining the main server currently

thx

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

Everything should be made as simple as possible, but not simpler.
-- Albert Einstein

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