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 D626848A27 for ; Wed, 24 Jan 2024 18:52:07 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 141CE68D0EF; Wed, 24 Jan 2024 20:52:04 +0200 (EET) Received: from mail-il1-f174.google.com (mail-il1-f174.google.com [209.85.166.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1CDA768D085 for ; Wed, 24 Jan 2024 20:51:58 +0200 (EET) Received: by mail-il1-f174.google.com with SMTP id e9e14a558f8ab-361adb0aff9so15460545ab.1 for ; Wed, 24 Jan 2024 10:51:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706122316; x=1706727116; darn=ffmpeg.org; h=content-transfer-encoding:in-reply-to:autocrypt:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=DO3NwIRe9PcP0MVe7sL6kvYQNreDhvX1Lj7gHdW0Bh4=; b=TRSRm/iLAmJNGCRe2g7jmT3ixsZUBVr8Bp21ioIEPVRShhRPsdK9vv0tueHvNHa/Oa DJrAJn7oupKXseUK+eL98bVmcXdkM05wzD9hCOQmyeaQ+u6Y8vzE2etLEZUwiIExqvW5 10/t14kJ1Jl3DQzGMGdWMchqSeTSg/cGLcdCv2ggfjFfTWa1eeGvEQ0inO6KjNtry6Ef B/MHZIM702EBZ8E/uIMElXpuafvtwEXFpUXUo+SqM7da/DU4NFv/Bda6D/EqFJo0sGC1 2+2Czx77+feQ009g0dvBsmb8XsTYfEBDfcS54NxLMNeXX0qrc0lC3KPKhsLLcTmhBLbU E39g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706122316; x=1706727116; h=content-transfer-encoding:in-reply-to:autocrypt:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=DO3NwIRe9PcP0MVe7sL6kvYQNreDhvX1Lj7gHdW0Bh4=; b=PQpX1FodFaDapkfoTYoMqXI5R7+fhdXBtGrE4PgYrdsJb9D/jkwuPVnxzf1b4lnCYy trddD8ux4+dOvelidjmK5ZciRYRFF/d+wtMjlH6S03hG9OquRwtz1F1CwuYV2cYW1xtt qLN37OlHykv7QucIGcTtRW/ZUgZ1GGM5S8OX9dFLWKIJV7o0onfUMCffV08JtQhk7wSu QlkmCN9teLku7zE7TS5pK8sz9GPv8stFwAvZoUyo0hPf64bfiiS2dpvdAH8tzib8DLLZ HA3yvJTY/0TqJ8xus1OIV1xpMondwD7lG0YD0HtIbtIvHIwXP72mbsJD7T/WbFuBwABM o5PA== X-Gm-Message-State: AOJu0YyZd759nuciSxdOE0x5Zv8bgUMwgSPLAGBrfi2nzk2RYUR/5tX6 FzKNFgaO8fhyf/SROHMqHpkHL2+bddCFJG3m7F1gMwxrSRztb+gz0VLn4jij X-Google-Smtp-Source: AGHT+IEaiTwCq9aYRWMJxghDgJOa/j6AwXzLnAHyRPVUOJ7bybtumMyoeJGxmZ8985c6V0/F0gkkkg== X-Received: by 2002:a05:6e02:2165:b0:361:a70e:d8e with SMTP id s5-20020a056e02216500b00361a70e0d8emr3204314ilv.4.1706122315614; Wed, 24 Jan 2024 10:51:55 -0800 (PST) Received: from [192.168.0.18] (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id 200-20020a6302d1000000b005bdbe9a597fsm12193212pgc.57.2024.01.24.10.51.54 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 24 Jan 2024 10:51:55 -0800 (PST) Message-ID: Date: Wed, 24 Jan 2024 15:52:06 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20240120014730.53635-1-jamrial@gmail.com> <20240120014730.53635-2-jamrial@gmail.com> From: James Almer Autocrypt: addr=jamrial@gmail.com; keydata= xsBNBFjZtqABCADLW+vdEoZaJZDsIO6geYFTOcn1unsEHefj9zn+3oTHlDFFzO47mzHsSfbK 9JE2xpOJEVnC8FAF5Sayi/pVwV+mtQUV3n5dgVeVBYF9GUQwOGFCpK8X54RRqhkgknbunOEE 0CtgAJgmpFmmmHgq02GvEspx1h/rh4apqwQR6QX4Favb+x9+i9ytVpwVcBX94vo2toyP7h/K BWfadQmb8ltgE1kshfg+SQs/H5bTV5Z1DuEASf02ZL/1qYB/sdTgWPLv9XMUHHsRFmMY8TMx wJSkP+Af3AiYQPJYz1B1D4tt98T/NoiVdin10zATakPjV8hXaobuRmxgakkUASXudydDABEB AAHNH0phbWVzIEFsbWVyIDxqYW1yaWFsQGdtYWlsLmNvbT7CwJIEEwEIADwCGwMGCwkIBwMC BhUIAgkKCwQWAgMBAh4BAheAFiEEd1EujP2UoWlX5pp6FGMBrXN2WeAFAmJoLUUCGQEACgkQ FGMBrXN2WeAFVQf9GtGhniRs1PzNUOgJktCnv6j4BbLieaIPYPEFXKDHOgjqQE2zVMYXnoXl Jam928ii902a8OY06r9ywn/R8ApD1/3NY/v64O71CY9scz5XyH2au8wIZ6HwFy3/f7sqjdGD uctY8Qs7rjT7NkoC5lmgMu2v2k03dGtM9AAf5AK5gU+H0EUw7vmKKiXzUqt5kvBuf4CEwXvH AQT1SMJ52rIlDWB7FQFyZeUbOAK2IgY/KNedfK6nsgd/eQVnlofPd2XoddE7kP6iys7jJefw DD3g3rZyDTq7in5dyk5glaNpWZpbHGBs+9SCYLnfQ8XvWqPFOD+gj0plamKANgOvavKTxM7A TQRY2bagAQgA69YtILj8kYxmqPr/M8+MXT7wVoOWVW9lvSmPquCELaDy/NIS7D06VC5EuE/6 JlJXZMTn37NLlyWhzwOgXuXw5w2tyoQQBuvqGiXJijuXwXH7HKdzrc6rpYtAqt5w05hzNrFS KrS0izG64VpWrfproy3BsL+8TBm9brLhhNPynVRqVukbbGzlATTzNQGZ14TTi2/dL6DkMQnM qn4jX9UEe4GdGQBP50bUJSSmeiIkyNLWA+znuN2PZEz930ZwNrF9GtDVw7mzcmpCZ7spldE2 tutbpy9D1bIqxyqBrYDSezyzL2adR1qgHyOTMCHg2AYNkrIQHrSyJxKTpZ1/hqOp8wARAQAB wsBfBBgBAgAJBQJY2bagAhsMAAoJEBRjAa1zdlnghekH/0Yb0iYJ74oID2f/Fj+AJKS2ekQF P2xOr8lpGzgp/+yWUvPtqbX0A33anBJdYwxaAC0NataX3tfZ+oJkzXqfmqhIHMPYHdZesJA2 Bk9hU/33mDl5s5U66/z0uelWzwKVHoQ2O6or4+qF3HJFSJLCe9uvWJ3zXf9F342Ftj73sfx+ 3xkw/IXsN1RqbYqDlzpoEQ99SIEfY/8Jjwnd3sIPfqkuyeaYfe6GJDqKawdCEP1oRRlbXEAp TJgYz8r3nPhGv9cdHNDCk44ISbsqVuxIEnLqi4fTPZaGupiQhT+srl268TTAp2TQW7+6Ce/b NPQorMquzS/LZoyALpmsYi/miMc= In-Reply-To: Subject: Re: [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-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 1/24/2024 11:35 AM, Andreas Rheinhardt wrote: > James Almer: >> 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 > > This changes the checksum of the generated Matroska file; presumably > some header parameter is now set differently without affecting the size > of the generated file (which one?). But this means that this test mkvinfo for the output, pre and post patch: --- old.txt 2024-01-24 15:48:57.639516100 -0300 +++ new.txt 2024-01-24 15:49:01.301839500 -0300 @@ -42,7 +42,7 @@ | + Audio track | + Channels: 1 | + Sampling frequency: 32000 -| + Bit depth: 16 +| + Bit depth: 32 | + Maximum block additional ID: 0 | + Codec's private data: size 132 (format tag: 0xa109) |+ Tags Post patch the audio stream is reported as FLT AVSampleFormat. > probably needs an explicit dependency on the speex decoder (which it > currently doesn't have). Can add one. > > - Andreas > > > _______________________________________________ > 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".