From patchwork Sun Aug 29 21:27:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29857 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3402482iov; Sun, 29 Aug 2021 14:28:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwaU3K5HCcraSIjBEtsFjUKZGMD2jMzMSCjS5sQ5DbwLD0SQcjSvVR6R8MAEbdsMdoXwa07 X-Received: by 2002:a17:906:da01:: with SMTP id fi1mr10300067ejb.149.1630272531177; Sun, 29 Aug 2021 14:28:51 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y5si3262857ejk.223.2021.08.29.14.28.50; Sun, 29 Aug 2021 14:28:51 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=S252yAlm; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 650F168A3F4; Mon, 30 Aug 2021 00:28:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075055.outbound.protection.outlook.com [40.92.75.55]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4373168A2CE for ; Mon, 30 Aug 2021 00:28:19 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=J8EbjqgotcfAw6KAJbPD9C2dBx5TR/+rwc7W/Fr6NHXa9UDVacJicD1tMEQX9R9VhRWH/sY1V87NhFs3eq/G7Dbk3cEJlAMrG300/WPMOK1LbKrWtsIp2PEpazQ4BOjCF6sU+rvNakMNONhskqpbf44DDnD0oMOQPHxFgFN+RLOG1Xi+dzFDhTOnI3icl/GJmqiaxkobDO3a/UG9hsMeet2G1qlgO9640VqyMYffJ4N+OAq8B18QVvZEanjwpVYRs/kwA6la6tTpPK9RWEzg31bUj5ilqxQYDSkvdJyIq8qPtiA499U9d9TneN3Oe1HMi3cqczI/9XmrAW2tb7niiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Y6mCSztGra3nfl1T9gg1Z0eN4ObITbcTX47rG/m1/6A=; b=k05n3H73bVaZH8BJqiZpQUUCKrs/0/aWdpbZtCOtGz52KaoV4kALH/gdYhPFFZ+3ZUTp/fazXGjfpg1PSUf+CNKttEMALidBLYK+NZ0XUMiBgpBGI2CjrRfuWvU8nSw6Caw1qWfM3MCtVPwzcUcf1PFFMUM3Ac1cRslB3vBnLlQBRN424g0213UOa6SxVA0hmVh8Py/+xmWHcpghp2U7egqtCvjTb0OXjx4chr+ofFOkfwgA+qTTQvLJErkNqKeSec+PxprQTdKA5aG2ZpZUx/Zgi6GwAdPgvSCaxIebscOauaHReGxxYhTR4+r48byY6suWghPd40nO2Fz3s6uMEQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Y6mCSztGra3nfl1T9gg1Z0eN4ObITbcTX47rG/m1/6A=; b=S252yAlm0G7eskYvnsrQFTknuN06f8cP9JYkvoSDNa+faZfSK/Cs4umunVjS8ie4lOSRCwVZNEHjvIWCMYd5gM8iTFuWD20JMTbo9DkMvYCb89X9j0N9DXouIgTHQ4kRcPhQpVMa9zWFC76NfLXWfOC1Ij5nssZTh34ofG49SeQ4ZP5YH7kWb7UuRrx5sm0/nuQQQuXb9q7cOGO4/l7XWAYkDQNUMddnStmSEI++dmEcWTQEBrzo/MAwXK47JueXRwwUpgbQbGbytYN7PjotDMjps8ZWLl0SM2/Ed+vv7JwrCgiFC1qd7V1z7NCK90WFV5et0dkpt25LwSUZyM3/4w== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5927.eurprd03.prod.outlook.com (2603:10a6:20b:e3::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.23; Sun, 29 Aug 2021 21:28:08 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f8b5:1ef2:89b2:f8c5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f8b5:1ef2:89b2:f8c5%7]) with mapi id 15.20.4457.024; Sun, 29 Aug 2021 21:28:08 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 29 Aug 2021 23:27:41 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [/KRnIN4o+5P3dh/wSM+jFV69yTSzw/Kq] X-ClientProxiedBy: PR0P264CA0178.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1c::22) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210829212744.1505779-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR0P264CA0178.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1c::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.19 via Frontend Transport; Sun, 29 Aug 2021 21:28:08 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b730a072-1b73-4a8e-915e-08d96b33e55d X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEtNCKoPT6rtVE5PzvjguT+vhh0Z5r28yhGsNSUj7fq2KQnjvqehDshe7iOwrUeLLnqqT3jPFYmQR1GhLwuQ/0I0TwgKXbpgvwrHmQpmfRQv+BCSdO6FZdYUxHJQ/xUUi6XuvDbIEMRd4zBO7zWjxOnWS1E7bSYm1SHp+WT5hlhcI6a3w+jErlt1vYDNugsfLJgZ+Gla6L5eeXH6tYnrOyTS1cFHkb5pgafAbnrl0bmhMCDlau4anSuFdXxQ7PUAaNZ8GYtnABLTSei8Ll2wM/x3ffdA0nqkF5puuOUOOB2j6Mvx11MjAIVcGAiFyf2YGvHYxNL3ZGIxzlEsWzbGT/Cvof9ME3hm4JnpSK5VscyyxD0G5cOeUBJS9/QQVl/Vt8eDHvafciqxacM17qm41+2pnLx7NEmWktW5x9up2IWkgj22UULxW8PI+6BsjoJU5XJPIo0JkwkUkBY8FklGqQKUrXpcg2nh5dZsjf07O+451gRh7rwckRxgUKv93gSBliHfT2u9n+XV8Vpl4dvmzJroBhdMQ2zrv7N/KzN3ZvCGJSmKLVO/tu7n7C1lLBkXaSHnePf3SPKu6NqpU/+sGN3irkZbDBSQKy71Uhd3z5+nMQfqcg7mLBFenm9Qi/zHp6qBvmmFH7EZvZL2J/0Gd3sCDsa9CyKe39a8V+zi37dyHnKe74ZdjlQFiqtroFwDcXhKuPSk5E4HWxFdqBPvFcd27rr6LH/vrqOj+82fKX14pNPYrQZWqdS/jzdyLUzk177ek4xoeur94RZeTwQEmwW6 X-MS-TrafficTypeDiagnostic: AM6PR03MB5927: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lhOr3eQxDGaBX/7nfnNJxxun4by5gSDjjq3sklFXC907nvYEx5hHMw2Xwsviul3UrhtaM4U58c4tAPSb39+01aWBab5nUXFssnlmjxhCeiDnJcr1x6D3MqH/MpIJRlOqwzSuUppbLpDzjy5sp9c6+HrDvY3jXRguX2pmrZshAmWY/BrcMtx4cnZJSNZ5/FiuACpgqU5Ni73pBrv0oDN+pDUjBXt7fzLHPMgnGoMZcKRnYA31jSsEyuwEJaCJX8B2S6oWJp/TRIW5TMTy+p3n9N4rXEwIpfqIuyqXQ+yTiajRoKYujCwfUTakBnVdztxG3n+1CPG3+hSIjYSvnEu+2B4HYuBAOM8IVlw1SnKFBhX1EL3m9LqFR0nHiT7EMVoIKfUL/41L1VsxT0Ek6q4ojdZ/IcxLzqqJv7Stg0XMD6z/HTimehkHJv2SmjdPKwQ8 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: c5iG0tgIEuJ/ql9NqY5NIr6xTh+mEIfTyT9PlQ3Toe6sHEsfWVvIU55qNZSa7KpIq0aNvUUkC/C90KZakeFe1KgGzh8XyWO6D/XstPUhwDCEWQbfpsOIp1tP/aaFf0elyM1GeXfNlBOkjSpPZMssEA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b730a072-1b73-4a8e-915e-08d96b33e55d X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Aug 2021 21:28:08.7345 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR03MB5927 Subject: [FFmpeg-devel] [PATCH 08/11] avformat/aptxdec: Don't set AVCodecParameters.frame_size 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: xKhP+dXsryTA This field was misunderstood: It gives the number of samples in a packet, not the number of bytes. Its usage was wrong for APTX HD. Signed-off-by: Andreas Rheinhardt --- libavformat/aptxdec.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavformat/aptxdec.c b/libavformat/aptxdec.c index 7153e262a1..a5ed921e2c 100644 --- a/libavformat/aptxdec.c +++ b/libavformat/aptxdec.c @@ -56,7 +56,6 @@ static int aptx_read_header(AVFormatContext *s) st->codecpar->codec_id = AV_CODEC_ID_APTX; st->codecpar->bits_per_coded_sample = 4; st->codecpar->block_align = APTX_BLOCK_SIZE; - st->codecpar->frame_size = APTX_PACKET_SIZE; return 0; } @@ -68,7 +67,6 @@ static int aptx_hd_read_header(AVFormatContext *s) st->codecpar->codec_id = AV_CODEC_ID_APTX_HD; st->codecpar->bits_per_coded_sample = 6; st->codecpar->block_align = APTX_HD_BLOCK_SIZE; - st->codecpar->frame_size = APTX_HD_PACKET_SIZE; return 0; }