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 D7FF84E683
for <ffmpegdev@gitmailbox.com>; Thu, 13 Mar 2025 18:55:36 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3D67B68BD3B;
Thu, 13 Mar 2025 20:55:33 +0200 (EET)
Received: from mail-qv1-f51.google.com (mail-qv1-f51.google.com
[209.85.219.51])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ED5A468B3FA
for <ffmpeg-devel@ffmpeg.org>; Thu, 13 Mar 2025 20:55:25 +0200 (EET)
Received: by mail-qv1-f51.google.com with SMTP id
6a1803df08f44-6e8efefec89so12121356d6.3
for <ffmpeg-devel@ffmpeg.org>; Thu, 13 Mar 2025 11:55:25 -0700 (PDT)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1741892124; x=1742496924;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:x-gm-message-state:from:to:cc:subject:date:message-id
:reply-to;
bh=ETwMwZTaGPYPz/KdryYrfIigIqjHMRdyBmnI30hIkT8=;
b=QDf7qvhyX/6e7+Tzh3AyWX6gf+PwG8jjf99ZSwGCZH6QMoCA+O/GJTwmGZlySDsaOL
D11u8slbOW5TZuSjG+g9ATiPaDKhu9tx5+5sEz0g3HufCuaohlr1LpackF0QCusy3jmH
wsAOikmrfIUdWOJMDqVLbFkD9TviXgR9vGMEKd1rpt8tWPbvat+K8WjfBodzrNFlCQA9
ZA5jMyExY+y0fiIchth/CXyo0a17kdhKVjK1TiqS5iCfVNIrtnSgYyjq3WFCDSfds2VH
osAOUEu4TDNlojsmcm2hFabHwDr9/8RQ+EP8/gXu8mrHGZfa7r573K5jCxpe1xjZzYpi
szjw==
X-Gm-Message-State: AOJu0YzduB+KLrteQcLiK3JAw0m4KcT/aqwYYlLuc9wcXIpjUY1AFm5h
t1PYZqzVdS85ajEJ8q8QFZLgSORDO3LOqPGRJxQyJsLT7kRrG8Tnca95+ercLFk=
X-Gm-Gg: ASbGncsEzwp6HVXMqClgvrCKmcxzBYYCNTKN5Ad2Q3YTDWt07VIngUVFCNkNGe2Zd8I
EBWGAq3qN3ci2P7svYPnxfNnlPcdL0dGVcarz+0ztK2Bx/F5rvn7bEtNNYcB7jd4dZZFaLH95Wj
qcz2mdSRRR9Sj0UjuM2hZMnEVTwB3IBefuMNHv99C07Muz4ZgCRWw42aDdMPYl9j1heMtGOlOwr
Yb0p4QxVubqXGlxEwHv2kujcY6NWvwFWpWeOR9kjVAeesG4F6tWAA7YDVOhGsQ237JN+dPWBKIS
xGQDCuniAb3NGcMQnUbv+opZyhMC5T8lowPsljbk3kMfCLzB0hNf
X-Google-Smtp-Source: AGHT+IEwJ4UtoK7Ym4M3MQceRuXqHBMzDhAoFgUOntNm8lu0Shw8M/v6xTEd1hShwSruELXj350Qqg==
X-Received: by 2002:a05:6214:4017:b0:6e6:64a5:e18d with SMTP id
6a1803df08f44-6eae8d26597mr1359066d6.17.1741892124181;
Thu, 13 Mar 2025 11:55:24 -0700 (PDT)
Received: from bellini.. ([107.159.166.92]) by smtp.gmail.com with ESMTPSA id
6a1803df08f44-6eade330e97sm12603686d6.83.2025.03.13.11.55.23
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 13 Mar 2025 11:55:23 -0700 (PDT)
From: Tristan Matthews <tmatth@videolan.org>
To: ffmpeg-devel@ffmpeg.org
Date: Thu, 13 Mar 2025 14:54:48 -0400
Message-ID: <20250313185459.244524-1-tmatth@videolan.org>
X-Mailer: git-send-email 2.45.2
MIME-Version: 1.0
Subject: [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>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Cc: 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/20250313185459.244524-1-tmatth@videolan.org/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
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".