From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id E9C9948838 for ; Sat, 20 Jan 2024 01:48:02 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 759CA68D093; Sat, 20 Jan 2024 03:47:52 +0200 (EET) Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CB0D168CFDD for ; Sat, 20 Jan 2024 03:47:45 +0200 (EET) Received: by mail-pg1-f179.google.com with SMTP id 41be03b00d2f7-5cfa71498feso1245483a12.1 for ; Fri, 19 Jan 2024 17:47:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705715263; x=1706320063; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=VP+KnI4UMmnau0gUtNs0AzbBtY8QClCt/4GpiAR7Gvk=; b=JMXlbLcZwn923ZnWyNiY+HAvgWJ8v7uwws1BpW4pCYrKbbnZb99upZWhyQzNIsi6XB LhmlJ9daccPsudDjKBd/6pFf45iZMX1bCN8j34GFdxVMVeJ8YpUFN+spHJz1gI+G9711 sRPCAqy14bRRRG/A5EXyPUsUh2kwDS5Xte5dHMjs9RhdOAly3Y1Aj/yuNu0Sajp9S2AU DOWIBqKlXD1Ozczf7N8eLKxb2Dmsz4nYwGAOyGYaGwMVb4QDcMJtbcJE1xT2cjE1f4w+ Q3vnJvdlx+2/DMqnhtAq4RJwXhNpg54sOnNC4sf2rFze8vw4JQdzPCn8c7RtdvUhC/uA vEww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705715263; x=1706320063; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VP+KnI4UMmnau0gUtNs0AzbBtY8QClCt/4GpiAR7Gvk=; b=BhWIV5woPrDyvPEJwC4PFOHxXTpyghOMJBjDg6llVWZ8G7kWEeBkRkapoLXhp7Px3Q MKKwQmy141HcOKiOZZk5moXMIgiluSFwhH7FBK2lh84LTE3T+nuD9SzojjN6QgL8HT71 9JRI8jvD4G1A1QqmyqCaHtgXr/qakNtnZEnKBDbJ+8mM2oTRfqKw6skaMuhcomZecZNT 3EWvQc2p3t3uXNsUXdRtLHHynczg8Hp0d0neGw1ZEzGsgVlPdizRRzEHfNJm/DaQjmAL quh/OQ/bHx/lXB5Kd9QAktDz7OGBctrS8s07YZddozp5amtEyssQZfRJY8+MV+KNDuph v2+Q== X-Gm-Message-State: AOJu0YwQcdzakAibVXndJER+kvsnF+azhMQfy7pWedgYvPzHU4pLCY1o 9ziJQ2JES6k6OnG87HPKuYEb7VSBxIzGvwjzaqPYnYvPqfLZcxdonbkdKNEh X-Google-Smtp-Source: AGHT+IHR3AIMxy9JRmtaEEG+S6o4xO302VPUcld5kesPEjAWtIwTahFekdnOSawgFf9a9F9BRAe8cQ== X-Received: by 2002:a05:6a20:c481:b0:19a:37aa:3f5e with SMTP id eo1-20020a056a20c48100b0019a37aa3f5emr704897pzb.40.1705715263008; Fri, 19 Jan 2024 17:47:43 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id x23-20020a056a000bd700b006dbbdfb8226sm1840616pfu.1.2024.01.19.17.47.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jan 2024 17:47:42 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 Jan 2024 22:47:30 -0300 Message-ID: <20240120014730.53635-2-jamrial@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240120014730.53635-1-jamrial@gmail.com> References: <20240120014730.53635-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/speexdec: fix setting frame_size from extradata X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Finishes fixing vp5/potter512-400-partial.avi The fate-matroska-ms-mode test ref is updated to reflect that the Speex decoder can now read the stream. Signed-off-by: James Almer --- libavcodec/speexdec.c | 4 +--- tests/ref/fate/matroska-ms-mode | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/speexdec.c b/libavcodec/speexdec.c index c73b2a7ec2..51c5834769 100644 --- a/libavcodec/speexdec.c +++ b/libavcodec/speexdec.c @@ -1420,9 +1420,7 @@ static int parse_speex_extradata(AVCodecContext *avctx, if (s->nb_channels <= 0 || s->nb_channels > 2) return AVERROR_INVALIDDATA; s->bitrate = bytestream_get_le32(&buf); - s->frame_size = bytestream_get_le32(&buf); - if (s->frame_size < NB_FRAME_SIZE << s->mode) - return AVERROR_INVALIDDATA; + s->frame_size = (1 + (s->mode > 0)) * bytestream_get_le32(&buf); s->vbr = bytestream_get_le32(&buf); s->frames_per_packet = bytestream_get_le32(&buf); if (s->frames_per_packet <= 0 || diff --git a/tests/ref/fate/matroska-ms-mode b/tests/ref/fate/matroska-ms-mode index 5c91209910..0e31c990dc 100644 --- a/tests/ref/fate/matroska-ms-mode +++ b/tests/ref/fate/matroska-ms-mode @@ -1,4 +1,4 @@ -a2897e3951b0054d0fa31fe51860444f *tests/data/fate/matroska-ms-mode.matroska +e7f44cd6a5c0f45fea11874afb8c1c0d *tests/data/fate/matroska-ms-mode.matroska 413103 tests/data/fate/matroska-ms-mode.matroska #extradata 0: 40, 0x54290c93 #extradata 1: 114, 0xb6c80771 -- 2.43.0 _______________________________________________ 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".