From patchwork Thu Jun 30 22:29:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36563 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp620652pzh; Thu, 30 Jun 2022 15:31:06 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uqZB50w5P27+NYyglatQJXpxMTXahWrYF0hXgw+OeUrIEDQq/vvM+l4OwC33yISI0uJdYv X-Received: by 2002:a17:906:2001:b0:6f3:bd7f:d878 with SMTP id 1-20020a170906200100b006f3bd7fd878mr10814898ejo.133.1656628266310; Thu, 30 Jun 2022 15:31:06 -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 q20-20020a056402519400b0043762bdbbfbsi21699227edd.621.2022.06.30.15.31.06; Thu, 30 Jun 2022 15:31:06 -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=L4lZsRok; 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 D718C68B7D5; Fri, 1 Jul 2022 01:30:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2046.outbound.protection.outlook.com [40.92.91.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CE29668B7B5 for ; Fri, 1 Jul 2022 01:30:42 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mVsVmHk02xVH3MuGFjv7kWwI42OcXp3KoIk7I/fq4riJG7e8M7LkDNtGKr2M2u/KDFOfjkKlRGeP5h9xIEgqiTFb1hnF+g/s7a6M2yr8flfnFBO38RAQMDBS02CrO95oPCmR+wtXlMsjYQj/SokGYrCXzOnuIzxw86jAe5HSLLJFpCKcOQ+51Kx48/XDj49XA4RC8fhmIPRspLhnVrfpr8hoG4LhrBv+2spMhHZyr/3dQMNU+jCXz7Ce2JGwtx083CKMUw5JCdQMa0r+4mVViS/BKFxis2ABCHhH+9SA0khh7EAUH8eRSaq/yXF/FvMrNOzcVreZUBF++bal7Zj0Uw== 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=o0calZ9h9ub7AotYy+Bgraalk8VH85f9EiVw5BBXYDY=; b=LFXP7mDknDhJN2qGuUIOEMN4iVh+92u3JHoGynxIwW/B1m95WlYZQGdUk8sOP3v1DTKYv558Y42NLGEr3+7OI4bOaoIXKZxY0TCJVTJbq6Zrgq7UCq+hdzUGIb9ohkmCmIb9IVUk0Cfg7zsGhBqR3nED84qCTL2aMrD69kreeEMfBmWSUfTwz22Bmyc5zXHAfijAmwN3NsPcdq0skXLDb4UksYS3uR7nQxY52VdOU1xE3GiHjz6Z2SenrdIiEtkA9Nyo0qKK0w1DcIoUTz3EPN08g5EDdjcbnMYdOtsAJn7nUQLCkht3ibcEO0SHyzkI44FPg2gmUlwPZbuTRYbftw== 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=o0calZ9h9ub7AotYy+Bgraalk8VH85f9EiVw5BBXYDY=; b=L4lZsRoky85zh1xKy0PVSGYkBPSwrIgGA0yVhN/UEI8Q6xa8VH8mkl9/Ldj+8U0utHh4obEO8+a7Zzl4kv7/PW5UraCYi9V1VJaLgqvKTsGf+7PPTnE9O0V5DI3n8OG34Ff5k8xun8RKmC1cpuvW0V1Gf2CRcwjIAchYXNDhkwY6JKqQJ1Bm5WsWqg2xoHWWbRxiAy6T3E+WUze3jtj2kF47JH5ZMKS0cIfkb5+dC3a9j+qzvIyxQ4zl2tdfCEwzqwhiS4WF4OaS5nAcVnHCLfktpKXrGRXZI/HaRq8lMtJlhK4+YQaD45QDYw6hD1UG8JJhhcHaxTQytD7dyKqbng== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DB3PR0102MB3546.eurprd01.prod.exchangelabs.com (2603:10a6:8:d::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.15; Thu, 30 Jun 2022 22:30:37 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c%10]) with mapi id 15.20.5373.018; Thu, 30 Jun 2022 22:30:37 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Jul 2022 00:29:37 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [e3IH7DfzmQKJ/fNtH2XxUUpquFiWhGv+] X-ClientProxiedBy: FR0P281CA0099.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a9::17) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220630222949.1758625-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a6d0e641-848a-4072-891e-08da5ae827c7 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiSAA+E0K/sYrHNnfsWcYQJjxwqDAuEhyyy+JUiT3z0bVYkY9tWBBjMj1qrIwm88b9FoZRG/v7OjRpe29BMrWjNKmG0DOxvPY0+gJ4frNXw5KjxnNhGArFX/LXfFa8zA0G/rJZCyutmK+/egoFQh/Vt+eNpz4sCOLuw90IpzCv8BWZofaWEIPzMmlRUgkD23kgqvBRweLOG+2K+MYJW3Efv9tBY94OzWYXLmrPV/L8U1yPJoPyTqNzeUOLAoCxKuHcVIYMmD/JwVE0fS2MIHx3+L4dHTsg1194Ymin/5pbPihtWjg1yZ6OBCtq/Redmi9Bh0dAgp+uRPBMC8nAIkgXyYv62SG/jASMYjOHo7bbpLVIvw7oNq6bAf2qh9GtFxHNcHHkBlRdcgOwf/3epRwSBQXHeEzfnIfu+o+u+x73SCsXf9+o3AVXG3Dc82es5f7saVX4DzK+dWb/rh3jV3ym7ZUE2epev9puMLotFtSULQomk/01X1FO7J6SBoDI+kJNoEnNIrJpury3tMTpe1vlHudUaCsfQ0hkHzTo6EzGXfn8KAjBHhh+cTyli1xvhyAQt9CCz57r+/SBw4jOtkilQd7SR1aTplToww6zz0cEldQip/mxYSN151b4gkF51ehNSlvt4aBF7Ux4qHAJolAgRX+EXNqLC3fQLifsgqITf/TDa9VbiRI03WFdKYVzfWgubuoMVBR4ggRviWwzQhakd3CI0IPktvyIHz+RPYdQq282sfvVZUHWf6Hz54nu0zpoI= X-MS-TrafficTypeDiagnostic: DB3PR0102MB3546:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: p5B+lKD+ricbmWnfJJ2C8RLgP3ePqr132zOWyCXP29cEat7ckBsND0ZXwDa6XGTMlP1CuJJVDBKenuL1Y1RQTdNQEbWMLIPSF8nj5YYaGXgvlCMx1M5ffNORiCy7oWZF2cmBo0G8lDZtGN6jinaYFrOuQJgYCaKEw1fmRb1cFP2he5qrGgntb3a2XHkmwEW9b17EXs0S48x4hxscL1rU6noi4UjvLIkNDWnoeMzEEYnireVqUnmyydMDTJBLZv24ua67qIeDAOWjzoe5KmyPEdb6qqWVX1e6EcEw7oK7Z+oZolyG85bkam37lhukQTZNkFGDObbNC8Q471PR9OV62JQuJL4VkNI+Pj4B8KD1jO9opG39vu5nQ8CUSaeLW3U6rgYoKXkUNBEXsHCYugxZeN2vvGQKBBzAySz6SbyaWGYFqwnEOVCRCshRvKzqOSK6y/Xb8GUeHrcsv8nFE3pJVin13UVQmaCfpyV2SH7sra363irVlrH9d8pGkLaCxW4/Mss1CMlIsryvbckJ1J/XwYLeOKTuh/NrYUMbIDf6CAmMD7MGLRcMg7OOUZSf7Jjq7SufI1vr6zjhsg/eh8dCIUQGK++Wl4WXj/rkhQZ3qGzqN8zBXBffjXx09W77j5liAQyjKVXsQh5suOGoKHSAk4453LFqetMsHHVZP7BUxx5iW2t6ImATz/dxejHQ6EhJGfhRMshiAG1ZhvN70/XMFA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: zrSCdtuXQ1pExJzs2I7o2mGI85eHuZM/5x53IdLPNLpZoNUMeMUSU2F/x+4+ojcVhh35LzpOZQPYdHmBADvnnv0ff/7r/QNKFNaFLtEVkX5O3xIiYk8K2+BnaNR+D2aghfTOy366U9hg+Iwh0azyP3mFo6VBNnBg+v3QyR0BLp1UBSh7tDXUFs42OiL0QC4qPlCvBrHvVfw3iyCEKTqhwK3j4NDtO1pQN6VmqXArR2m38SUl7Qr6gci6ehdZChVYn2S70X9eq6Dfg0yFraL/VMq0daahTMlDsjdwegUphoWGrDxVvJGYsvhupAaE0sdusJ1SMJAeOxj74P12aBKPCEa8xv02YccP4dPy7tLmKb299TomqvimMTDY5wCxd4ncqbJIfmbAfY/nh+KZqIihUN/zX/7nOQoLNnMsKevBm+EfwyyFF1ULR02X4sO0x6X+XLjdE0IqoMBg+41gfVm0gXNWEVA5yebPDFlQmIGh/ObAb6HdhmCQmqIgSnsxcMu2Cxkehk2fEGZ1YapT5t848e6uaVatsXpbGoY55rpR8ztFZzrOfVyVCMEbQQLrtea0w4s3dD9D5YFaZkAs9c9O91JVE+t0ffVy/k9+JtGmgwQwfB0smXfAsVqgiAsjPvRIkTcwL7fNXkYe7iT0MdmYDE2OfZiY/PufBarufoYc1uXuYZs7UwdK8HpgR1l5bN93XYBvwBfGLNNtk9z+tmi29mI9Rct0N9fTsBdsT0SrZZLq/9x/1ylsvWU1t0MMXfkJIvH271JiN4O/+7ARGTFCZQIQAdGUBSgMhpJGFanBEcxXOWny7aOj5p4ky+3GN26C1n0WoJ/4+0RXNNa5jyW34N1lBUlZ0pW0fXm2iU3wfV/AEQe2Kuw7BoOBPO5GsHvyfPc2Z3vz85WfN7M9rE2hY9lEnJczqKBOwknEnmtamuYPqSqQ5zrRh3s8NY8/pH7obi2BahKg0I07YQGf4bIjUtrLeOG7VoNAi6pQviXK0irUD4GjzstTX++wfsSUAmtQwX9qTD7aENhGTybGBLAjChErUJQ5A3I9bs2u4BkxCl0IFy6VVKfEn11xZTPXHirLyEtReh7gSr/cNdZ2WiU7muA3Jy5uGkCDIXobu2eiK6VF9tNbXEpn+Tdi8Eiv74JOmbpV9YByp02QG/bWo8cIJ9SQwxq+2yNN3QqyxWeuRsLkqsRKLWabCEHKmSocqQ7Mh2h4J0KzwyCRljtfzLy+kwcniD7lGR3jJFz38GrcHABweDeEtYhmHijKIzrC2BORMJJ2P3sqHQNktQ8/3b7gpw5XqABmWqMNvod++LKNPlw= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a6d0e641-848a-4072-891e-08da5ae827c7 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jun 2022 22:30:37.5147 (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: DB3PR0102MB3546 Subject: [FFmpeg-devel] [PATCH 06/18] avcodec/hevc_cabac: Don't cast const away unnecessarily 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: CYBs0B5PpvBN Signed-off-by: Andreas Rheinhardt --- libavcodec/hevc_cabac.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/hevc_cabac.c b/libavcodec/hevc_cabac.c index 9b8c8e342d..a194f8a02a 100644 --- a/libavcodec/hevc_cabac.c +++ b/libavcodec/hevc_cabac.c @@ -1282,7 +1282,7 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, int scf_offset = 0; if (s->ps.sps->transform_skip_context_enabled_flag && (transform_skip_flag || lc->cu.cu_transquant_bypass_flag)) { - ctx_idx_map_p = (uint8_t*) &ctx_idx_map[4 * 16]; + ctx_idx_map_p = &ctx_idx_map[4 * 16]; if (c_idx == 0) { scf_offset = 40; } else { @@ -1292,9 +1292,9 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, if (c_idx != 0) scf_offset = 27; if (log2_trafo_size == 2) { - ctx_idx_map_p = (uint8_t*) &ctx_idx_map[0]; + ctx_idx_map_p = &ctx_idx_map[0]; } else { - ctx_idx_map_p = (uint8_t*) &ctx_idx_map[(prev_sig + 1) << 4]; + ctx_idx_map_p = &ctx_idx_map[(prev_sig + 1) << 4]; if (c_idx == 0) { if ((x_cg > 0 || y_cg > 0)) scf_offset += 3;