From patchwork Fri Oct 7 20:25:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38610 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:789c:b0:9c:c2cd:5584 with SMTP id bf28csp206026pzc; Fri, 7 Oct 2022 13:25:46 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7+EFPpOL0cVUmAw9QTEH+V9DOnGu0jYQSCmBZ350+it0R8R4LO1boeJjoZC9uByiR26awB X-Received: by 2002:a17:907:1b24:b0:76d:7b9d:2f8b with SMTP id mp36-20020a1709071b2400b0076d7b9d2f8bmr5422359ejc.414.1665174346391; Fri, 07 Oct 2022 13:25:46 -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 e22-20020a17090658d600b0078ac0d5d03esi4264041ejs.562.2022.10.07.13.25.46; Fri, 07 Oct 2022 13:25:46 -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=h9BYQHVO; 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 8E45A68BBCD; Fri, 7 Oct 2022 23:25:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-oln040092072055.outbound.protection.outlook.com [40.92.72.55]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 83B3F68B64A for ; Fri, 7 Oct 2022 23:25:27 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fLvUHTX5078fCrX31mPZOwQVmvUKNn4dJ40OOD1B+qvyirNCfADVeoP+sYVX6PXG1MKzVsprPbvm8p0CXBHKEPg4RKVisxZE6wcuNPdIOOL8gS6RY/rXTPGurpDjyKzX0HgPlcVeVWapckk9dKbjJkvO21vQuMJTLJgx1FCTjeTJeSbXqmBtE2oVUOa4kVUJjTCdHqvFrT494J3qtTD9SFRtmVzVJk18zAKLd6AdK8oiRsfhjIutf3fWp0qzFTqiv8Pfbj0xfDhVmupeLnERue+vZ0E7HJpFC9PeBg9RnbouF0YuhciQiAjioo1UuriPEOL70nDWylvbtjL38SbO1A== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=iaLmjUdmwbJmSLaegSqsB/i4/xYpgysOnRl3fxGT0bw=; b=jDV/64+KS1GavNJwn+xpus/yURkhXJb4fIRdJ+9UXO5hKod41ZN3leowUsAJSC2dxMuaXGuUmW+slQfhTMFTfICjAotkjVqGVZof2DmFdWI7SJ380IqUygnS6S4JIqnR6Z8sxxP/4CBIt0urJduYb6dUPzZ4t9Ofwa6SVBc4gfTICmffWmHJSQU+5/ZsmXxOOBZZOfvrkFREEX84ivaCtIRzZlRXB5YbkHb+Jt9kGJPLTdrYOMeNfgghWZEsTwPbclI84Dkgw5NBVkbNWkK7dh9C6QRCZpuHh3s1DJEKDHDU+yf1Ks0Xfa0DN/L4bBDm4tTYm2VYh+kIpoXkDRpFRw== 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=iaLmjUdmwbJmSLaegSqsB/i4/xYpgysOnRl3fxGT0bw=; b=h9BYQHVOuycuEX3wz4AuNtasMPcNG+tmE42YuE/GkKjnm3L7+tAqbn7Jsgjy8zcw8/j/IGbbrJzHS2QV8vIGqGDqKZipOL6y9ssAEFTMLEpnwkBm/M/lc41i1imJD1Dxf/uLAYK2VADP1p7BxX0JmwolcWbbaA8FxCw/nmfJbaYKmhvXoRy0kCaKzWaTXck5b6ABJ2KDperUyDr6Vmp4Fet0y3uDUzI5WuRo6lxlFtfSQRpBePaA+A1gVDiYDkAuW5FNM+UUcBoxBdgAt6INkcw/+511jBk/EX28GxdOyCTvj6Ta4cGDdgrExZ9qaaLA2oQY3Y4J1QrfsEVsiEimEA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU2P250MB0285.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:27a::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.15; Fri, 7 Oct 2022 20:25:22 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8%9]) with mapi id 15.20.5676.028; Fri, 7 Oct 2022 20:25:22 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 Oct 2022 22:25:04 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [Yz0bn0ItEfiwKfAiqqgeY/28SOODUKPZWKw3Q6GHkZo=] X-ClientProxiedBy: ZR0P278CA0106.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:23::21) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20221007202508.4188148-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU2P250MB0285:EE_ X-MS-Office365-Filtering-Correlation-Id: 271ace78-5b77-4739-096a-08daa8a20f61 X-MS-Exchange-SLBlob-MailProps: a+H6FLLcF3rUGeq4fk4l5dm1gk0Jy5LfykjbcWFEUQW8+xShW43XatM2ydCRotpYefDZKzJXQVQA1HRw3r2pjJnju7larmrGEJ1ePGDTsrvvulPH7NLBkQP/MixoY3w28ZpO4u4ZtHJ7TXfC+jqYSpuKZVXUMYxvIljpkcHDagyrlBRrxSnxr3msxMBenOT9egfdiT67TLG7FBIql9/6Fl5CtZpje8yHUOzAWFaypgFAtuY8+Hw7DK+uzspThQDhXyoLqp8Cm5kwfMbCJl+Egw7GfDkbsn6dHfAG+MZpC6TdEVjKI89ZfOiMsqwoEW0K8yyHu8Rbjn8DfTJDxyT2S91qLecF7Ch6i6wcC2bpKM+nzbMKKu74exK2Y42J/ha5NiDYfuGZH7yaFpEC+u5jrGD6HqVTvMNjeps+UYfhp/RFdYU6FLeaYFiLU1jgaPoAQbPktmaiWnqF6GPMRrqO2bPexOBuROals1nSSf7glMjpKbHABAl1IZMYMUlPyZblVIax6FeJC8L4fSFA6AIbhG43i4Zqc7Q7OkNEh5MsXDDBnwK7gKaKKRa4RXUcGou2rymC1SAjO17s2ctGEyqecOfeeoCXmym03JyPNpV3mkWGmB7Spuxc6PAIRCb7KfyKxfeuvUirU931Bj5RApqE7Zt+zeGb5IswZtRocctGGba4TRHqbsb7o/uLnK+Rb04l0FS/Nl3IFGEoyjoZI2tyKn1X0ycfXEiXH6k6OlNu5R+uKRbOf+WN+UC+qpldZBi5F+W4wg9Yfc7eU1uOs2/LXVo9bDrLr/k29p9wjfYIUSuROXHpqD7vuMNO1cmiT1eT X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0Hhxh4cypn6UF1NKR+kI79AMkcMw0Zgkrhx3RYwcWLzJEJl8Uka3YJhVmVDjH64RtN2TTFtYKYEiuFJmEyMcEb53IQ6Htj3Fi4LrmlmXSo4y8GEJ1PqHLx03hhRjvPTA7jU4oQgpag2V0YVYMzNMPKMvKL9dt1vL2sSzEABdebpl60mq4oFbF03CB/XJd040Bo1EgUO5zRhncxM2y34eImHNPIBBfgCgYsuRwIzo7GPZdqd6hgHUuLQlrgmWT7GJixFLyF/A2+UhqSyQonx8XHH2lp3E1sNjng7Bnh0/QWwCWreyPnWvQb5JaJoJOgsp7xm1W83p0AU3ycPPUmzVoq02mIg5oOC6qp4wnrvOxfwCwPqrx59IAdFg89ma4MR4dxS2LflBajEgHewCweZ+MFePLhdMJC9QUnH596hKgVws+q/mtff+mqDzOfRV6H639IOOJraC8fHf2V5Gh4OVmcgD9PEEVqhZyN4Py6QL5nVrmsbm4fI+YYmJEEIeHtOjypO1LYqOi6DSGYAcFpyT1nctyBJs8R3xVrFKSGPE+TJDQOPuHhuu7W+FZozFI7/5dQ59Ura54zeXG5QE3wjWK5zgPQgPKKA17oVWQ+vyfoRaN8t5bk+ikhDGNZ6L47bzVOhfhXsERRwOkyyJQRmiRA3u0bk/kynUCUbM9gBinBofnWYp6rIzzZhIku72Bfbi X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 9f/i7up5eYhSor7CJflhQvKa21j4zPxuhRJ5i59WYRKC8z/F6fRBcUMIOjO8KUSUbh1T4O/NahTOBQb6kl7BR7nvJZfLwh5ilgB2PDq9WYmR0l3n4yWqZWu4FZAmn+slC3aEXj8yv3i6o/vmpvgt128amtbBiRmIAI/63Wh+ZA1iG2P2DpKA6GhUNn1GkHdU2uyvuEX3ikeZhbpKi+WehNq1l01EuD43xWPM8YfAxCxuHol9cvG8ZBfKUQNb1DswNx9pMBblxnJBsINYRh0Xoem/xzb7PuZhAVbV03oE+NkHulWtMvI35EmLTxA7i30kvLYEqyXpsxRzWxGNtGwKutrrVgeXhVsaDYVGqDeRC+wqIVsBChg/y+rhYz8TfFQWz1DbBCGaGhN0vzZBwyrAUUpeIsWwg66U/C58jssePZEqhWvHd6BaMI6alPrJpArisLMLlWRCDzWJcp5SQIyks+z8awmgPk8dS2J6/sHg5jipFDzxmaOC6FkR+doQYyZbXkBGM8owYhnifybXkAuQ+sp25JxORLkU6x9cJKt09vvtCDptvAEfUcOU8avzxJZRQeR23DurBjVuS3VPJOPY8GhTqbW6gh4fczIfkZ4CA6rOzDlRc3Tiq6bv40r8IVqpCebeQ3RYelBGXks14FSZfYHBcdaeoRGrSfvTxYM6fPwOxzYGjCdKfe8j87O2m/TRh8s8hMFaQ4hpHguW7HxGkQkG4x3bVNnFQzMaQwJ6uljCY0nna/hdh6Oh+dDDKr0O0ac9pggl2QJQnZgPoJZwV+irh5t/ApdfxzLRC9qweTBo7ZUFvCROG3bwd8Nvn/8wDlESdVJZRXAZ856R5G/nNoj/8cYe3lJ39KOP4Z4ERxnk+aDgoyxpjvdzc2JLPFAzfvoMHBvpr4kISE9xG81FhGmr6Sq2KeIuQJznw5MJbSk5ydeE1sCpmnaTWZummujKN3tTX+weluInrCnUoNU6gCTUP9wxoHMALt94gG2mgvFvEKIov9pGgZNuwmScg34nQhgq2Ig8zRjXfdhoEmWxCWw7bKSK9lR5HzLSwN57eEawLNNWNQtJ1Pcv/z5hN7UDdmiRBccagpd4418LHes/DHy3+pwACIeRsj9MS/gAgjj1yBXdh3aT+i1IlI1xgOc2jbBrSoqqQcKrhkaCu9fHnQojJ7Y1mYT5OCQGjFQv1sYNkL+SwkvYWhfOoBLQvmbsw0/gwha+KzAhVHNle+BS15CGe3X9hhIGRZ/wpKyeeR7HPqi+Y97MvpHsLhg0wFWyZFEcNpUMLCZ88HMKILg1hE/pbxNgqDZh+aZNzvblEDM= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 271ace78-5b77-4739-096a-08daa8a20f61 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2022 20:25:22.4406 (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: DU2P250MB0285 Subject: [FFmpeg-devel] [PATCH 5/9] avcodec/opus_rc: Don't duplicate define 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: xN+NKVvV1ClD Signed-off-by: Andreas Rheinhardt --- libavcodec/opus_rc.c | 4 ++-- libavcodec/opus_rc.h | 5 ++--- libavcodec/opusenc_psy.c | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/libavcodec/opus_rc.c b/libavcodec/opus_rc.c index 2061418e52..1a26d889b7 100644 --- a/libavcodec/opus_rc.c +++ b/libavcodec/opus_rc.c @@ -388,7 +388,7 @@ void ff_opus_rc_enc_end(OpusRangeCoder *rc, uint8_t *dst, int size) int i, lap; uint8_t *rb_src, *rb_dst; ff_opus_rc_put_raw(rc, 0, 32 - rc->rb.cachelen); - rb_src = rc->buf + OPUS_MAX_PACKET_SIZE + 12 - rc->rb.bytes; + rb_src = rc->buf + OPUS_MAX_FRAME_SIZE + 12 - rc->rb.bytes; rb_dst = dst + FFMAX(size - rc->rb.bytes, 0); lap = &dst[rng_bytes] - rb_dst; for (i = 0; i < lap; i++) @@ -405,5 +405,5 @@ void ff_opus_rc_enc_init(OpusRangeCoder *rc) rc->rem = -1; rc->ext = 0; rc->rng_cur = rc->buf; - ff_opus_rc_dec_raw_init(rc, rc->buf + OPUS_MAX_PACKET_SIZE + 8, 0); + ff_opus_rc_dec_raw_init(rc, rc->buf + OPUS_MAX_FRAME_SIZE + 8, 0); } diff --git a/libavcodec/opus_rc.h b/libavcodec/opus_rc.h index 1b3cb93a15..72e683b075 100644 --- a/libavcodec/opus_rc.h +++ b/libavcodec/opus_rc.h @@ -25,8 +25,7 @@ #include #include "get_bits.h" - -#define OPUS_MAX_PACKET_SIZE 1275 +#include "opus.h" #define opus_ilog(i) (av_log2(i) + !!(i)) @@ -45,7 +44,7 @@ typedef struct OpusRangeCoder { uint32_t total_bits; /* Encoder */ - uint8_t buf[OPUS_MAX_PACKET_SIZE + 12]; /* memcpy vs (memmove + overreading) */ + uint8_t buf[OPUS_MAX_FRAME_SIZE + 12]; /* memcpy vs (memmove + overreading) */ uint8_t *rng_cur; /* Current range coded byte */ int ext; /* Awaiting propagation */ int rem; /* Carryout flag */ diff --git a/libavcodec/opusenc_psy.c b/libavcodec/opusenc_psy.c index 5c768ae68e..48ccd2ebd0 100644 --- a/libavcodec/opusenc_psy.c +++ b/libavcodec/opusenc_psy.c @@ -359,7 +359,7 @@ static void celt_gauge_psy_weight(OpusPsyContext *s, OpusPsyStep **start, rate /= s->avctx->sample_rate/frame_size; f_out->framebits = lrintf(rate); - f_out->framebits = FFMIN(f_out->framebits, OPUS_MAX_PACKET_SIZE*8); + f_out->framebits = FFMIN(f_out->framebits, OPUS_MAX_FRAME_SIZE * 8); f_out->framebits = FFALIGN(f_out->framebits, 8); }