From patchwork Fri Oct 7 20:25:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38607 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:789c:b0:9c:c2cd:5584 with SMTP id bf28csp205875pzc; Fri, 7 Oct 2022 13:25:21 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4QRyPIxB9aWgbrW2fxfrTIaWCKVLAeLDa+vj1iTWM543tFy0GxHMEWNhl+aEsRF+PS/god X-Received: by 2002:a17:906:c14f:b0:78d:105b:e57f with SMTP id dp15-20020a170906c14f00b0078d105be57fmr5552767ejc.672.1665174321160; Fri, 07 Oct 2022 13:25:21 -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 i24-20020aa7c718000000b004593a09f7cdsi2720905edq.394.2022.10.07.13.25.20; Fri, 07 Oct 2022 13:25:21 -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=Pcd3pD19; 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 942DA68BB74; Fri, 7 Oct 2022 23:25:18 +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 1F37668B580 for ; Fri, 7 Oct 2022 23:25:12 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=f/CySkgllQF1OwIZTwd9B2CWvVv5dDQBNIjbA7VPyAe1yy9x9lxpStGnZL/UFU5WzV2+CYE0RZ15cDAhxMqz0NinVIWhdYFJ9+D4bs3SmG62vwCuVTR4D9Gbk2lICK9JMT1w8QVOQ1nEZMmA6Vu7ppYt5rKBPEsYaR+nIn4dko2qmxnor3SlNKNxjHM4suQKcGJ4dU0POcbE4XGacwBs7Pvmw3kXxZ2yaoDcDo4RaNmqBKIQDT2M91YhtBVsVTlaEqZGeJ+D4b7T92lI4qH0PTR1qEDf2cwvV44u7PMnlGV1ozIfXKResXr8InSbJ7TT/Z4Dp2wFysp/lDo+0llK5Q== 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=qhUCAHaJyQS0WmRlXnSNm3ihx3rHtNDqy9jzBJIt1pw=; b=QleXevg5WMfxDx7rCoQ8jA/36AbXfQNWukV/Jb5Q58cQbE0r0q0PiZhgBZub0gMsxBzsrK4dIc36T0o99bj0KdnFULxxVEkMaPrtWTq6Kpx52HEFBqwJsWLdT2FVVxSvjFne4ehUNj3nEWkfXuZWGORrZmqLn0g6dCLj+V8lBLWeo7jLNEbJnd3s7ZxAUsIPIb+3/8k9iVg/KdETVNC2x/i3tvX9o4E+Pclm4mA/+mjRLZlDq42r0bxuytKu9667PRLCoZJup7eg8jhcOexLqQEshaZeA5ILuIg6Fa5jtfsQsBm3gU2yLl0MONzuUGuTiJLGv2APo9Q0XfzcbyCLSg== 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=qhUCAHaJyQS0WmRlXnSNm3ihx3rHtNDqy9jzBJIt1pw=; b=Pcd3pD19HRHaVlHQWurU2+wWZyK+ORiPYr4npkZUYUKLr5WNfJrhicfUOOU6ZTTG8IO/Zyp8SVUTynD9gBBYn9d1SPRRcqYsNly1ynPFQaCgW+L8XGW2JshzmIzEoH4P9pC9fA1F9QvyCDBs/n/2Hhre4rmmOrYkxDt/+W74CFULKgsrGdbFG745H8xw8np01X6AhInZHiOM049kYYVjt3GsrY9fQ+sx7VKHh4oSXkesrs6SQxEPR0IzCj+rrS/DQiPyR0jk4bMMiB3apd/4ITFqRrcixC867p5iVinWhDC1EVfeBVpSe9oTStCuIyaY8cMBubqg4FAxzzAyVQUNgg== 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:10 +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:10 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 Oct 2022 22:25:01 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [BMqCYZvYAoUr7Ht45IxJThyEbcLhGjmFuCZ7SFQLbBQ=] 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-1-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: a756a25c-aef4-431a-14f5-08daa8a2085b X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmpXYlgiiriwpqBJSiirmy7KGcnKhdjKPfaFSp+LtJjLvYEset3+K/J7Dm6MvoKNq35uWmQ5M6k3Z+c2Wkl2MEF5b1PKi88V4WAZUZZwxEOQZal9u3afHrsIcIyolc4dXFxz4myC5d3BY5HcnbhxMNHg/asfp0W22SJZzyPrtiCD79iHCt8XbnsrmNEYyKmfe7YuBm2tZ989HmFzLY4On8AqyE1VKBCvLKOM2JUULgDDmq/oYfrPlZHCg2A/OMiGOFqNSiwOjSCEoj6pxiTIvuE/YnvFCvh9lUzWHLcqY29uUs/SzrfXf8D49pHPtCsKdzjvITZhoG0cW9Q7BSGtIFG7VSvLBEPVRARd2Bi4hu+TKVcNatgegZE9iIsOYfhbaT/owAsE5jctmaLjt2LxgEmnAbgIBsqBMjZgd/oWFfOc2tOM+sS4/rnTbFgOGLW39UnsUmwmFdkmb9HZwiLiw7EkWpm7RMuDXleTnYVTp/9fl3+aRmZ/mUaycxdIcvpL6OiDbZa45nS6lFtmftPEU7BCfV4LQ6mcgLW8HaGS8EKXRCpJnIbkXdUMG5fWfkZNZJTFfYD9X4HWo8RIhV84ke0yv4QN+cviA5pBLyUoi3PcV4muonlVAEg4YQM8l7qSTf0Zrm1RFT5iOXdYOt+UEC8pXbRgdSy8Zu1GCgaQ1NZpmL700lsEgpx7a/3IgKsoa5i31YddRerUZZoRGIDJaGPmmjMO3mSKpo0fjyDEcWXDH7PEWJ1HUDFAsZKJVEaJK48= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: R8rWaAj5YzTZTixTdJnXUVVniLKXrwSlqFz4DjOodiGtauYQesnBU5OPIwpY+iOKGRyAtWkOe3BwcKLMabjOG5jxrdZf3btCUFX0Wh/mjNsy6phNbhFAnw0ZGLdqWa6l9fw9HOy4X0tpziCCInsnp7grXGdI0QZIZ3bGBJZmQ0yynzDDAavLf4xLa7mL3VxR8Qo/TI7v+Vhygw60FsWvb3s3zKvtYxtAEW2fFAKhI+VSJZ4DMkMeB3FBfWbo/7JAgNa3BA+g2By9oJKa/XXRlcDKr2TizCWT5IRok0Y/Gqsoa6XlRRm1hmuvuDYSGyQziJWElpMIXmh6g2yKtcMWzPVtfd5Xe7vK7XFwJTlZ5i7VBS7hAKpTn9E0z4PnKClS1AGybm819gGN0D0ItjfO2mFW1ohV2ijHbnVDB/S1Mw4NlIxTNA0tt/Z0/JcgiTlqo/9TcjAkKlz01W3VoccjPfcMxVP8caEjpaI3xAy/bGp5pEjyxuHAkdtDrgAw7B1qTd1NLP2vlacfaCSLwpMq6LdROVHG7LBTTw2AyyY3m+Kznx3clP0UFD8j8xtjzj5H3DLLQSmpNBD6h/h6NspC72uMKMkr3lqIXAH8JgTkp1W8SbW4188kWdm+QdKI/ECYvIecI5aKC5+Cy+LZC34ib8YpeYnruooR2l1RCVELB0llGFC696BSf0pCxcWQDvb7 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Sf8T1nNKhSSZyOKwlDOaz9mOy3ySUncdecZjRnsqVBqU76vGeGSCxMiimnMfPF4r66V3lno0efRu9NP9voOIWsKoLvW82F288w8QMFgHQFvwPqPdQCNrHYkab4O7Q1x+f5Lw3QsBmH5z7aWyq23p2VmeNH/dU/3u5FZFmS4/rBEKF6kDQQvpJGjAaNWcW6fhBswarlaISzoLf1ee+DpeTZHpPhXe+v2UAYZLCX15kyCJEgpmitqXEvrOaPY6vr+nqIYTWg1IuXiuMg/edYkK6TQUscxTCIRjjIwwYb/vI6YgVuw8VMgKZukka1j+RdaqJdG9XlrfHs2TPrIVsZC2+s5mxpFq5NKJErzLmFFmfo+qZ2CVc2yqQ25alWX+2ua1gfkJka7AM/XkR0rj6VvE4xMfDQTrEG/D9D8ZEhfGYOuDdxu9LVp13xOj7ONT5AxXHlrpaToPVHgyXbW//vXB2sXUAm7GJ8w6VMFHH5lfS8HbRPN2RswLgpFw9arpNhJMcJPyZbr+ZfdoNSkGYVYPBNSUkGcwJJN17I5GauiOali9vAZf5PRKROZNuPEvha0MjvP9ugobQGo7FE/c3WlXWi5kd+Q+25f7Cr2i+r7ho4GjCDoXsZGV2g7RSqw7W8MNVR+Sino4T/lTgjKRcJAzrQqaJ2PcRvxGuYTCbpC12VTEq3xkEmXOyJrekfMSnEY13Ymj7bCBqOnccvrag/L0ghnJYcfUw1M0blSXihLMnkYZDju0x4acsg5XcDDjQHY3TAmVUjX4+7R4YMkCEdW+XaRtgc5vtqiBQqsypVPu874mzHelMhjxDt1E80sTZ8ry4EsfaUtkIhHgei8LpzJkMxa4iDMjTjF/ooN0nnDGyfm5Xj5F55aovcjTE2clmUGaDgHOzrB0bxdEW3dn/GGDhqBsHqL4jFXTJzJk2VEGha3L9xNulazqaxL4tU1wPKBdNgif+Nn4bNxKmq+Wln0X+g7dxH9nJxkCsEOP2n29rahR58TdyGmDl+mxGUfoe98SE/52qQ6xD+WLy5howLNiG/xGgXN8n2OTMKj8p9gKWFwwrKqJlXGGRwTSLtY9qCLwPgFrSK27EEnlP8k+x9wfg2vLB3CEtybz10OHxVZK90pb6gt4Qm0KwIX6kJj6ebjgC9BZ7QxTtEWi36JysETMYO1eKw0CeUqhmxZd5jshJjJu+3leZbFH2XZd/m/jLxtAqiLoDnEtHzH+M2+3cB94vIc7uT/Mv3kfhh5tROL6l0R4K65hpHx2x2ebPVCEg5qRBCQ5+y/K51yMcZ58ARJ+Cv7csIr6IJ+CEbWs0jYlMUo= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a756a25c-aef4-431a-14f5-08daa8a2085b 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:10.6576 (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 2/9] avcodec/opusenc_psy: Remove unused function parameter 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: jFboxcYlVbRG Signed-off-by: Andreas Rheinhardt --- libavcodec/opusenc.c | 2 +- libavcodec/opusenc_psy.c | 2 +- libavcodec/opusenc_psy.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/opusenc.c b/libavcodec/opusenc.c index 7695e95884..280425c74f 100644 --- a/libavcodec/opusenc.c +++ b/libavcodec/opusenc.c @@ -594,7 +594,7 @@ static int opus_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, opus_packet_assembler(s, avpkt); /* Update the psychoacoustic system */ - ff_opus_psy_postencode_update(&s->psyctx, s->frame, s->rc); + ff_opus_psy_postencode_update(&s->psyctx, s->frame); /* Remove samples from queue and skip if needed */ ff_af_queue_remove(&s->afq, s->packet.frames*frame_size, &avpkt->pts, &avpkt->duration); diff --git a/libavcodec/opusenc_psy.c b/libavcodec/opusenc_psy.c index 9b11651dbe..94c37fb8b1 100644 --- a/libavcodec/opusenc_psy.c +++ b/libavcodec/opusenc_psy.c @@ -479,7 +479,7 @@ int ff_opus_psy_celt_frame_process(OpusPsyContext *s, CeltFrame *f, int index) return 0; } -void ff_opus_psy_postencode_update(OpusPsyContext *s, CeltFrame *f, OpusRangeCoder *rc) +void ff_opus_psy_postencode_update(OpusPsyContext *s, CeltFrame *f) { int i, frame_size = OPUS_BLOCK_SIZE(s->p.framesize); int steps_out = s->p.frames*(frame_size/120); diff --git a/libavcodec/opusenc_psy.h b/libavcodec/opusenc_psy.h index 67e96b2fa5..ee58b0cdf9 100644 --- a/libavcodec/opusenc_psy.h +++ b/libavcodec/opusenc_psy.h @@ -98,7 +98,7 @@ typedef struct OpusPsyContext { int ff_opus_psy_process (OpusPsyContext *s, OpusPacketInfo *p); void ff_opus_psy_celt_frame_init (OpusPsyContext *s, CeltFrame *f, int index); int ff_opus_psy_celt_frame_process(OpusPsyContext *s, CeltFrame *f, int index); -void ff_opus_psy_postencode_update (OpusPsyContext *s, CeltFrame *f, OpusRangeCoder *rc); +void ff_opus_psy_postencode_update (OpusPsyContext *s, CeltFrame *f); int ff_opus_psy_init(OpusPsyContext *s, AVCodecContext *avctx, struct FFBufQueue *bufqueue, OpusEncOptions *options);