From patchwork Tue Aug 31 12:42:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29916 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp4888807iov; Tue, 31 Aug 2021 05:44:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxSZmtrl5eX+iRkNGObKmWzi6mGMvP+o2sfW+2FNohpEVfVKuqpL12zDZ+0aBGoHtR0MM/t X-Received: by 2002:a17:907:2a51:: with SMTP id fe17mr30923688ejc.179.1630413840498; Tue, 31 Aug 2021 05:44:00 -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 w11si22675429ede.300.2021.08.31.05.44.00; Tue, 31 Aug 2021 05:44:00 -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=e1YYmjwW; 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 001C668A0B6; Tue, 31 Aug 2021 15:43:32 +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-oln040092073086.outbound.protection.outlook.com [40.92.73.86]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6B85768A306 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=FANHPjLGAXp3PlyPvkUFx2KBMWuPy5xPPf7zFC6P4P2vAkyOzNeMUapOPfBCFH6X7LZG5wUDHUXiji6VTJMNdamLflU8geYGX66ElBq6LUP2OZ6t2wlxpxI6KrTO1/SDgpZcljjEPvFvyGNi4/nsiN/0y7i4pBrHDGlDEP9RJhlA0BRD9+AGhtyfKINqm+Oij+/lT4TSnY5yTqK/FLiFKjyI3kICwj69V/w251ObJrCJm2th0HGcjnIYTkZbXSaHjAJewzcV+2kghTHdUJRM/ti7w6AsAliKkYS/BoudME/Q0Fud4FZK/58hePnbmx1nPG4Yh7UoCh3bCSVAxtO9DQ== 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=F16WiVY7aTY/15Pd8kcqCt5dl1NfbxKmltE9oyfnk8s=; b=UUhxpjItrY/eQdRatu2JvWea3QwYKE+eXrP+4j7FpedBiAPlMAutfp23oORRi2kSEgFenIjqMVUBii0a6gu+uYEm2UFtR+6jn+aFZFlaq1mA+U5+1QnWLryKQwAzQoFEPTDYALSSd8lS7oxdIq6KfLHz98pWZ1rRkwy3bsqRNB75HIzSe1Fvajw3oFrikCsCBH/M95aLv9KESy6AC5XYRL9MPTingoDsAkmClSwP8ixd/iyp39RG3JcjVFVttan72M0k1dNztwrci2RLjQZqKCicys9DvZI3nqy1yoBzDAvl+ymW4e7UBYzgHRQ72g2emK6gkKhy/EoHaSuA5h0GAA== 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=F16WiVY7aTY/15Pd8kcqCt5dl1NfbxKmltE9oyfnk8s=; b=e1YYmjwWSKzNm6mWBVOJ8IRUQNjVuJT0QCCQtFiodsVKzo3qo2zJLAQMeaXjEvD/IRD+mXEC9JMbjvtPTAiGJ4GqWBt09EKO+kCq7i6sauRG0AAViGiAfOZN/wi7WDAf59gkYiX0JXYMWNyrapBihp5NNaKCd/fOn0N69pkg79K8XvHpogbrO5CKEd00RnsZ9Q6iRCGsqXsQZ1zIlsO4DRxknH3A9zoji3Jr607ulT6uTEye8GnGwONhrRuX4h5dDSuRyTmD9l8H8LktrcSIyPgwGTUusaZWXJ8ML+KtnlVh6JL80rldxG0BIwa9tZqjRSNYiudU0Qy0GKUpDOHbJA== 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:54 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [xg9ft7cVc5slsdzIYvdYLnGnxdBndPI+] 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-5-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:19 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4c253091-6fc8-48f1-6dbd-08d96c7ce979 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVAewO3OwszBVL1NI+kAPIBUpQReh63EVB7Yv5FiIEU5qNGBAmcszmEwra4GI8BpegD1mHEZ81gtO2Okt3OU0AIQ0+3NkasmCBTc3V4/KJ4CeXpcGuNF+FxFfLqGfy3jqXP/ReKsi5kaseunPUWhDxm0FWTj+GL9uAlJ1TxjWz73i0/L9fMk/oEIoDHh7dQqDiDmlfZLm/XPZzlIZpv+dyZwXzcFr7ihEjJ3qrDp8VpVndAVkRFv5uT+bQW23joyIAyDnW3w6iHQTkwJjOofFaZoU/Wr4Lli3StAOEJsBFKWaD8wLZLiNI4LmHI1pPj/ewE5ukZlJZtJsjEvwE68nL8TVQ1okRt/UztDz8lTMucm9rAVgYlH+C8mt+TTrTqm33hQgsa0tkJmx9YMLhg6/iguIMeqw/vRkRPy/MDO4QTJS2VY0SBn8VWW2ATiOQKDOLHr2g2wkjrBzVrCFLji9B4naRCJyrQIjkJl9OqKt0vKftiR5Gt9UluetMF0lAIjpczrGg8vtsZ+VR1f4Eb0TDm1qaBDi6FaFxoFqogdiVEu6VbA7YLGQ4HGAVxV/FkZdRZT7e2YtB8/hCt3mnz/ttm/23itjQjIDmI12ZJq55ktbR1Wu9d3+m0PDFRjf5fkNmB6C8vL7lG8QOKKdQiol6RvCirqlHYlINnwx5cGPwVOt7fKTr/IQEHOsDCeRZaQ6CseyAOdFmRxTF+mtK0ZOwWFRXY+W5WMXY= X-MS-TrafficTypeDiagnostic: AS8PR03MB7270: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Pwz79bIF24hK4ww0LwRmXCE0txRzufB+mkRSDy4oQW9Dupq1DbZtQBxNVaNuk9pgfNdwziLZwrrSK2SLWy/q3JOrjoHQfMz1hN9SIX5yEfh1YHc0v2X4AvYAL+WrmotXnqoqTw5oEkUihwSksfeanziESE5DnTpFgZByOebNKMJ1MfZy8vAgOVMopnbdHm+JIJ/xuVSbzgcfZlk73/Vwx6M028veUhz4S3v3XHcq4f2ThSi3ItrfYlPWxSBG20ht+MejlPQFiuNGQuoi1sSb14YqpzjkkPNSNJoxSHTBWOCK2MmxLnd3X5/Vmy3xUx7sd70NAfEfc6CMl7kjwauTpcjgPBSdSC2ScC4K9szmc/F+azsXAWDGGlf/10i1GOMq6YQphtCRYzglFhEezVlFU/8VjwaMen9cC2cU1RAOJCyK8MZIOD5cMybdh98yfv/o X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: G1hPluZHXg7VsteSiuTH2ZLbbllG6yY8ctadN39qFzYu5JV4l1DD0kLTCZ8EmXF1qbHOn7mHIqSGAQ5J/0fW0ZaG4hngszR0hkT+zCVhgRnYas4arQAnKHGMqkBV5dC3q5KG0B4oJt7dy6FMyRDYOA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4c253091-6fc8-48f1-6dbd-08d96c7ce979 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.0420 (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 06/10] avcodec/aptx: Use AVCodecContext.frame_size according to the API 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: RD18xY9T9S76 Currently the APTX (HD) codecs set frame_size if unset and check whether it is divisible by block_size (corresponding to block_align as used by other codecs). But this is based upon a misunderstanding of the API: frame_size is not in bytes, but in samples.* Said value is also not intended to be set by the user at all, but set by encoders and (possibly) decoders if the number of channels in a frame is constant. The latter condition is not fulfilled here, so only set it for encoders to the value that it already had for APTX: 1024 samples (per channel). *: If it were needed to check said value, one would need to check for it to be divisible by four (four samples correspond to one block of block_size bytes). Signed-off-by: Andreas Rheinhardt --- libavcodec/aptx.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/libavcodec/aptx.c b/libavcodec/aptx.c index 3aeee1907c..97397aca68 100644 --- a/libavcodec/aptx.c +++ b/libavcodec/aptx.c @@ -515,14 +515,8 @@ av_cold int ff_aptx_init(AVCodecContext *avctx) s->hd = avctx->codec->id == AV_CODEC_ID_APTX_HD; s->block_size = s->hd ? 6 : 4; - if (avctx->frame_size == 0) - avctx->frame_size = 256 * s->block_size; - - if (avctx->frame_size % s->block_size) { - av_log(avctx, AV_LOG_ERROR, - "Frame size must be a multiple of %d samples\n", s->block_size); - return AVERROR(EINVAL); - } + if (av_codec_is_encoder(avctx->codec)) + avctx->frame_size = 1024; for (chan = 0; chan < NB_CHANNELS; chan++) { Channel *channel = &s->channels[chan];