From patchwork Tue Aug 31 12:42:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29908 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp4889115iov; Tue, 31 Aug 2021 05:44:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxbnB4+Hk/0bfKyPoEZYwTgRbi2t0YpTYPoQ9H3+G6RLunnCyTEafnqnSiJi3spR6pmM92B X-Received: by 2002:a17:906:3e10:: with SMTP id k16mr31768363eji.116.1630413871286; Tue, 31 Aug 2021 05:44:31 -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 z16si17207095edm.532.2021.08.31.05.44.30; Tue, 31 Aug 2021 05:44:31 -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=WZQ59fGa; 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 1C50668A3AF; Tue, 31 Aug 2021 15:43:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073025.outbound.protection.outlook.com [40.92.73.25]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E071B68A306 for ; Tue, 31 Aug 2021 15:43:25 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UgQz4APp2dNOLSrLawSc7FOXIQox3ACSAb6l+CO7ncAPG0PPvYHu/R6W338W9OqSl94zZ2lWTabSqIwJ++51rUxFRFOr/sTwe/4MITL39E/vpxibJZSJ5XAZQ7kzSvkthIQ/vbxY0SDsiaUlm6wsLIdLvSEvZyZr6CRZutk41La4Of2OoyCKuQK698KcX6bzzxJwpXQLNroN3XFXYoYa0U2FI20qFqiTnC50/tl9jpVvrC6dip0blJzOrEIqBBEYcBfU/uBxleQKxsGfEYCa2J+B/FOSxDrVvqCHjOX+yKYCAq3KtI6urlEpwTmyTmogneGmIK+A2mkHbU3QuiANMQ== 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=oTB8iqZ2yiwGri3TvikTs31jTidOlj7hz15LR6Ck80K2DIDKT9K3nW/RbXO7VTsw49EsOvcKDk/n7jLP/DaVXHRrRYFD8uep1YJh6u7j9ijYBhxVtQy10C3c5UsbbAhx1jHc9adTyNX8Z9FI62QU+gvOoZkkfL68UlcUz/3mkqWpqsbeAzX7XBhpy7jxrX7xqZYvbbDfML/nap0caUBiXcc93PxPC8EoX/ivffHTdnzUIFBVn+LxQFSIclqprO2o8GJqlrzwTgN9hBu/s133wzCFgUT3pURRjnVPFXe8zMu5uYKJGdWEWAOfhJyM63hRPptKknxgiqS0ana9WMZRTw== 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=WZQ59fGaZV+tleaZh+jVEtoC7UULFpMycsWcreft9e54NUZMBpZXuGFlEnxv88Pl+PHRlR6HZmkV7fBcFkOJyxoh7X64v7ZsCpQHnSm1KNmJ4C/eEgKgpABosvbQ1I6r76VkRFmOLpKhrv9DwKeSGhPxH+69n/2YAuhwBIRiIuVH2kspUTJr+VrEwgkgmP/UpIBno1fvw68DFGodLULVuwGUPChndmSm+y7gnrgoVOXPIJBHcB8dY2nE9ANzKt69KXZCHZntpSAhf3EQCUjAr1TMJsQfsEfQMLMBLplpxYyNx7zpxPqyIgipqFYbHT4sH8ykkpMYLW4GCc8EZigTRg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (10.141.218.86) by AS8PR03MB7270.eurprd03.prod.outlook.com (20.183.133.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.17; Tue, 31 Aug 2021 12:43:20 +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; Tue, 31 Aug 2021 12:43:20 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 31 Aug 2021 14:42:55 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [BCUHQ4CHtN/i2xtijK1zDUV8zsiTASLA] X-ClientProxiedBy: AM9P250CA0014.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:21c::19) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210831124258.1715917-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM9P250CA0014.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:21c::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.23 via Frontend Transport; Tue, 31 Aug 2021 12:43:20 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5a96451d-57f9-491d-5fda-08d96c7ce9b4 X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEvWcunD+UIW0Hguvzll3NV2+rVdj2ITRMwU56uuF9AeArufp8UTc8m6BS37H24RLJif+wKpxN8gVL4D8LXepUPMZ4oA4MitbhCiRjkGYjYUkz7ezy4TWcu4v+wHsIOUlGSlmUEuGfklqpHN0oVSRIBpcES/VHDDqejLHPHP7TT//4uGwYmmUxZOIxd8FnzmIZcO7T4E60CfjMhD2MVNLpY8bmKDIWIhQoW2/ZHpneGQOoMWaI7Dno/s08DkbU4uK1TpZVRHXllUnN+iEoWb0DPNcrROqRBscl69oFGSOScUcQU6kYpR6jKYqZbdh+7ukTcKWThkYqYp+64i3PRjPsD4+ySISqQ8aedvRP3xCljvCX2B8wkFCiMKPOQ9kywkk2on04MoMjCHsCOKf5GEntcQAUSv01l182paTxpCIF3i0rJiJpG3WSx6vHnez4/jANB7scFTnd3/ANcu1CjtzWpmMFGQO7dYv7XT9DdvNSm7vPt696852PkFBvNXFwmVUR8YEkoRGFR+s7UbuiRuhJ7JmyGu2dn2eWdZPWeMuGTnScvfGN3uV++GxJSbJqVvAcCNklpiSDZBJS0j+xMuDX2zX72u4DBosd334po5UQVprZufPAs+Q67x+hs8Ette5AqJF89NsMeuy0azb8a3E9HrXmkDS1ruPynbgeeW3hR2MRUF7lgFxx0KnqzQOI7ll+MfaTE6J2ZHzL31FZxOJvZn6r/NBrMepJ5MXOvndVHGmiRDwSfJT/aipa0mnJzOpw0yMYzEXDb0rKCLi6JzBS9g X-MS-TrafficTypeDiagnostic: AS8PR03MB7270: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kt/fp4V6wgRrTQYJN/nMYLny6qdF0jtev11u/L23+Edk5q2yPqqply5/14LVNRtMtGt2TobYK6OiqBGx6cmT/S8wea+GlDKxtXvvEDGBHY9B6WyxfrTF6Evp5d7X7ACja39FL4DqpG2k5noPiuF+OhOedUVxNZESSodaurTg/HzF65L//RGaLAPBjJSTRVfdHEVLcBhcNx5XdVHmiITECE18y4nWnhjmGZJSeqapUoQMY/M9Bf3HZ33oN2QE52AQRoH4GXU7s563y1nJuXWvjotHKW2jk+O552EtzUMRtWMQNvXnp/Muwg7WUs+VlpWPNPNDQL6I6fowTHTF/Qdn4vf9TdE/YG/i5UtiWJ6f6NPpUFj8p3jF5AjE8BscbGL0tQ8viZ9ft0GkOTd5/LrFyy1pDhm51odCOyg1HSVHqCyByIB2tWZbXLt2YxMEANdw X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: rznaEdV19DS3iWX8P20emB1GhkigLvnqO9yjOTdW0Ue5dhUbwhTDegUdZG4+j2Xft84UiJgjAFL5q4uNNailHU/nuspFZKECMpJiMmp8f3F25t09R9UXBK+kNG/JVPNnX35lyk8+dqY6RwV0g/JgqA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5a96451d-57f9-491d-5fda-08d96c7ce9b4 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2021 12:43:20.4064 (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: AS8PR03MB7270 Subject: [FFmpeg-devel] [PATCH v2 07/10] 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: evH2zFDuPi5O 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; }