From patchwork Fri Oct 7 20:20:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38606 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:789c:b0:9c:c2cd:5584 with SMTP id bf28csp204393pzc; Fri, 7 Oct 2022 13:20:50 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7yHEEtEXPgHqfBfbgcF6msFW2D20Iz1ILxwdZFEwAESskOOjG8QE4TQvGeCxmUXvqqMy8S X-Received: by 2002:a17:907:c78e:b0:78d:138a:ec4b with SMTP id tz14-20020a170907c78e00b0078d138aec4bmr5441616ejc.381.1665174050585; Fri, 07 Oct 2022 13:20:50 -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 nc4-20020a1709071c0400b0078d45293551si3079548ejc.487.2022.10.07.13.20.46; Fri, 07 Oct 2022 13:20:50 -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=SFAITXrH; 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 C58DC68BB6A; Fri, 7 Oct 2022 23:20:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-oln040092065066.outbound.protection.outlook.com [40.92.65.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2F04268009F for ; Fri, 7 Oct 2022 23:20:36 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iqgEsq9pKfmAjVf0+Hn/xlKx7dmxICGUL7jtLdJ4IIofVg3u1VA4iSn7Y4VGLKif+4KgAO66eFdBpd34ndISPs6s085FdOLAPVEpxA32MCjX9WGhDOZxCw0ZA5EmjLOGOmDXysoSNHP/vVil/I++QzGAtTiSAHBE3Plk/66NbTAQNuYxJck2TrCkKpiTGdy5I9aAPoblMlMYrPYB2v8V9/JlrL5SY/TMJm7zuRsl1WCWNYVhGpxfqud8BxMmGAkm/uxERDYmYAVVdeaZKUSoi7clcCae1I0cGGQ0rOh8t+qmkIjUz4jZZbvanVW/R5xmaOS3bDMXc5lVqdBuKqn2tg== 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=SlbS9xP9W3mGGI6524ZGML9iX2lwWNoYIbPbYnAJ3hc=; b=cM7BJ2LBsRkY0ysVdfdmf6wJxLrolFJbKSTvf8qakU406SlHm5SR9rXUGjosCB3mNbhOPavVZ1a1NrOI2oP7Q9i+whAuLI0w8WJy+nnOfWtwBrRB0pvzCJSxejP6zMtXVXilZ4nWjRetALZTq5KoQ8vG/kHj5LdLbiHwmrgic3m6F7I5xV32AXW4Vbc6Jvqa9KoNxbm2PEi0RbjOBXU6YnKjZ8o4uZ5PbeNUArrBRPjuwobpby8Vv8pLyIYB+Kz/vAxkbYXlmUI9EDPs86MfxDd2Te5y9R2vw7SMnArQQNzmKyJ6HgWcguNbBaYodCJXtA/Nani01ahk/K4PIuy3sg== 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=SlbS9xP9W3mGGI6524ZGML9iX2lwWNoYIbPbYnAJ3hc=; b=SFAITXrHPORAkhWwa01pWIHlVYNEBcZuJ86Q2Q3O0yjyIRGMQO80rzMANBjp+qeTvKLn/mCGpz6BVxJgFuvHTovt1TDB60W+goW3HXoX1dyulis6v/tSr48BdAgeG0d7D83H+7H1LhCQ9n2Xab9Sf/9mYo070492WCHctDhQyr+V3lFFp4I7zTLfEYZowKuwWdVdvScWlDLh5bT6g7o6nEQhjK4V4wFpcpGD3EZS56c05UJQuFTcSRoXshD4r6vCxoxJMApsaEmjOjJZF0ykxjDFwVlQcHbTE7jRHTmiCklC0HxGU2EUBT6UJzLldI0xZkzTUUk4KW2iHBRbMXE/ZA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS1P250MB0479.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:4a4::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.31; Fri, 7 Oct 2022 20:20:34 +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:20:33 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 Oct 2022 22:20:27 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [WEyu2+OXsNuN8iWR64ytnQjDLIa7boq2ncJH5V9inuc=] X-ClientProxiedBy: ZR0P278CA0146.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::7) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20221007202035.4188030-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS1P250MB0479:EE_ X-MS-Office365-Filtering-Correlation-Id: 4ca31182-07d2-4ac1-59f1-08daa8a16355 X-MS-Exchange-SLBlob-MailProps: ZILSnhm0P3kriUXd04K/td43akM44RrIlGWASQQ7udR6YCXzIp4y3KbPs8YZCaRtfT5pk3XcpSmLzkSrXHq1FaUHm944A5S4qE5VdeON7FvWLc+Z6AZCGAO1Wx+jhvyTeE4wAuRujQi46I8Qra++P7FY4FEyN6xPik6LroAlrWEOR7lH2MBr8AAVBVH2GfK5BzgYbHCrHjTkyqne+9kcQqi7tWkBARMosW4lkt8hs8ae5v0O7vGdjZZJyF61JtHVBYqXGkiGyvDRaWbAPsVm4Fo/ZVm9xpgWSKsjbxlEeqpm/taqtzxfBqXUhW7x268NLbgyTrTOfIH0V2/g/yBaumIVacv8EzFg/Xv16Sr6icxdIVOKTQZS9bVIQiBo5fNgj7t8+Au3Icua5npjk28eksjrpMQjIqAIUe0K8b+3rrXag+fm2o3R8CsbSY9qxPJkzr/XFaCYsI07D+8djWWNZ3jMnQ//5ok6kdebYORxU4zVdqH8ADZwAqZ7LmiOxMJxyvnqHgcPFR82Zw6m1XHLLjqygsIoTCFCbWmqw+wTm8BzLcuowmXPHapGkSPQJ55w+B/KwXaE9/5PKIlAJbqcBLiIok4t693Cc6hcxVYtJ1Su8/AhCLQ//PZ7avERPmzNTEJxmQ3DHCoySJ1HbjlV+dMi7/2nGmYLjkexIvaIXKocw7ipUrVLdtsQRkWGwzfmbWDW2UpMwnPs0oO1yongWWW28A6AZaB47SkWKXcPWY1tG751uowRu0F9RM2cQ4AT88kGFK8tjUezYhF2jAe+H+NTOiuQUoo0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LKaXn12LcEsDGPDIqi4m+hZqL6gxPvXJi7Z/zEmpN9K/TkULrHa2LuaYk3CNmNnQ3rtAqdHXH+bQYIlCeIu4xbOzORVvseThELXAyB8AnwMF/oM+n/IyzWkMDinTfGkxIADKyADQlEdjdwJkZB83CenmQa9N8+BwD1AbAVsdlTZDRVg1+Lmh9zJV9HBArv2qdOsCku3fEBCDGplElm7UjsziO5Mp+wunPPS+yw614PWY86eY4mfT9Qv6CyA33384qiVN+bJvLiIBVfGUYV6aOZqKwV07o8sEegt52Xg6tNAENGNaG8jhK+SMih94xYz/IN46W/PyBEnnjb02r8HI3KWX65uJvsR8YPK8vFi1pZ/Q7EajSHxASmMvDc0JHArQN89X62lTT/2QjSP4oLciogmFReSZA0SeiR4CLLJuq+3AzIsa4c6yj8Nd8woFhopnEbZy7te+gRJg9xYmUOg2JsnBP2tfYkzTG8/dutNmsrn8DpTRJ7w0MMd761GPnAVEboGaoDOj0HXL9z/R9nUS6SpAZQQmXn4VZYe/Inw1rP9QTvGsozhg1KEIfjKnJM2YyLdfc4DMwaeeRJRKs0i2xTPunX6Jl7kR9RuR5e1l4ZHjHJfZfEFbOWO+7w6+DcClDi/xnG9Z6pRuVZ9qSiWcgCzn8YIQOzsua5h8XaZKhTwTnsRRr6fq3FNKW8KWbsXu X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Qjybb93qx0cxha5rrwb5wYsDEraZLU8tQjJz6a5qaX1GvKOYL/NUjzrMJ6MOngcxfgnVLxb/OeNqZRYRWsFug1+zx69w7Cgx5T6bNCD2uZQMBRk1nNdY+RY9RHt9ou78D+IXbguuDgqDT9ozKM+UwBOXbxlFneLch6xxqP9dqbn22HDJVFW30RLjaTkzpRy2hnTiO1ktAlsloKzXYRSQgMBXAppi6nPBbiyU1gkOycawoVS9GN4wy9/9GosJ0218AXseUtxiBQJ742OO9LvrF+zuKovb/fMcNT+0pzQ1CUxfNnnE0BM7GUjaR2dKyJqt3/YdRnftt/segKS0rUZvDcvaY18QIjTIe5girhyOliAOTwrT4s3rdjaHONvcmY26KZ6xS/azmWi0dx/QjbCa+yTRo5S341SlB+25zqEx3sEEVHlXU8+dAROytEWzK2+KOysGFNp6RZuc/ImFHnNR+cBFg6C/iKhLBT19uhy6RyWmdV3xIc8MfyPZgROL6seOKidRz2GVu58dMzihJYUUlyfDO8UN4AHMSuolWgiD9i585AOsmpqlmcnLp6nm4qoccEnrqrVORvCp/Ov3Hb1HeswC/cL9qsOCmY5y5UQMznDYmT1OGfHH06crqpkFJfeh/IIIVHbqoe9uFsQYo/Oxt40p2Ut4kCIWSvlhB5D6c/y60UDolc4zSTiLMnPOaDgiDhhrh/ym+fGVQ6pbUGLYQ46siNRzyEZodvJFF1e/crWbXFi7G97HPUmUheX0UBINYo8+QqRx76+qblOYZQBaxkGZYkgf1xemVFiHnGyN92UM5mSXJ4Kb1KcO8p5l3DBdpxCgeEIwxTpADQsPbjCXpOzAOiUtU/y7RZA2HDJ+0ZgpPEPu2gLnnhVS2lwRQMzBwkwyN86cIIgGjTQbOeNSwYbqxF0BlFAJxqS+Fc13PwK+LAqkitpUMj+i4SYcajbDk+f4Iq/9FqdLvNflrb1sf4Qlay/j53hfZVp9UYUmEt9qZwO1BBlRMKn7ImV2rSGNonW5kDGNe3PSjM/uVQa6gE/NdMAIbyx/WZGelTKCxIXZhs676zFZDClXeSxpklLDv/KzuUZoJrZD/cc00PdlWCAdNm8ubf7UbYOiIUGIdHI8I3oU4SyBR0wT04SePOWj7LfSP4ZzE4ka7NyFbJlSo8kVlIlfmNUhEcrAhrEED3Rc7rr5qjyXYKK6QbNq2mVrrgxT31MSpYnMDVjzi8MneCQeinvWmZVVBtwynDDGymd+K8l6WRKsL34CEiJBdZC0GOsHGVSRM6oUIeUuBaBEmneKTRdqshaVCc/VEDrmyX0= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4ca31182-07d2-4ac1-59f1-08daa8a16355 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:20:33.8741 (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: AS1P250MB0479 Subject: [FFmpeg-devel] [PATCH 1/9] avcodec/opus_rc: Remove write-only waste from OpusRangeCoder 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: qbJZ0RIyBT76 Write-only since e7d977b446194649aa30f2aacc6c17bce7aeb90b (and local to ff_opus_rc_enc_end() before that). Signed-off-by: Andreas Rheinhardt --- libavcodec/opus_rc.c | 2 -- libavcodec/opus_rc.h | 3 --- 2 files changed, 5 deletions(-) diff --git a/libavcodec/opus_rc.c b/libavcodec/opus_rc.c index c432eb90c9..2061418e52 100644 --- a/libavcodec/opus_rc.c +++ b/libavcodec/opus_rc.c @@ -383,8 +383,6 @@ void ff_opus_rc_enc_end(OpusRangeCoder *rc, uint8_t *dst, int size) rng_bytes = rc->rng_cur - rc->buf; memcpy(dst, rc->buf, rng_bytes); - rc->waste = size*8 - (rc->rb.bytes*8 + rc->rb.cachelen) - rng_bytes*8; - /* Put the rawbits part, if any */ if (rc->rb.bytes || rc->rb.cachelen) { int i, lap; diff --git a/libavcodec/opus_rc.h b/libavcodec/opus_rc.h index 627f83229e..1b3cb93a15 100644 --- a/libavcodec/opus_rc.h +++ b/libavcodec/opus_rc.h @@ -49,9 +49,6 @@ typedef struct OpusRangeCoder { uint8_t *rng_cur; /* Current range coded byte */ int ext; /* Awaiting propagation */ int rem; /* Carryout flag */ - - /* Encoding stats */ - int waste; } OpusRangeCoder; /**