[FFmpeg-devel] [PATCH] speexdec: fix framesize for ultra-wideband

[FFmpeg-devel] [PATCH] speexdec: fix framesize for ultra-wideband

[Tristan Matthews]

This matches how the libspeex decoder is calculating frame size (except in clamp form).

Fixes #11495
---
 libavcodec/speexdec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/speexdec.c b/libavcodec/speexdec.c
index b335e2fbe8..0990338341 100644
--- a/libavcodec/speexdec.c
+++ b/libavcodec/speexdec.c
@@ -1425,7 +1425,7 @@ static int parse_speex_extradata(AVCodecContext *avctx,
     if (s->frame_size < NB_FRAME_SIZE << (s->mode > 1) ||
         s->frame_size >     INT32_MAX >> (s->mode > 1))
         return AVERROR_INVALIDDATA;
-    s->frame_size <<= (s->mode > 1);
+    s->frame_size = FFMIN(s->frame_size << (s->mode > 1), NB_FRAME_SIZE << s->mode);
     s->vbr = bytestream_get_le32(&buf);
     s->frames_per_packet = bytestream_get_le32(&buf);
     if (s->frames_per_packet <= 0 ||
-- 
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] speexdec: fix framesize for ultra-wideband

[Tristan Matthews via ffmpeg-devel]

On Thursday, March 13th, 2025 at 2:54 PM, Tristan Matthews <tmatth@videolan.org> wrote:

> This matches how the libspeex decoder is calculating frame size (except in clamp form).
> 
> Fixes #11495
> ---
> libavcodec/speexdec.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/libavcodec/speexdec.c b/libavcodec/speexdec.c
> index b335e2fbe8..0990338341 100644
> --- a/libavcodec/speexdec.c
> +++ b/libavcodec/speexdec.c
> @@ -1425,7 +1425,7 @@ static int parse_speex_extradata(AVCodecContext *avctx,
> if (s->frame_size < NB_FRAME_SIZE << (s->mode > 1) ||
> 
> s->frame_size > INT32_MAX >> (s->mode > 1))
> 
> return AVERROR_INVALIDDATA;
> - s->frame_size <<= (s->mode > 1);
> 
> + s->frame_size = FFMIN(s->frame_size << (s->mode > 1), NB_FRAME_SIZE << s->mode);
> 
> s->vbr = bytestream_get_le32(&buf);
> 
> s->frames_per_packet = bytestream_get_le32(&buf);
> 
> if (s->frames_per_packet <= 0 ||
> 
> --
> 2.45.2
> 

Bump.
_______________________________________________
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] speexdec: fix framesize for ultra-wideband

[Michael Niedermayer]

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

Hi Tristan

On Thu, Mar 13, 2025 at 02:54:48PM -0400, Tristan Matthews wrote:
> This matches how the libspeex decoder is calculating frame size (except in clamp form).
> 
> Fixes #11495
> ---
>  libavcodec/speexdec.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

I belive this is a regression since ab39cc36c72bb73318bb911acb66873de850a107
also james  did multiple fixes to this piece of code afterwards
maybe james can comment

thx

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

No snowflake in an avalanche ever feels responsible. -- Voltaire

[-- 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] speexdec: fix framesize for ultra-wideband

[James Almer]

[-- Attachment #1.1.1: Type: text/plain, Size: 687 bytes --]

On 3/29/2025 6:46 PM, Michael Niedermayer wrote:
> Hi Tristan
> 
> On Thu, Mar 13, 2025 at 02:54:48PM -0400, Tristan Matthews wrote:
>> This matches how the libspeex decoder is calculating frame size (except in clamp form).
>>
>> Fixes #11495
>> ---
>>   libavcodec/speexdec.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> I belive this is a regression since ab39cc36c72bb73318bb911acb66873de850a107
> also james  did multiple fixes to this piece of code afterwards
> maybe james can comment

It may also fix #11054, and if it doesn't regress what that patch fixed 
(namely, vp5/potter512-400-partial.avi parsing) or reintroduces #11078, 
then LGTM.


[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 495 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".