From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
	by master.gitmailbox.com (Postfix) with ESMTPS id E43D24B0B1
	for <ffmpegdev@gitmailbox.com>; Tue, 25 Mar 2025 11:39:17 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
	by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6F1DE687B92;
	Tue, 25 Mar 2025 13:39:14 +0200 (EET)
Received: from mail-43166.protonmail.ch (mail-43166.protonmail.ch
 [185.70.43.166])
 by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7312C6801A1
 for <ffmpeg-devel@ffmpeg.org>; Tue, 25 Mar 2025 13:39:08 +0200 (EET)
Date: Tue, 25 Mar 2025 11:39:01 +0000
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Message-ID: <_1QNpuVFVjcbkKgaLPrRdpZ4La78MEuqcScjmuV0JZIWnoAXFrjdrNfORxtwsCMhxWMHSwC1ePB_BcsRyMMKwpU060E7ziDaAYvY9PHrHro=@protonmail.com>
In-Reply-To: <20250313185459.244524-1-tmatth@videolan.org>
References: <20250313185459.244524-1-tmatth@videolan.org>
Feedback-ID: 32895411:user:proton
X-Pm-Message-ID: 0e62feb64d29b858bb3716505e3e2f1288577b55
MIME-Version: 1.0
Subject: Re: [FFmpeg-devel] [PATCH] speexdec: fix framesize for
 ultra-wideband
X-BeenThere: ffmpeg-devel@ffmpeg.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
 <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
 <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
From: Tristan Matthews via ffmpeg-devel <ffmpeg-devel@ffmpeg.org>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Cc: Tristan Matthews <httamt@protonmail.com>,
 Tristan Matthews <tmatth@videolan.org>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/_1QNpuVFVjcbkKgaLPrRdpZ4La78MEuqcScjmuV0JZIWnoAXFrjdrNfORxtwsCMhxWMHSwC1ePB_BcsRyMMKwpU060E7ziDaAYvY9PHrHro=@protonmail.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>

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