From patchwork Fri Oct 28 14:48:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 39031 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:85a8:b0:a2:d5a7:ad9d with SMTP id s40csp835601pzd; Fri, 28 Oct 2022 07:48:19 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6eGxQwFyfCbhnoJ4AX0CeZKA2ah6RyaVyRqc1uHdpBvywBXfXeYZ8Hmqm0JUO7/6KNhwFS X-Received: by 2002:a17:907:2c74:b0:7a1:d333:f214 with SMTP id ib20-20020a1709072c7400b007a1d333f214mr29828944ejc.14.1666968499437; Fri, 28 Oct 2022 07:48:19 -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 u23-20020aa7d997000000b00461c8f80e34si4329096eds.53.2022.10.28.07.48.16; Fri, 28 Oct 2022 07:48:19 -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=I5jJjSDO; 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 34BAF68BCF5; Fri, 28 Oct 2022 17:48:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2038.outbound.protection.outlook.com [40.92.89.38]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E92E668BC1A for ; Fri, 28 Oct 2022 17:48:06 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=d9a41+CUaeWk4+G7J70Y96WO8vvBvkyt/BRzgDm+nlwi+N4ZChEkTqU5G6jVFXvrRoCQdpq9EhnK1vfiq3dSZxcTQcfa9thrCxCFH7EMvm/4yPUp9yNY7q2vl153sf6GFRV4l65h4xPhD5GPgH7m8qkofTo3sxAabsTrNbk6vK4LFUmI9EQVUHZ5iTW2XWo/a6Sn5Ol1+Q3SDTJYN6uWnBxYsgaKCmfbRLKOM0mbnZQ8bgrjuC1IUbDSlFivv3/DaeT4JR59bP54HduJzSWYNLV+3Nd0rTxCSqmpCO0erJxyMxNk2ZXl5ZMcDGV3gYHm8lc3Vn4wxkzZZzRT7dMB2Q== 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=mxeEXncAD2i6U74JJWw30jnM8WdPqT7uNNMyviSAGw4=; b=HHRXJISaSroYDOZcrtPEnyg/IHK0Zp9ZSOb2injNVbOX8maAIZSNZUUCaF+dAzY3UU/IE2ZOZrwC/0Ckvjd7Cqq02SKKSyHCMSZ6foolDCn7jH+jp4XwNhA8ks6lY0sqFjochyLR88B/WgBK1V2iyi8p1PHS1y8eY50hoAJrFlflE0IxS3MF9KCKAagiVLW/XD1cP5oIr9Fpqm+3mXYTdjnV0/H4Iib5BasHTofhJukDz1Kvl3RLmiSYxzZP+xAoW/q9tRntku9VHBqVBGbJEo9HtcBbauyCzwi127RssR6Q3h/mE4O3m1/03CFtLogLaq1nmS/GhZZwTINQ3sdM5g== 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=mxeEXncAD2i6U74JJWw30jnM8WdPqT7uNNMyviSAGw4=; b=I5jJjSDOiYK8e4c8H1Cthi96HgxRuTWHQ8xjwdvs2Th2bnEsKSgIc6EOxcjS37puqtDkQEQ2cN+ZQUqPNRtkKnChrIc87bq48PjZ5y/zOga2jtKGnnIGLsRzZye5SKwki26aUO5rzYb2ziTzl9WOy1o6nEhl6bq3bFdxWbWaGZHpp0k0GHkni0rpXV7YMqIqkn/8oHd8FWSQEC36ev+CUXkKVqOhr+t0fZiZvTVsDeWDKtoCBI/EDCw2rUjPg+UCUzCu3u74VkOLxIiWreE2uFIryxbTklY+WmHEmZhSZxDehV+BYoPx7S/R20ailI0y7svxFOABDhgyHG/glsiJAA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DB4P250MB0982.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:3f6::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.23; Fri, 28 Oct 2022 14:48:04 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe%9]) with mapi id 15.20.5709.015; Fri, 28 Oct 2022 14:48:04 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 28 Oct 2022 16:48:05 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [yiS+W25iS/akY2LtgLSoUOUlRZuZA9W35MkD88tvTkI=] X-ClientProxiedBy: AS9PR07CA0050.eurprd07.prod.outlook.com (2603:10a6:20b:46b::8) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221028144810.1518205-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DB4P250MB0982:EE_ X-MS-Office365-Filtering-Correlation-Id: d0ab5e6c-0545-464b-0955-08dab8f36b7f X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmponRFq0U3/v5vCEJI3BD4xNG7rsFxdXAaU+kTYAU9QZMESJd1OZpRmzr54zloiv89TazEuMrMqSYwtVFc+OHwvrr9Q7rJSNb4XDKV7uqT8f2D737ngxLGq/0sOVIv5F40HGZrYBL1DWXHYbw0MBaGlPudZZOVq+V2QxtYmyPwcpE/WhoSpfw0n2IGLckK2T5f4AYyd3/woqfe8knuvZhUlm+N4hNAGR7xnsWSKOavebD1G+mjf4GVQyZS3XdJRgsmmlkdlR2IPrAQt1VVWzhk0EwhEExUls+DrQDN7a6eUod6h4bTKYzCyIadkhPJgPFtVkpjOd/Y48dSCddYw+b0V1smRy3YLL4Ag84BhbjqSQKgav/EusYRak2DM9Tu+WU/Yf6T6YZ3ULRJkTm+LDepggRSeVRNrk2+Q4y9kIkPeFuinPbfDvKLUIb0SUpX7uZ1i8Coz4pGQtDR12hFVFrdikfSI0aQsOXbbstWQyLgUoxbZXCaY0kvfF65LqtvcSqq6Aky1rP7h+lShrWPEVHCQ49ccrdB7o3E0rypy7DQzvV3M+LT+kcESL4tbjCSlKS43qCQmkmg9vXLdFNq2Nqdbf+Fv0bAqGUQrYLSmyweKdGDDPnf12uKf0wE6R7pPB9GCtgxqrRWDrPbdK9hdNGHTQsmwSQ0OcxP7VseBAnKCXyXoXC1xAYXjmElW7TTQQQWrfvsvMx1HNE2zJQcN9eoorhgWYFjcQIlJB29wt8hcXdJG6oUdIsiQNFsZQInahc4= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TZgV9tCBJ5uPW9DVbHXzbgD0M++AVYl7RV+n7hVmz5ObYI16PQ/dCw0321sosozXwJ+343lV+9OmydIAPHBZyME+38/kRdbgWPUiHRMjEqG9csBzIuOqHm49CVkSkudHWpTuETlISpwxrNxDDvUEZkpQ50CoLVmFMJ2yPEJsxrzjnjZYnCjC29GmYTgYrQRuK3VMokVHhHGh4oF4esym/9R5jMCdd3bTKWwWaXXFFU4T/7PFTaB0OI7KNLyTYUxIA5o18enDt0ad6IvuLr/uRXc47Mq3DkR12SgOts1ZZXWPH6bg5gDkakO4Ehracq3VUTewYpgL7/nhmgLGdRC2JqXl+rbVJ4fdKKtsAWRENLx2T86L9h/4lL4NO3Zg0QmBHfIZeNsCXftKVPyU309r5uL4a1FeFsAMdVeGlf9/1JXw/aPtfRQkQpu8T3BU+xFWaozvTictdDttfRyVwcgupbUSjp/YkZcOmcGOFvVwNClzY+ILMK8JnL3lyGkIanCPD+Ljrj/3/SeL3lBCovUimHb5Gzjn8MGxfTY78QAc3N7MSFC81BsyYlVWIGXrrofph1mpvkSAt2y/i3U5owPmqCDfTQIm98+B/hZbr+pPoUCCDqZt1gH+hbl9Bm0ZzrodypfZdN65Fq2wJeiedxS+gPVVmMzo8O46ls6vSe1JY4fXC3H3lj/y57R8g4a0xCMg X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7Ak5/FqI5dyA6SVxychsldErr0S0xN7XFq30vPNx7coNH2eaaWQd7zRihZgkOEU+5CqL4xFO/kaAM+TsqDeihdL5pT9zGH1r/7JUKxTYoSHFhg7N9+uAv89jKLqQDybr/KScSv9psEYG2UUT70/BS6GwNIHj78kHNO8m3sASf3prlV61z5lD4XnEwSBEoxwupjyh8nJFZ8tICpz2GxLkrhsIRTh/GvGde779XG916zy5r8AQFU9xDCgYgcTC7wvVS3Zru7dI7VMxK0W7C93XWLvLa/n77EpcwjTbJxSgeT8JPjUSRunuLVLt6D6olWqQ0Olou+qwEmJWnOCHmqqPBWjetgJ/TYtC4CfMNgbJkEyn2borDUdMieMaADvzq2LSBx78sXYSNQWXFFKg8C9SD7TOkQxOx+5EresInpENAjrinCs6YQssz7/+NCu1ybZwNDircVsuECsSQhL9ykNnm2vJYJUyCJiDcWyza03HeeZhmrxH7gHUbAYHoSfI3XZlf796zii7yXB2ravJ2Y/kL4Tbs79DVmeeX/fTxoan6VSXqGLT6KzPovVQDfxi5OezTGWMRrfyhPeEKA0GDEQrLvpFxjNOkD5Ku/d5SL064Y9cYrcwtAXszBnV924RSB8REeJSbAFF32WX8nuv4HVdq7V9KMVp/phqOZQJOFeMjnt4uvKoGrAbnXfI8+AhcIy/lhfK4lWVFpn7Qqj86odXQ4KimyCeoQasM2kNy8MjX8Qo4EyrIG9o1Bg2UAIhFc+qBAHvmazLJrVU7V6zonXJ5mGcIlVMkfTNd9ZWQEiHMrnZ30/EkLk6JuP9+i143NiImZhiwbzFsCifurvhjRC7tZY8Px+eqgGWnLwwxpI0ZRFTksWRLjrHCr8CrJXGrrHiIYe+cRqtZMytpzstmo9UUl9j+qc4h+G1K9DtluljrJCLut3i8VbWm4xCDaiskKN2asgAJ6e545NC2ySeKrj+yRZtGgnAt3TG9ME5WFopR8rPKWAjyeGsJoDhtdW1Yynx9/vXOMtQ+USXf/cOmCY94Oz5VJkUQnkOOfQ6jpwsIFZrvK4HTw2bb7XICJxaFuCgtwfxLXLKLrVq3qDOHuz5FThEik21/Pl0X0pv2XAO/mIuSY74S2YvyBImLNkQbOr63sFXyPF4lrGIaCyqnGG88plw0kTYqEs8iNa1xDEM9In6nb/NQoqR4jbPhpU8rcsGu0n6ziqHjBD+fb+dJS3oq7MgEltEHKsJd4ZRY7H6LxfTeM181wjDA329SJHCLBnOl8GWW5wpYBE6AUO3K4XIonHj4aHoaeGn0Fupuxu9q0R/sH9v5Gz5XyT1lh/9Vpwl X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d0ab5e6c-0545-464b-0955-08dab8f36b7f X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Oct 2022 14:48:04.8428 (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: DB4P250MB0982 Subject: [FFmpeg-devel] [PATCH 1/6] avcodec/mpegvideodata: Make DC scale tables smaller 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: G0Lp0285acy+ These tables are only accessed in ff_set_qscale() which only accesses values 1..31 as well as in encode_picture() in mpegvideo_enc.c, accessing the value with index 8. So make these tables smaller. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideodata.c | 32 ++++---------------------------- libavcodec/mpegvideodata.h | 2 +- 2 files changed, 5 insertions(+), 29 deletions(-) diff --git a/libavcodec/mpegvideodata.c b/libavcodec/mpegvideodata.c index da0638e052..b98e90cf43 100644 --- a/libavcodec/mpegvideodata.c +++ b/libavcodec/mpegvideodata.c @@ -30,46 +30,22 @@ const uint8_t ff_mpeg2_non_linear_qscale[32] = { 56, 64, 72, 80, 88, 96, 104, 112, }; -const uint8_t ff_mpeg1_dc_scale_table[128] = { - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, - 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, +const uint8_t ff_mpeg1_dc_scale_table[32] = { 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, }; -static const uint8_t mpeg2_dc_scale_table1[128] = { - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, +static const uint8_t mpeg2_dc_scale_table1[32] = { 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, }; -static const uint8_t mpeg2_dc_scale_table2[128] = { - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, +static const uint8_t mpeg2_dc_scale_table2[32] = { 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, }; -static const uint8_t mpeg2_dc_scale_table3[128] = { - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, +static const uint8_t mpeg2_dc_scale_table3[32] = { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, }; diff --git a/libavcodec/mpegvideodata.h b/libavcodec/mpegvideodata.h index 14f4806d66..cf783ef31c 100644 --- a/libavcodec/mpegvideodata.h +++ b/libavcodec/mpegvideodata.h @@ -25,7 +25,7 @@ extern const uint8_t ff_alternate_horizontal_scan[64]; extern const uint8_t ff_alternate_vertical_scan[64]; -extern const uint8_t ff_mpeg1_dc_scale_table[128]; +extern const uint8_t ff_mpeg1_dc_scale_table[32]; extern const uint8_t * const ff_mpeg2_dc_scale_table[4]; extern const uint8_t ff_mpeg2_non_linear_qscale[32]; From patchwork Fri Oct 28 14:49:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 39032 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:85a8:b0:a2:d5a7:ad9d with SMTP id s40csp836334pzd; Fri, 28 Oct 2022 07:49:52 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6bIDtdMLjp/lg468wOXXN09fNoa0cdDtbtBdNcgMU6d0kDOzy+Nwb9Ovp59LCZ1Dyxx8lo X-Received: by 2002:a17:906:eeca:b0:730:6880:c398 with SMTP id wu10-20020a170906eeca00b007306880c398mr47716454ejb.706.1666968592690; Fri, 28 Oct 2022 07:49:52 -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 i20-20020a508714000000b00461b84a010fsi4452219edb.295.2022.10.28.07.49.51; Fri, 28 Oct 2022 07:49:52 -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=P+6SthKH; 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 7610168BC88; Fri, 28 Oct 2022 17:49:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2028.outbound.protection.outlook.com [40.92.90.28]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0271F68BC88 for ; Fri, 28 Oct 2022 17:49:43 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fPkAg+0pAjVEwyxFxABMnCosJDY8lCHur0hcGRcE7k9vpbVZcfh7q0xh9eoCZ/oyo2mVcpoPjCfU5i+Sia1jmwcJCPeDUrQ+VUFVpu3ZIzzFi+5JyKXP9xQICGlZ0Ny7fYZXJdlEtD2ew0/FXWFgWNPry7yAoGjHHx7HJ+sagAfNoB5EwJGNie2VC7lFHXq8V0yJWPEncJWms3p+IXzPcms4FKfZ2Lox4VOz6a61/hczKxShJiTiIwtIPhcC8ozSw/EGvNq8ywgc2gcOkd7/w/TSTD81N9nbwD8O1fszufJT/qRz9PdLJDmyL2nzX38bKMKqJpJvGWPrOrjFu07T8g== 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=u2264SEc9W2NmVI56StcJNmzPl5gdK5LFZ1TCH43Ff8=; b=Ny/V5+9SmOxx/Br45sVsOCrLcnnO8TAkex0qz8QEkhFc2f+BP2yoMf5WZFM2dv5sSPOjFkDgBGkTcNVmpTwKPJqYJlx5EVwMOvDtWp6cP8Zl7WzrdsNJZRACdvE3plDpMWgIXceJJ9u+N5rZS8XkYdEsHuZmsChoJjV95LoN09X/eyYsydwXRvlqnM5qWjz4nxTmMWJpvO11XXGHxkJIFO3WkBgdXyECM7QWH+ZcXanc79cox3C9XEtqOnTbAl7yWXcxnSRBonF/1GEyfxCrKOV0ylo/pxCsjGAvde124zor9bRamZ2lzhugAPkwiPb4Q75TBTdoWOTapsZsFysfuQ== 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=u2264SEc9W2NmVI56StcJNmzPl5gdK5LFZ1TCH43Ff8=; b=P+6SthKHdfLEyGo3aNN0SaPe0jas2HU5cuObvYkuEGxvKEEp56IBj5tz+aeRaIh98Aox5bU05/3YaDh9it4NtYyIlxOrUNQuDY2oua9km5NWeUDgykeNAMgwI4LJMzI9QGoGvb3DrBs5Iw0oTtCxUdnUn3augc4haoDgUvj3HRyx7klHe55ouWPZKjhDBKnXSim8ewswFDETuPCQuJ1+GFDGhC92cV6NSFnrLO5KOBTHjauzbO5RAaJepb2bOtAldmlw0Y0CVVSg0JcnaWdLMwvp0Zo5qJCZYtMRxCQLx8rHvexmOexFJ6O8CZ90ikjkervvRTsUsHAcpoIKUAo+Yw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0289.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17c::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5769.15; Fri, 28 Oct 2022 14:49:41 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe%9]) with mapi id 15.20.5709.015; Fri, 28 Oct 2022 14:49:41 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 28 Oct 2022 16:49:42 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [O1cNZ9NbvF3eBUCkIPtvpmGbuwG9vNxKYpVmKGd9sZo=] X-ClientProxiedBy: AM7PR04CA0001.eurprd04.prod.outlook.com (2603:10a6:20b:110::11) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221028144946.1518249-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0289:EE_ X-MS-Office365-Filtering-Correlation-Id: 3b83b613-9763-45ee-5564-08dab8f3a4df X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmponRFq0U3/v5vCEJI3BD4xIorDB51vGZdXEvAUEGPcRzZFNn9DZ/C9F78VuQfTKRJkqlH3x8SNqmzr0akbfirliteJelA9gO4TILq8JaKBsGWtYs1ZX7N7bsunAg6j2EF3sn8g/8Q2Xym39AST22JXt92tTut4IVAwjqcmy1BjD08EMMVzHtp230S9TA1NQzXPYjBjAfx9Qkn3CvEJIZEDj5f08XDi30FwzYru9qA/rw5BeZiFa6vvSPVURPO+8p6pZ6fLzcTAFuvBro+cS85qn4Wi1qJHUut1otwW2CyLnPiWeeGzm+pHqvsJDfLza3+F7pN4i/dfeeV2k0sS6KpKhTAnx8p5RNn0btzp6bvxtUWOfw+99eBktRJ4hjAm7LwnsrZoKwEpzGmqcG9qmDNJu2+dtVCYtjliXAFyl29PoVt+paTXllRj4nxkAafgNkbHv512CEPM9CrFHvP78JeXuieZI/iGBOY10hJIoRy5M01/yM+J831iXnOO5ml9Vblu0KKApjwHvFy1QbB9fGpRnjMITl/DeYlrmeJnOJspaBYhpnoBh5KKIkRGzOxRoHFi+Ti7Yp4a8ZBWE8gAp2c88kobMa0LB1KMXpD0IoR6iTbTViCE7BaIj5P7YHgbiclDa0L9TV4H+roUFDsj+h1Zq0/v/rlbup58bcHH8j/Hj+OqMnc3jhUk0ZRA+0yCfXfYYgj3Blmj2aEGYWqe2oac3VeuaN280xGqi8hcmzHRmQV4cAQAHC1GpZA6f76dxdY= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WK3Pf8+Z8BHRZHbIjc0JM5hbyrHskes/qPH9uZVGNUbB3e0Xnv1L94BujgIvH9qtCquEv4FbTInaP8Bcf5nErdY1Ry6ZGTzsRgz7WOG4wkEdRpKF6EJ5L7BHDInOeI3YM12NkxzwWKmsdDP7BDR4cyGewp5HwzrWGd3WVNI41XDXMSzY8Q2HaO5fowz0mx68UsIVydMWHAWb6OBJ378Khi6BzNe/FZKLsw+6RlweALpaQ9zTMyZq1uy70LjX/tzHrJsfGCKDDtD8/TcN4uetTnVwnM/tGKSbVhKib+BtxesHsBHJFvczKmUmtztMUsFiSE8xqrN4uhfwyuIGM334uVZlJskz3x2cmHKn94vglxul9TdoyPfdgKPq3K4keWJjx9JBeRNEe2lLj6EkpBbMEUI2jrMKyn+S5V4MKvg43FDcU+O2kVfXeTuW+A+QiqUwlE/GSeIashUpKMgpiCuKolwn1q2MFFrfrzbx7dKdoR9ETkK1V4d0ZBWEIniHRCcOkYNDL3H2XNAL1FN8pMcTiY1eQEgPOJm3lkmuST1BltjOXQ6nON4rKQJG7/nPEjKlnBVALAo626h9N7qyDV9StdPaA4zQnB1fvnrH0D7u6XDrdvNPRZWBRBHeO9Gf95W2QY26YIuqcHo5ZqFHxRV6yYGauixpnY1c/QbocfHORrua2vqkEzKgTh7xZk2rgeFn X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: fT2XOE/RanA9tEW6P37lvNhcBFa+wwxacC8hZqWy8YgL0GPy0aLY7liISnTpJykiNGgu/ZZ0F82jjD5fGAB4HGz94gg5qN5tDJFFXI/Pndd1BHZDcs2TMTIfF5TZ2x816pCleVDVQKC3YmFPBKcpXzhY6SYV49zmOn65VL5qX7XRVgKbKSj+9noiT23uP6DX0obSRpffBvm7KjlM2SX3pRf1flvGw56cyenQT0JfQjtbR8mdZcArlFeUqTC7NZ+dvt0E4Z3n8sLsOdt82L6zntkusw7/vOd1VacC2PNG9oTTT9ufnGaQ9jlLHBZyYzUyVoF23LAU46eNEw7s/5MsuUfX3x3zni7AlKI+cP7EZ4n8G3eO33HXFA0rSFmKioO7oqXcGfzqgPysJcLAHIrDoBpuS1uBj53JFUYBQPzDQebrx9e6Nvg1SL3Jo2aw5IABrR19nOswpx6pddULU8w2wNi+zxvvkOC1nNg5Hrkop27OVE+s7ywXOgzuiBqRgkSzoV2a8BmFNOFYhF5KM+eVOBKmobcFQEjmNImcG93vtIIqlNGceldYAUbqJBMGpazqFp4qa7735F7YQEq5yxUtuZVwuS1IszZ9MtulTu13P/PFZvtprMRcHR1mzAjSntXMV+V8yCBQ/ECWzknC0gDoRRAI53C3Kydv7Oo5USLFVNh57mmlw23oXX6Gbk6B9Bwbkuu2Gsz7iTO/i04otxUilbtBpkq/NqCIIyMjd0g8rhRfdcKKUDxIrn66HMI2LWcYeEZ2ogoktc0RrVDrrhaXajaTa9sEEGD15+JuluyWYk1xvVvRltNgtsrWFiRF/q7q9qMWEHoWxD/LgJ87n30E/s8Gic0PZKyzNOJzzTbyY9bBXqO4KVUlp4OuW9PoYLiMhrUynax8peY3xU9XEQIcNi5aeAWxq0OllqDp5gGivMDcxl1OSFKS22e/QMktAFqipgPzxmVGCNXcDRiiEHDa5lKUmD2mYDH3eES+Bo6TYjvdYuGm7xFMsAuManQ/f/vwe44gn2vVTJxsUOgNVRP2YH22KKpBYOAySwJngoRzcdP4BrFxmj8WYQvoWG7HfWso72CDFbHUfpvwaO6Y8CYjEPKOAksDEUhFfuIaAgopeM09RNsluoUD8eS7pbrpIGpMMJxtVuZ452Uhm2nQu7y/9UrNW+tcbiSMRwmwu19Ge2jW9hZUHqVz2MEnz3Zd9qfRzXRuu/FDlDjBDbD6TLDnmmR7PGIcKI51gca7RjYPXMzkrlinuqwxm0k7byroEKocS+1wiGdNYDyjl//Txwg0hCgIv0B81g41F7+biv49vSr0vRXm/Iee/mz9XCw6rdF0 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3b83b613-9763-45ee-5564-08dab8f3a4df X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Oct 2022 14:49:41.0884 (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: PR3P250MB0289 Subject: [FFmpeg-devel] [PATCH 2/6] avcodec/mpegvideodata: Join mpeg1/2 dc scale tables 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: qzi4E7vBVGn1 Avoids relocations. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg12enc.c | 2 +- libavcodec/mpegvideo_enc.c | 4 ++-- libavcodec/mpegvideodata.c | 26 +++++++++----------------- libavcodec/mpegvideodata.h | 4 ++-- libavcodec/speedhqenc.c | 2 +- 5 files changed, 15 insertions(+), 23 deletions(-) diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index 2db1d93d0e..3ad1cd84a1 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -1148,7 +1148,7 @@ av_cold void ff_mpeg1_encode_init(MpegEncContext *s) static AVOnce init_static_once = AV_ONCE_INIT; s->y_dc_scale_table = - s->c_dc_scale_table = ff_mpeg2_dc_scale_table[s->intra_dc_precision]; + s->c_dc_scale_table = ff_mpeg12_dc_scale_table[s->intra_dc_precision]; s->me.mv_penalty = mv_penalty; s->fcode_tab = fcode_tab; diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index ce363a585d..46be4aad26 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -3736,9 +3736,9 @@ static int encode_picture(MpegEncContext *s, int picture_number) s-> intra_matrix[j] = av_clip_uint8(( luma_matrix[i] * s->qscale) >> 3); } s->y_dc_scale_table= - s->c_dc_scale_table= ff_mpeg2_dc_scale_table[s->intra_dc_precision]; + s->c_dc_scale_table = ff_mpeg12_dc_scale_table[s->intra_dc_precision]; s->chroma_intra_matrix[0] = - s->intra_matrix[0] = ff_mpeg2_dc_scale_table[s->intra_dc_precision][8]; + s->intra_matrix[0] = ff_mpeg12_dc_scale_table[s->intra_dc_precision][8]; ff_convert_matrix(s, s->q_intra_matrix, s->q_intra_matrix16, s->intra_matrix, s->intra_quant_bias, 8, 8, 1); ff_convert_matrix(s, s->q_chroma_intra_matrix, s->q_chroma_intra_matrix16, diff --git a/libavcodec/mpegvideodata.c b/libavcodec/mpegvideodata.c index b98e90cf43..68ad84276e 100644 --- a/libavcodec/mpegvideodata.c +++ b/libavcodec/mpegvideodata.c @@ -30,31 +30,23 @@ const uint8_t ff_mpeg2_non_linear_qscale[32] = { 56, 64, 72, 80, 88, 96, 104, 112, }; -const uint8_t ff_mpeg1_dc_scale_table[32] = { +const uint8_t ff_mpeg12_dc_scale_table[4][32] = { +{ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, -}; - -static const uint8_t mpeg2_dc_scale_table1[32] = { +}, +{ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, -}; - -static const uint8_t mpeg2_dc_scale_table2[32] = { +}, +{ 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, -}; - -static const uint8_t mpeg2_dc_scale_table3[32] = { +}, +{ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -}; - -const uint8_t *const ff_mpeg2_dc_scale_table[4] = { - ff_mpeg1_dc_scale_table, - mpeg2_dc_scale_table1, - mpeg2_dc_scale_table2, - mpeg2_dc_scale_table3, +}, }; const uint8_t ff_alternate_horizontal_scan[64] = { diff --git a/libavcodec/mpegvideodata.h b/libavcodec/mpegvideodata.h index cf783ef31c..7264b434ae 100644 --- a/libavcodec/mpegvideodata.h +++ b/libavcodec/mpegvideodata.h @@ -25,8 +25,8 @@ extern const uint8_t ff_alternate_horizontal_scan[64]; extern const uint8_t ff_alternate_vertical_scan[64]; -extern const uint8_t ff_mpeg1_dc_scale_table[32]; -extern const uint8_t * const ff_mpeg2_dc_scale_table[4]; +extern const uint8_t ff_mpeg12_dc_scale_table[4][32]; +static const uint8_t *const ff_mpeg1_dc_scale_table = ff_mpeg12_dc_scale_table[0]; extern const uint8_t ff_mpeg2_non_linear_qscale[32]; diff --git a/libavcodec/speedhqenc.c b/libavcodec/speedhqenc.c index 65e66afae4..7269e345d3 100644 --- a/libavcodec/speedhqenc.c +++ b/libavcodec/speedhqenc.c @@ -115,7 +115,7 @@ av_cold int ff_speedhq_encode_init(MpegEncContext *s) s->intra_chroma_ac_vlc_last_length = uni_speedhq_ac_vlc_len; s->y_dc_scale_table = - s->c_dc_scale_table = ff_mpeg2_dc_scale_table[3]; + s->c_dc_scale_table = ff_mpeg12_dc_scale_table[3]; switch (s->avctx->pix_fmt) { case AV_PIX_FMT_YUV420P: From patchwork Fri Oct 28 14:49:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 39033 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:85a8:b0:a2:d5a7:ad9d with SMTP id s40csp836380pzd; Fri, 28 Oct 2022 07:50:00 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4/ndLsWL35r//KQ1bY5usakyRlMT/PeSCWRZg35phRlaCignj1fcsiFbi69QxadkqSVLao X-Received: by 2002:aa7:de0a:0:b0:462:d2a0:93a with SMTP id h10-20020aa7de0a000000b00462d2a0093amr2993666edv.275.1666968600558; Fri, 28 Oct 2022 07:50: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 sb33-20020a1709076da100b007835897050asi5021091ejc.83.2022.10.28.07.50.00; Fri, 28 Oct 2022 07:50: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=LlsXyYVa; 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 7928B68BD0C; Fri, 28 Oct 2022 17:49:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2099.outbound.protection.outlook.com [40.92.90.99]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7723068BCFB for ; Fri, 28 Oct 2022 17:49:50 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EOvDuQ8rTLLiYqlcb9T9keaWXjcWzKhWHj+l697jBHK+XFa9XUocQC5TqxxGa7nrRHz4925JVVZb5rwkvy02gFpt9WqYVuHtE1fB6gwrmEB3INoZ9iOSQYHUjn2E3duAuYGYHJTdmF9oxy9L1IltnDQzA5gy0gyOFQD5Xw76yVvQvCs2AEOweEbB5EnW2ZVP7zyLDXWfnTktC8afeAtIQrUsiNVp2m44Fe1fLvBFJrKzuKh1GNDh1ieRDfn2bmOprJW8OFZtRJQMj0gNvS/hVn0TqYNv4TgvazYHJUG5ob/j7c+ngAcogYVbNceldeZFaqLK16V86oUNFvDReHUj4A== 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=AfAeb1zLzWhb/VyEUBQQr+v4M4VhXVsDetvtwdWTtk0=; b=A0/NEKy287Pd7HUWf3aH7A3ow7zRRP2/XTxLgF2RFG0pMMvtG2xE+uIAb5IZt0zSbLNKTFLtt62mfAEismisaZf+DXBJ3vLR69/vUNap7c7irRL7udL+Jg0Gcihac+CVDtJ+0KdPQJyI1OW+oDFR5Ae6kqM+zUVz3FK0G57XRASw6hHHEZKYRLukY4fwUqp86PtJ8hbuxb6GDmIUa48wWu+imR2I01T/Yzx0zcWBWuVYsxyTx7AF2HZKZkRIrAPQGMgKOsAixX8kKf7Lxxv5PFesr7L2EOyjug3yKRCSlJwq5wFVvwP69i56hIKvlymjrGCJ2I8hg6bFXDD+8sAHBg== 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=AfAeb1zLzWhb/VyEUBQQr+v4M4VhXVsDetvtwdWTtk0=; b=LlsXyYVarwaQfQRX4PGJWT/xtA0GQvORVaXgEv540Ja07r7hu8dSdzuco/xOOzNU0c2K7Kqi9gXHPV68w7iLb+rmzgsOoSe67tn4R5T46OLILIiav7gewtxMjEuurk/HN3w6/EUnWJA6KqK6G4XXdr/Qgku/ar/r7bVWve1nD15WeVLZR/NhAmsMBRIRFeT31p9Dvo4o0QsBzz5tO4Crll0e0Vfw6YfrNarUvXvDzrHUuWG5aHlYc93yyNVOZdS8E37pmk4xkSXM6vXUZjjnER1DjuOIrlNDu+IkSxDD15B/j1M5nixMBalD0PvYmmaYMwWG4igoiZT0tnbgvYPPtg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0289.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17c::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5769.15; Fri, 28 Oct 2022 14:49:49 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe%9]) with mapi id 15.20.5709.015; Fri, 28 Oct 2022 14:49:49 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 28 Oct 2022 16:49:43 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [cSuzD/o5FwNG5zKAK617NG4L31EnSvan8DoF5mdhEKw=] X-ClientProxiedBy: AM7PR04CA0001.eurprd04.prod.outlook.com (2603:10a6:20b:110::11) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221028144946.1518249-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0289:EE_ X-MS-Office365-Filtering-Correlation-Id: 9ca69b62-547a-4db9-251f-08dab8f3a98f X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKxJj/D9HFKYzAh/jytDTEp4mnfBDI1wAD/GMT86Qb+k1qIZFJ5F7lCUDI+TNUi3qkxbidQ4U+kx/tOa3Bza3HaVcNGiZy3N5DmcDALTzmusRa6skOlWihRxSW1iC2yihcI/p7CJmkEkHekdp4zlnns9VUZamo7b/MU+yWvS/9DKvqwhegJf868K1Xd2m1l0M7bPUh2arsknHJk3nrf5Ghb7j63BsMjS/f6PKRq+EzLv1/7c4VCQ/Uc82Jssby5lFuQQAezNqe/VKxQVPCT3GfXB4iz3E9q9ZVqvmGyhbnYwVyLy5l/BqYAyeLmrYtoQ1j4zHqEg/o8s20lxL2P4u99NH9wwXfCDdH86V6wiFvl+A8ziXrNZ+SLkGa94Oo1u3P8vnK+BpmcWnbw/VOaN69cSQp2BH2/gb9gFdZQRBfL4P+0QknO65GNA7Lokrdnl8ID6ILUsrB8PfR1UInESsRCBQ6zVAYzAoIJEd1oypiGRiI8pusnnKfEbFc1kRjJy0lAyg4JJpA51JXVme80CYa5BpENSzxWPPQ8oD8Mk8F224+8W1wetJOBWRzeUJQtUa8TOE2hAYj74GOMc+QUqVjOhtGg1GNbX/jeipmlJ+6jb4zGwDVbqiTfqSwtvW8BzsYVmWG7IwTG+XOveXN6zax97oQKv16LRltSMJ1LCQ+u+2WEbwR1N+/HI7EvlD66HfkfWXrCcwqZ5AW7ntZw79TH4uTgS/DFVSrM= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tIDnYSPsrVWY2kROX0xQnPFCo1KdYtDA5jVJZxPmwjuIPOj7vZJoM2k7aplruK2ZQrC47hCxqWduDtmcIoGibiD8i9U2m1HCH59sUJ0klzdbPO0QqI94cy4YwZB1M2SghYtq49GDduNsD43OfbbwH4yJ2pBoclcW3Z5huiSCX03s9Yf+3w+TCkVRoWl+f7G+8N3SEicAXrLcmRI2JtqQTstIe9GJNWNkgxp4lp0sVGLmaNzBDCYx37ElFK7yK/ebCiyp1FD7Ty91hZim27Jwo/9hCf6w5Meh/BCNh6NOD22yDMJfS+bZ+RBiIUSv+J1GxCQ5lCyW4q//XFroRQdhh5J/BS3sjbTiCVZMMATCdwiPYmzOhENQzah2K6M0vpGTBtBy5iwEvWaJRVO5l4pNO7iAwXU5CgCTZ3Ix6IUXx2BB5NivAsXA3Ul8jSltzr7kI9FvBfXpcUzyiFCJmmDWaRkV8WrTkPMsKlM0w14/NM0nAfqaBNoELiL9BBX64ouX6uLNqpHCjKwcMzz5Oy8mGPUpeVNd+PyZiHUH4y5WOCR/WjPZtonZQevkGMeXbtcRLtEFDpeNN6OizKrEX8rayJiNF4I0A4lHyGjVdaCB55el9VkSpB3WFzK5xD4WM6InRqV3zNdvVSQm9QLZCVSjh1loZpCoXtccaeYxuiVZvLcXBeyY1lP2nr1V2v4BgPYx X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: orUv97BK/sf+3yFPLGX+TNYCS6HU1zToz7uDkff5KnEMkEB0Oq+pjq9Zqd78jDlI57Rrjd3delEJdV4E/gJk6uud7dSsgd89jtlA54t3Khjxnsbaw9PoPLZ2qWRtUSk6IVCAnD/f6UFyOZ6/ZFMsBNUgCAQZx/y3JThzHIA+mWXcNVGG5qJyx2qZUUfwFez9Y0L2dYMPTDxH6Sbzk5dsu8DmPmYIftknv5eOa8jjL3VpGCq2VKiqAY2lYYRAs+FszHYvcHeOlzsUQ/yVK5MtRPaXIMO79ER4MYsj8VvFRQNhLSP1pR46d2Ck7EBlmoyXK2bvCJWK7aj6sQaFdeCz66KcS/KsYKW6vJkuYboEXgpT7bjrRWWN5NYToX9jHd+kWbWpJumTapOdstTiWugWAVFwZQw5PbTYdjPeSNYTkF+y3N8pBw9CtaR942TPpIWqyPpMDAuCkAQZEPtPNZGX27r2VGD5hsRcHtV0N8BUdFsUYnreVW6B5QK1jFatj0R2C2rT78uircA1vrTITTm1cVusQy3QfiaBq6eBPA1rkLSZ6ByhqFor6zZPbUBYNh50LVew9jGi8n+VUlCYB6OI55lFzWn///psvV4k9XEwtDPWlpA0UgI4MZEB0h5F+mkpSN6lZu/qkIr0DhvU/LsvTf6IimMPUgnfJsbs4TO2qFKqiNwmNoHC1ozlhIPbCO1sxBj7l0ee/7JGql9uYfvj2ZYHjR7tODMOzS+AroS1jHxKz59FBpOJEdQJT+7Ofdb6hBdvOv+brzgRTe5xjhXHtVmnHXQI3/56+sEB7aeTQU5lxvQKCCwxhTueUkJTeJrqsGcGK4h1RRXhMyPuXBAiRkTtbTr3FKguDHjcRJLGlMbRj6HiwrZlx24iiDns01kPL6033u0PztrjjEtaLbHmhVwZ57lJU/im7HQhSrQE8T1O7fiE+2qmhK4GR1Wo6vbgQZLRspRyTnlcA48RgyYd7CYopOfUcGCZC5vazCWsyfww4rWqIyKW15gzRo8a0JANaQtX3M8KVms4CiMcBFyeIF/UDSUXUDIWQQaC0u3wSApDLgo2caHbvb8KZB4s0qKB7w+Uo0PmvBcDFO+lYf4l6k1ABknDreCMD1xOrBjbys6i31azP6y8Ap/QcEsVdWprxv+ztbJg+X9UjttrtkaAhfo/9BdVb2nwtjDje0hNLVloLBw1zyPAZfKlzgoiOWkXc8NzYiJkT9pkdHVBYbuLcGYwXgAX3vT5KOdJVGLxDXkb25jIn+I7HDXiOT9LSohEFvi9wH1auGjD1LchDIVzBA4+AqxlisOVg+itKlvku/HH9Ov45Corwb+zJl7BoLUf X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9ca69b62-547a-4db9-251f-08dab8f3a98f X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Oct 2022 14:49:48.9516 (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: PR3P250MB0289 Subject: [FFmpeg-devel] [PATCH 3/6] avcodec/mpegvideodata: Mark tables as hidden 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: kI1SCBFC/8Nm This e.g. allows compilers to bake the offset implied by using ff_mpeg12_dc_scale_table[3] (as the SpeedHQ encoder does) into the general offset; for certain arches this is also necessary in order to avoid building suboptimal code. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideodata.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/mpegvideodata.h b/libavcodec/mpegvideodata.h index 7264b434ae..42c9d6c293 100644 --- a/libavcodec/mpegvideodata.h +++ b/libavcodec/mpegvideodata.h @@ -21,6 +21,9 @@ #include +#include "libavutil/attributes_internal.h" + +FF_VISIBILITY_PUSH_HIDDEN /* encoding scans */ extern const uint8_t ff_alternate_horizontal_scan[64]; extern const uint8_t ff_alternate_vertical_scan[64]; @@ -31,5 +34,6 @@ static const uint8_t *const ff_mpeg1_dc_scale_table = ff_mpeg12_dc_scale_table[0 extern const uint8_t ff_mpeg2_non_linear_qscale[32]; extern const uint8_t ff_default_chroma_qscale_table[32]; +FF_VISIBILITY_POP_HIDDEN #endif /* AVCODEC_MPEGVIDEODATA_H */ From patchwork Fri Oct 28 14:49:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 39034 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:85a8:b0:a2:d5a7:ad9d with SMTP id s40csp836440pzd; Fri, 28 Oct 2022 07:50:09 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6pmcyg7A9jHdL5S7mBzyGNtIdrCza+UgAPiQKKlO9BhyMepcp96MTM2h9/ttgdbDpVwIh1 X-Received: by 2002:a17:907:2719:b0:782:b261:e9eb with SMTP id w25-20020a170907271900b00782b261e9ebmr49807247ejk.104.1666968608993; Fri, 28 Oct 2022 07:50:08 -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 hp39-20020a1709073e2700b007a3fbdb825asi4207409ejc.707.2022.10.28.07.50.08; Fri, 28 Oct 2022 07:50:08 -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=IBeydowf; 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 7D77468BD17; Fri, 28 Oct 2022 17:50:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2024.outbound.protection.outlook.com [40.92.90.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D59DD68BCFB for ; Fri, 28 Oct 2022 17:49:58 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MNsFFuHQN/Y3zg0eh2m4Qo4nCMxazlAE++vkRTaCLpbyjblG6MVvBbqgv5p/b2WCVSAm8Zh2ziVIYLjGCBO7sXIj6OjrvBEXSyLiEFQ0TpdYl9Qh/yvQrKwSOvhzlm1S2RGF2UoPrAM4h1hzRRZT3LCemhr7o+V+47jsrbqiLNtxNaHjUnQQIQkcivfJ1fnB5it3mTAMnPR5/2Ft3Fn+ifZb9I+VoK2T56mSfhwFEUkVgZt93QaTlXLOuKXUvR4ZRolJu4punCuINWVN3gVPBgEgKgvbOTPkgZQy1Dpi4M09bEEZglkK5BCqfh6JgJJel2uX1xthdV1g8jEEvslFWw== 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=QGEzwyCau4p5Qxs90bUcnMeEFmtqhQQcX8skHSkmcKI=; b=Y2iWfcn6wefiq45c7VMBwm2aPMrJmya3bjADnPUD6aMzVg8b9wc94Y2IkcKveo/O6vQzyR+kSlymQo8x6XzN1bqnZ8EK0emuHuMI5moUeIpDziTewTReXt0VXPh2co1mfflR+MvnupkXXWf2rFlHhqgZGbcKB2hBpKJ22TGBfxG5JPDyGGm7NW/NXCRuuB51rLnM8BVZc4EwJC80h3x6dbUhXHsOugROquoRHZyZv0If+FyipPBAggcPimAKyol7i6ZQqyOVhtZ3cRyYgsfSi1nxo4eN4gsgIxHNlEccAsdHc9329gBsDDQ9XLbCdOXGh2PQaVfTgxRVgAKlLSPS+A== 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=QGEzwyCau4p5Qxs90bUcnMeEFmtqhQQcX8skHSkmcKI=; b=IBeydowf3Iy/Q+IBcUqpsYrq3OXkb4QMR4u1qX1ElAUKYIofIg7psYeMlKrQuP2pfRSWY4fLAGM1heP0ALzWGzfC4i7Redsoh5dNIDBb23rTuvtWbusOI0I6qVy92fcV543Syya91G8e+WXP22ZQtfY7HqyuTFWDtE2dwHekdA/5h5v4E2pq293Jshx1W3RtvhWpuvq3yKEJv8TRtqlkA80bmBVeyRdfFYZ7YJg97aU5Tc0MPeRGVK/BGXvZppbyM90ZSUSTE/yBJ7so00msu1vrt7rhfktiA7QdhPXEsePDlcqwvUmDrXsQcU9JeV0snT1vsVFlaCYQpEQGgiNl4g== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0289.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17c::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5769.15; Fri, 28 Oct 2022 14:49:57 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe%9]) with mapi id 15.20.5709.015; Fri, 28 Oct 2022 14:49:57 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 28 Oct 2022 16:49:44 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [jT64HawbFTdhk6CH2am2CqQp+b3PEKZh+0NDNqWDvYU=] X-ClientProxiedBy: AM7PR04CA0001.eurprd04.prod.outlook.com (2603:10a6:20b:110::11) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221028144946.1518249-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0289:EE_ X-MS-Office365-Filtering-Correlation-Id: cadbfcee-7c6e-4ce4-b769-08dab8f3aeba X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKxJj/D9HFKYzAh/jytDTEp4rIHBRUsxDc5DNvVhppBByrXDgMOLyfvRnLY4uxcSEj6V3wF4hGl97qCzab9EScviC3PL7ork9x9c0ncBXXD45H8fOBu86V94LeLuRykSKInbxmxImwvMANHq62EfGjz6zT5fQDXADdTgokV1qnKD5d7hT25SQMnsN+2/HeX0HEuWBjiS7nCRGggQCvIOYCs/XrAKM5LeiZo+6VRNVwzd55rUGwcw3jxhoWFQ58Z0SCpm7eQBzBYRMqw74tA0nDwUgpkojTp6tuxLWWLbEQNKl27t/zg+uimNJBV+NWgKhbkhPaWKSAEhwMs77a9XsfS2IBZWr+VHjt3XKBuO+bV5ygCps9XX43Rhy0lJDm/m07MD+JpfCnsMr7HQcfYMkiY7X+cKoEGkXAFbQe8lRQUP9YPECm1o1iQpNE/phExos4cqV4MoAbYk4jdtZPa8vSOniZqcFCAjX22+pkBYJracY16H9nwceht13lKHyWW6SO0kPkljpe0ODiMGbM5fxVArWo+5vUL4w8CU8XDgqsa+VUOBeld9wdDVJfDb4utOfA/KuBE9H6b1SvxYQA1p6VBDGtAnO8fSQ09YvTfkaFTGcsh7HDHfHNh3xH5S+8mJbqpyz+9iNgCOSVCKqw5QJJUszxsjzBMaeHlcWfJftTzNbK3GvbRnO8ogT8Y8/LHHjGtTy9bJHol2clbMOR5aLjrHrehiRAt8lrQ= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ArKPymRdC6SiIERItU7Sz+JIvpAjCXpIdUguwAbiaOPYK+UXrQgW/wh65PsTLAccCr+WGs9bK3vuY45exkFQoiXEgzOF5mVorbTuhXiYZTXEPnbxP4lNBle5dDTa1MV8kfbzkDKK4q8XrzQhSuE3ATWKRDxOL2m9jmFWVeXWXTAESOi5J5aEehMT3WQ/2KNpP74sa/LW20IRJHG17yVWa4ZwzDkkzD979W7xGi8+89ZPZGKAFOEvsKa86bf8Hub0UaxuIoneRy27tdavCBGReUPeZU2ccovzjrSTfx0ar1Kad3HETI24zWPM5heEZgvCHkMcoywevoIz+iEBRFnPvtc2/d5gJ3YiOTT24BaTVwutoOk4vBwUOYIXT54Ua2slTQ/KrhXWmXRx2CQ4WgGgO2Zri/6HWxNITkjRUxhh/XvIxaLRiKrZE7QbtbPhW061oPH/xW/VpaF6bwlJkHQ8YPfTJfZiQkwRUahnrV2ZfQI4hcI8IXYY0mYgh0Fqr3bEVqC8/4ZniaySwy/ySI7jw6CiYaTJ7sr5iuhQCYhgXlAorheI7c0aVNp+IDV0fILYrmetG9e9Ne1sSNZsv/n2+F/RO6/VVu88DHb510KHI3vjKsb56Pe5U2nIC3zzOV5lxFLBs7rA6WSd89ttK5kFljnuejtGUyEhDumUP/2XgwcXrEIhNw1P3CdLtRYohVVV X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: b0UD8lHUFqJgYmTVcfqL9b2jVGapQ1kaAZ35ewSeLuWLt1i+j8VeKlXfp97oceBx1Kfh+YVvOkaKn30+JrVaf3xePlhMf4FPONgCxIgu2M984fsQThmAabGQpoH8BLqwmWfyyBR7EilNH6fsLkwxNsdgCMjcD0i2ZjJb0ZzNDWJigNUtE/CQLRrbqQb+02AR/+TB3JlxEHnO8BpFajqQOBi0SbpkpVCAxB4PhqG0hQJ6BsNglwwEOxe4pdM33V8uvH1P7CgWC9ygAgLZ7GZLpzi2oW8Y2CIZOoDrkElqkyGWR6oDdpRbBqY/BKZU3hH/MJlIMf8gWrnmzGN0uB4+vINXmVHZ6ndxVdaseFagYTnS2RS9OYz9YEINOXNFdX3jEKbpkJS0zGc+Y6IJbP9tmovj1NGsGwnEMq2DiclnTWTc53k6wGjxsIKGc7Yc24eeRelinEFg95a1A6DkorZV6QLvJJ8BDMP7u+SfZDuDzq+YDK9XY+C0KogWT3epD5X/vb9ij3mM4tKZbaXldypL19OIffCmMrL5arNB38CiuQ6sXFqGJX1cpwrKjiitYrI3lqMquGuZE9T/m+RgIrMheOhr8OzZ7yaDqSlINEY4u8atKXjXKZGdohO7vTIF6jzrjd29WrqlTakqJPAIQyUm3310LgbWDAzRInMwXlbbdODVIrJfP4eKSko3QmCymwoLXyjwmNT9BJfFhYTgCVFz/6ROiKjbYZUMNEDL4dXmRkTdmhozuiyBAbpcXibXlVzERQe93WDSG8Siz8dno8NuwB2K79upbxPgjvqYbRLKui1Gh+yNnw2GraoRKyjjNv23cx1uZGQX96wugYPAHpbzCo+lk97RzRX/f1czlm/DZ2Ol1hac06ErTiKMjaR2KW1NDUrbouLS1i1rMpqXKhawPkTwgnJVSiUovFCfs/+2U5deriXtttrmwzAYPhxuapt3eFSgsuGQF360iv2pETtEfYOh7wpP3/lWqb+sUm1uGg12JrqemqmMjRHA9UIH00u6fmmgzhMfo5E5IcoJWqBgZWM6m1Me1WaCeKggmxk6gNG/6PQUcVqtgR5SA6OdXvWwFW7YIfcIKN0guky+U/xQjzv4jaqnugHiIk5dVwE/bkcGO2LAMInJ0gG93a38SUpTlnLqVwxwiqDn0utlKlBzpUELYKLZdo+kJkRO6e06J+8GAlG4xuUP4JLMKsdPvwVksGaDqFFDbKcw0CazJXxFnZnU61ezuHqsp39/7IThGwyVQ7ukiYQ0mbPEPWSVHeAnUgFOc9VYdasvk3vRyRAbxU3sqqxzS+PRf9TNTzqVmZLOXk9m2gTCV6l6VmZT8yBF X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: cadbfcee-7c6e-4ce4-b769-08dab8f3aeba X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Oct 2022 14:49:57.6737 (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: PR3P250MB0289 Subject: [FFmpeg-devel] [PATCH 4/6] avcodec/flvdec, intelh263dec: Remove redundant assignments 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: r8aNm4F/OHwP ff_mpeg1_dc_scale_table is the default value for [yc]_dc_scale_table (as set by ff_mpv_common_defaults()). Signed-off-by: Andreas Rheinhardt --- libavcodec/flvdec.c | 2 -- libavcodec/intelh263dec.c | 3 --- 2 files changed, 5 deletions(-) diff --git a/libavcodec/flvdec.c b/libavcodec/flvdec.c index 87c5e923ea..09fefd3d1c 100644 --- a/libavcodec/flvdec.c +++ b/libavcodec/flvdec.c @@ -108,8 +108,6 @@ int ff_flv_decode_picture_header(MpegEncContext *s) s->h263_flv - 1, s->qscale, s->picture_number); } - s->y_dc_scale_table = s->c_dc_scale_table = ff_mpeg1_dc_scale_table; - return 0; } diff --git a/libavcodec/intelh263dec.c b/libavcodec/intelh263dec.c index 453b93f16c..2c216b00a6 100644 --- a/libavcodec/intelh263dec.c +++ b/libavcodec/intelh263dec.c @@ -122,9 +122,6 @@ int ff_intel_h263_decode_picture_header(MpegEncContext *s) return AVERROR_INVALIDDATA; s->f_code = 1; - s->y_dc_scale_table= - s->c_dc_scale_table= ff_mpeg1_dc_scale_table; - ff_h263_show_pict_info(s); return 0; From patchwork Fri Oct 28 14:49:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 39035 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:85a8:b0:a2:d5a7:ad9d with SMTP id s40csp836509pzd; Fri, 28 Oct 2022 07:50:18 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5fdIiWfU5tlBOBZmzbVHHHapivyarRL7a166af8j3teeAefdSFSg3CXU9I1i7bT35PzRwv X-Received: by 2002:a05:6402:358e:b0:461:ea80:fb61 with SMTP id y14-20020a056402358e00b00461ea80fb61mr22130594edc.356.1666968617868; Fri, 28 Oct 2022 07:50:17 -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 mm6-20020a170906cc4600b0078e063fc787si4655697ejb.433.2022.10.28.07.50.17; Fri, 28 Oct 2022 07:50:17 -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=X8jULT4A; 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 8465068BD2D; Fri, 28 Oct 2022 17:50:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2024.outbound.protection.outlook.com [40.92.90.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F01A568BCFB for ; Fri, 28 Oct 2022 17:50:03 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NipJ38sCxRy5dDt0NAMbnSPU0zaLpw4LiBua+L2Z/N7zXVG/N/Wh1O9erss5bzzEaYBNeQd0V1jTpTqT9HQrrhWl6UJnoBArDSbiK0OO3XuUKK6KsIH2QhiJ3Ztu13V7fAvhTYT+iB5IHZkHaqh0KjaDeJlGF9MF/g/nKMw9qS9mmZEiH6h+FTmdHNxdRPjlZ8EAtJBs4wxv9OsL3Ls6jXgmgflgRtG3ejkAK7ULL+gU7hGnvnot7XwEJ4nWDSfbcX33uUrKpc2VqzbGmNqHh4SHm60AFWN/F1mTUUNc73TCi212TehlT6rAdQ8PrG6K/70DNHHfyCkSEadR8BCoNQ== 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=G0rBBYt5kba1JViL1ZjabDg1Lq5L8zVzxtc5UjIPNfg=; b=bhMlt/vC70qqNbcBT4jdKR3nNjyzwedMQMmBAQDX5nhpV2bL2UgCs/SNQPEmFAVIB+k5Kq3/feDoopULwrLY1fVRvZpCoZv8D5R+NebvO7fl2Pp8cx/Dy9Ncqw1/exJ0ielCnZNb0dXbUU3cJ8Am0fcncqightwVg4KdpwDRH9EudopmxdcejKOCoQYQgLBcN/Ud0OJ5aPhXWbFZ4WD4l4EFQl053FRHl/NpzJUwTfZsIhykCbhAo+vOEdghVv8tAwd8xPbO5p3rYuRK5Kf8XSF4y9Xr4KqYEQwxMHcYfpvu9CoJwgqGOw1ifEnqUy5gsxy834TuFMoAO7eFzBuJ3w== 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=G0rBBYt5kba1JViL1ZjabDg1Lq5L8zVzxtc5UjIPNfg=; b=X8jULT4ADvwY0OwXloNtL9jzh/iG+qTOTsPJbnneSIk95tnGuGxe/2nB1bJfztu+yFmVLxDJ8XOiEqsFOo9l+4wh7U/gAGVl3zdfNC69B1ESGwLm1MWlPPxJgrIH6dW9XFQtEvjVZDYrgIMPrZoZ4IEXtNHlbEJxp4hao5ac60Ho9LdWRzzipEFM/AhBmbAtrz7hKSY+W2fpdOblNVe4CgT4kcXzp6nRTvADSdwCYL5xLHu3Tb/kbAuErhnkh5bCMZmfVRqT+onlp++qlrvBuiV8pBHesqnEmXVseZzY5418z/R/CkAkwP1OZ3eX8634mkKyDZsLFc92tp1gQirVyQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0289.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17c::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5769.15; Fri, 28 Oct 2022 14:49:58 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe%9]) with mapi id 15.20.5709.015; Fri, 28 Oct 2022 14:49:58 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 28 Oct 2022 16:49:45 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [aFybAPOpx0Fa5TeI6O5aCKYMlQIgp3GnXdJR/OfuarE=] X-ClientProxiedBy: AM7PR04CA0001.eurprd04.prod.outlook.com (2603:10a6:20b:110::11) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221028144946.1518249-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0289:EE_ X-MS-Office365-Filtering-Correlation-Id: 23c0912a-28cc-4201-a1d5-08dab8f3af72 X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKxJj/D9HFKYzAh/jytDTEp4HQNziGy/ntEdeWR22yg5EMQ2RCNQ66LeWy9SC1Ch17ZR8b6kSvzUFCcb+cgSfNeLfz/AjhBFhy8YgSqrvR5FCAuvcnTRCe1XGuKuURMNInL1SfeQoIqHu1vX2kaUrF74BxrTK5sBoPO9ed18HYqF8q1M3J7RKaBaV0jYg6z3a1Ctt0AXUBkATKiecUP6rXah3K56e7rTC5V2YzygVvYyo0mNXu15apQRmE7M1prIJYsmvZx1LzIZKRntAkH2lBGLKDDiGgwlbTLs6bKrXcH+7ZuXGeKfQ0tfHhu7DUd4Eo7CcdqU6ltap9lceYX0mcuqgxxJ1Mv6JtW2/Ahqz2lz7lHcdX3mrCfHooJTKjTGWCiy7YAQ2bdD42KY2TtkABQU6A720bYjt5qjel9hTWJEhEFyUEhgcVR+Jr3F0NEqCI7MPGHtHQMQCSx44reCxHh9JFMol51zEUjq/UTu8hmMxXPb7i38mkZHQnZKF+qxmm5PpCZluxYrMsszUVmNXHgTS+rhOtoDN2PKjAaoC6ox2Hp6lpDgnafqSQESHA1ufxg9WVof9yF1iTeGpQOL7DwFNw2MArnM8XAxC9l/JS/QRjVCYGU0Ht1M5EzhRyrfx5Ssij4i4o6BKyIuZq6M8XGAVBxxLuqtA1ZxGfhH83o/PtV/p6YBax7i5xgjjLWFgPmyg6mcuj7rkN78St8/lwhBCnMzTXxfzvg= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: b38w8ROWoe7AZb5pJ3momcCboh3sVU/NAd2fYh55jEO+Dl3S1bdVHE7lTUNrPOki2G3xZlR/UgDIn0c7ASXGTHl42D5y6sBFv08gSSMGKP49gSj64OtPuUmqu24nEErwp5nfzGAy8iCtaDOsFYZsyWTevJxHJFlOxXwAHF/lmI5posxYoLlmxyai7izB/pq7ZNiOSrcazFFhbQPl4/17wONZ95bo9hgPnYBeUTqAxe0NzkCe7P9ycCxWDMGsS5Qxv3zXrOzFwIgbroDC8kb5s4cfqo4qa+JjJpAL1fNUj1n3KDM3TSEfnJRZgCHsrotaqcOo3Ny3x77y/MMbM/GvynuPbsHaHMIT5uyUjFn9e8uXRgH+FIHIR6sj1T7b7dZ0LqHDMetQUZd3yyDvux4uvp6Sn8bowf82B2x6KX6sCTyIN/le1YQublFRGkF40ez7bcU5u4eb6Mwx3kiN5KpYo6uI00plqjbo4xMak3HxGtkGUZvo0r94IWqf+3XVzy56ImEhiHYoBfxknEU0Y7B41WcUDIzz/ih8KU7quaCOLL1x9hKq6pVf0A3vBPj0zZx2S37YLRFMiEonZ/zYFFf2HyHZRnmn8gMJ4Me6nQdYfd4BoMJzhwD6zpbcBgktepgevN4zJOy6yAdofeFa84u3tVzrQnd2HuFvf+HqdPkIywl/sfRZR2pesEIZP2bi8VVD X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: yirbS2dCQi8c8/v73sTu5ze3l9Km/Bw6POi9BKOep9oBlCwuRNfhox4XZob9Ko/jYqILktYAjVy7j7cMh0zpb3domfx9fb41aDQIScs+c4GgEhflkehi3ZjMklpsPGCYBcpXKPdfzYhqImbhsbTVeDv5b6id5c6NRQSI5cmSMW9v9JhhU3F4yqCIZflz3vHjHAZy80rJmTe3fA82c775CxujHGqreVCyzA5o+QeTBuAlP2Aui8pI6xxD1eBpbe5hbhsuPKD+PoDVMH8KLVNmxZOEWJ3OJRu05n56878y0Ox3B3X6ObgaL+NW1kEGGf2olYEm9YwPFG/LASoDMMtBh7fAIiA7+BZEx42QWUlPxJUZRd1LfKj0m/9RaqVtNW+nIJPD9JPsB/VyDGFH1HeSpF3++T/5/gbgjJsI/1OX7opv+8/QphHTE1QXRRb+T1bpPX2kdWjcVdiGF+f5VDwynQmUFHlpVat5Kxt9KTDYiimETQeoO5ACcG3zc3u5PL9q496dLEKfxP15B/74Fwgx5zgye72lDi6wmTodj5wAtqFX6SALunfcu2K6HRSH7toWtdBxkp9LOn/8v/ERNOPKbEhI/ZbWCaCGCkXXuTv+oE3tt6FMfV/m6Rwvl8HZYK0uO2gNpsTtXb+7QwFvrHsCOIsUy393SJDrDIiB7MNyAuZTgwO3O383Owb2BiWQgqHpwaqsvqKVRdarKm/LiThKoQMpLHp9J+TCzl8rOjh+YcFSfaoDBD6pU+HVcNDdGDts9K/KONWGoDSz/+Q7/Me0WB7v7ms8d151IUTq7RBQAna557J9ne7NFYjIHHLiNtytL7P8HWXvZ2Leck2Z/cABU2aQtLh+mXzAVyt4a4vgHqeLGR9sBilHswLzbtdxzeFPukeD0pKrES/B14PTNx9zk/1kWfzTVT3oWpjo4N7RGjmOCYQ5jrjdwbxicGZcdvQbetCJkF8T+CIfO7IdrLQ2+CJUrOPlNFFw0dS9JK4xPxy2Q/nqTOYtMpjHzAjFlBpipjhj9jEkYgWcOnAtzpYIvi27qWppduwAVHfVB81YfQw+P6ShZcdlzLw/iYQrviEJURKMfoymIRY8q16zJbUEhry3y3pMIfHZZsq3E13hgqP/Nj0ev5zUlXeW+H22Nl5l7mQ3cu9z/zkvFaXwNGMfMKJ8qsm7ieMHRTfn31iRKhVWymQrHQGhINDJ/DHk6u26NxfPyODHVCaQJ+LKqe96rcWUX4pn7AsiAfNSXnhu9ZI1mqjmeYGdfo0gyCo2qMmV5v5WC4aDpJBsyyk1gphT3yfbdHLm1IWBhrvwO7nU4F3kifCSuB+pGrmsISqLhofS X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 23c0912a-28cc-4201-a1d5-08dab8f3af72 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Oct 2022 14:49:58.8310 (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: PR3P250MB0289 Subject: [FFmpeg-devel] [PATCH 5/6] avcodec/rv34: Remove always-true/false checks 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: JdeOBxMqoi5H low_delay is always zero for rv34. Signed-off-by: Andreas Rheinhardt --- libavcodec/rv34.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/rv34.c b/libavcodec/rv34.c index acf77d103d..be188edc47 100644 --- a/libavcodec/rv34.c +++ b/libavcodec/rv34.c @@ -1568,7 +1568,7 @@ static int finish_frame(AVCodecContext *avctx, AVFrame *pict) if (HAVE_THREADS && (s->avctx->active_thread_type & FF_THREAD_FRAME)) ff_thread_report_progress(&s->current_picture_ptr->tf, INT_MAX, 0); - if (s->pict_type == AV_PICTURE_TYPE_B || s->low_delay) { + if (s->pict_type == AV_PICTURE_TYPE_B) { if ((ret = av_frame_ref(pict, s->current_picture_ptr->f)) < 0) return ret; ff_print_debug_info(s, s->current_picture_ptr, pict); @@ -1613,7 +1613,7 @@ int ff_rv34_decode_frame(AVCodecContext *avctx, AVFrame *pict, /* no supplementary picture */ if (buf_size == 0) { /* special case for last picture */ - if (s->low_delay==0 && s->next_picture_ptr) { + if (s->next_picture_ptr) { if ((ret = av_frame_ref(pict, s->next_picture_ptr->f)) < 0) return ret; s->next_picture_ptr = NULL; From patchwork Fri Oct 28 14:49:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 39037 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:85a8:b0:a2:d5a7:ad9d with SMTP id s40csp836678pzd; Fri, 28 Oct 2022 07:50:37 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4Sm9cJC0aaz6d5K0c2LzrcsFJRNcExIx3QCKI1onHzLjIo60qMTQOtEOuQaHREDXxhGj0D X-Received: by 2002:a17:906:ef8b:b0:791:9980:b7b9 with SMTP id ze11-20020a170906ef8b00b007919980b7b9mr47470501ejb.636.1666968626585; Fri, 28 Oct 2022 07:50:26 -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 gn19-20020a1709070d1300b007a4feae7ae7si4960630ejc.575.2022.10.28.07.50.26; Fri, 28 Oct 2022 07:50:26 -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=oFj77wwI; 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 9965E68BCFB; Fri, 28 Oct 2022 17:50:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2024.outbound.protection.outlook.com [40.92.90.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2B8FC68BCFB for ; Fri, 28 Oct 2022 17:50:09 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SR+oUVCeXMBpkdjHqPQbphjqpRVAoKlhWh/BX6Zx7yp2nUvhPKodqTAGocvlNom0kytBkZ9Pmm9JdLuQZ44Qb0RPDnoyPa1WB0c5PgQeB4MeLXMEk38JB7YO4/j3DHmSfK+ERx/5LVGN+9M0rESgDKUf3gNHZhVMI5vRsUeVhMc64PiauyQDl6rAfoqO2z8RydbYVEfKFMVpUCZHTV+teefzdHua3ih4+Ojq6lC44uGAnAYw6aP66QoMo9iCPfVkAddS7+K7T2tdgzVzrfWJNWJyzZBbhlAd2O2cVZEAxZripWoAM/rVbWKB/BXDwEVJIdNjsYxi3qZSTrBWI7x9ew== 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=ujZxzNS/tsYu/6/jGIqQ+JG8jXlbnFo6/D8IY3Hlu3Y=; b=I4Kd/H9kG6lYRg9hyp7qE/l73x1R+pGFMYQK2zSUD/xuM9366PSfDc/ZdirOoYCnYIAlzOSN0lIn9hflY9aVgUl4eYeJDolEAuVIMBN4muRQjVWGYkU9stFTjJd6q5aOiGz+aE+fjIg8t+QJ1mRp+wtr+XFnai/NKFMjhCQkjG7LLemrxNxFmQNMxzp+pKj5mvGEQJekyHQmjIDSJOA1XxWqrByW2c3EF4iKLy6Jo0E/JOVOVlzaZGH9hD0M2jdC4COX7pvHF/YoYEKmyBXYHaYDBc4b3hYWgKk1Lbhc3LN6zt9CTspYCJZBM62/peBABqvXj0IqUe5f+TLs+vWrkQ== 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=ujZxzNS/tsYu/6/jGIqQ+JG8jXlbnFo6/D8IY3Hlu3Y=; b=oFj77wwI9QNjyZ+dtMhIUoK9kPDv7wzFNngAL1Y+VFQv/E8TduiHpAdMN+FlJcwrqa2qJa+OPJauZwBosOb5nixhbps3IlEyp8XRHMcwKHUGGnbav7Ogc+jhm0fQgtTUbuQg1apJaFphpcNMjXRePEzIspgJsx0CwVhqJtDMB9h3YhItl+IOzpx1/qt0ZnPrA2Q00QGPuTgSeX/F692lpPfuGN2vkWqklUPnF8Zt1juymnJjWDgnx728qYGpVQ9EBnqyiBjvauqLJxonn6VJcpLWlY9lX1hpNP5AXY+b9DAALAN98E+F2hnZckMFBpNhsEpuW7Gs1KVDemvtF/2gpg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0289.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17c::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5769.15; Fri, 28 Oct 2022 14:50:00 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe%9]) with mapi id 15.20.5709.015; Fri, 28 Oct 2022 14:50:00 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 28 Oct 2022 16:49:46 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [YXo4uZfDrVowwyDiyk7vzE1DP2rWGxlWmpxKb15+Plc=] X-ClientProxiedBy: AM7PR04CA0001.eurprd04.prod.outlook.com (2603:10a6:20b:110::11) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221028144946.1518249-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0289:EE_ X-MS-Office365-Filtering-Correlation-Id: 33d41078-a6bc-4ac2-49a6-08dab8f3b055 X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKxJj/D9HFKYzAh/jytDTEp4A41+lwLhhZcumsk017760MGpOaGQAt/HBOXd9WYrtnzkY1G5Av5octnhgpy8xUmfuS2Rod9nYS5Ch5WhxsBrCZyz0AxfDtNb1Ip0vtWVfYfQ82xu3nPq1yjEMVCcSwhve+HwtUfCp+Aqhr4b1+0A+1Qzu0BokG/eikCMwZIADURf0nf5SFHWjxjKQ3hSoEACxvUbz3PmgLqLGRyJLFC2W7D5JjT7c0CEVGv1ZLozhwJLPRu73K73XFrtD+v8bv4vSVHKPl8gYVMpxN2Sp/zpnpyty5+WSHZc3W58Eh5A8VmjaGvlIVGInJrYmOWKre+Ou6tdiXkie7pCD5sbLwqEceJfM+gl8fK7ikkuSVz4iQU7/qy0f0YTFDTbC2kTC8OPTOp+BsdnCBEiHdyLwS+rnZx8MhERHNJA6VEOsR5z6FhRtgPQnCALiAp/WJtZ9f0uoCifWJcRIx8SrRafTDtWfZVT77orbqZ20fuEDa7L8Z/0cDy3seWRvwybe58VV5dQNNWwHIvwDCR/YIs034HHik+SOJSix5kteJTI9mMtH5aGbrgpogjY5jzrMEmsfu2o9wPDrTWeoaDJ+3RHIQmrfv+TjeAS78Pyr3WBP1gwpsBnt+k7DFcFBKWGsP36rNRAK5d9sS6GUXFZh1ITKwtm3nTnBD8ut9mtvU+uEpOK9eZB2Moj6YrM5axi+MR+yx8zRZRjfL6Alds= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IyoWh3m2LfTqBR3vro7MXXtfiZdgWkNkmpAJeg4uI2/6pW0AIPU4nwzR6RT7pdUlGqphy3GuF1ITGnw7sXtl9jZBmcrKLWK1v+qJp6px+MR96sk1DMzPuZ0idTl1pVMHI5ag6Rq5pkunv/6zxkRGG3D+tJ4nRTNVB9AuH6Mtb4Ea5RxA4N9iRtpCERnaGnZo1F5WPuSYiFFSHm22JtDfkVhsCevow3aX6T1PI/yodRqxF626oH6aKKFCszOSp4Ey2LWiwZdubjKBVUfX+jwDlcHBK4fu1AgDGNC6eujzzq+v08bzBVJ6JdrQfk/KDUW3+OWhcCIwupGwMRO97X3Jzd2ayyBre3pzjya3mTakOlI/bLfPgHKMqjMtU7HXvnfKFDdi/LEtu3EiIHDvRVyrFtPVhFTpXxGTvP+eQgqLd+Ri/IQmRtqCPYE5HIFJuVOyu+TeyyofQOdq1LQ62KGA7uah7UffDHzfD3AwDA61O8m4Ph4g4GuXDXQCYcfEba62lLpjDl7erJKv+V8ENCv7zV41Le8JeWhfWY5tYFkY4ID+Di6kaDdvM036NUvtbGb7mHGT7mNO5wuyd0rvXBqqrwaTANe4ySwS33lhH2cwSn/00ZOwNNl4fXag7vr4dYi/FDPgCk/kCHkaEqUiL+c7bnjktk4tiAcR8P0Hz4fo662oZu2Y6TO21LVs5la6vL13 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: K6+n02cEfdbg+I8Es/brtCjAaYgnYnQuIjeNQt4sOrPWWTrcz6u19DAKTzCtlt6qeh6Of3IW2JKTWc1+ObSAC94XHM5YyubPAy5Vwr7x5dIXICeYSD2sbRjZ4jGSRQcGpale733qiqUeYlCwtvxoknhi6qJv4jH8XQ/O+Ofo4UNtybwRGZgxezwrXBHQ93cVnujTpkjd0I6c10+BCaa+BlcIIjrTVU2X76/y2UqadykRpuNRIeqfPkndOw5m7AWSPTF42vOZJW2EAc+kLdDx39fHaXO0pyhntI5JA5YRjiwJpomQ/3HxihUOpdtnse1i6hNZXcdDuI2Q0W2zBYSCGeajnavqGJHMANF1j14dhzPMkFtlQTuQUf9MqYwi8oNPDhAL49v1/lcVLV0G/uOQbSjPLseY6ohJppKNQjKeY5dwQZcjW1XW5Bayq8mkr5TFYexuLKl0uf8olmolgmjzy0KKPyEJ0bOwHqL5WUPFW3ufKfB+N5n+WDtD+PNQkb0DbX+r5clgl0FV/xWbGe+UDa1UXe+BhAU2YdSGe/9YyfK650f8nfPmb9BxGk0y924UHhIymoObkZ9K3/GOTyF/F/OGT22+NrNDPzlg+SuKK3IqZnfIAQAZmzrEVBOSKYtvvX7/Ajuhl5qSodzmsEz5tf2ZJXarghjr9y4Krb7Nc0DB44YQwcpTbjflk1Goj/O+AeTH2vrU61f56/r2bPhNIPgAwYg9FxLrqscQWpyAL7m3cLxWJ+ClhWMLj7XTW9e2GtUdq+Xf0+yP2cD3sZtzHz0KrugBSdHzC+5CDgr89qROnhys0f+OqkmX9PFa2yBdptfB8H6gDpkHE1X/aEzTX6f+c0TDrh7w6x5WTg7jeCG8Kzg7UTObxM8JjinmYnLeW7QjPnfuuSzFzmORgiXsNeh/0GoWLulY2sqcPjcL4Kcggd6UJat4j3oZPqpZ3d+U/G7TDoGccHTxPQULQIUxeTKsZbVmbC3Atm43GjiZWn9Gc1wsxE2qP7TZ6mMGX4nYLPbZ7k9x59Pi1vwsBhlJV2i0WpgrSBSbbiGTWcEcrmsARldEYjc/0IC1NM2ry5W0Wjya68/Rb2IR4b3mxuA/EkHzztLxFuEDREOJdhbidLDnR2Q1VISc3ltza5LYIwX0t4BHniQNh+zyO6TxB42XUj5MLIDXrv9go7+O46W9gkCJ3iZXZG8ObzAvYL8ofTPD2JrBo8fLkdPTIbc0GVNWVJ2I02kvk8SBRvzN/f3o0WUoj05i0g3Ts2bm5Cx7P+4f0PFq84MzkzCpPbLGCV1zFmXBZRZarvW40EiC5sGP+gPJWTuWEQMWyemF+ifNwO4V X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 33d41078-a6bc-4ac2-49a6-08dab8f3b055 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Oct 2022 14:50:00.3163 (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: PR3P250MB0289 Subject: [FFmpeg-devel] [PATCH 6/6] avcodec/vc1data: Mark tables as hidden 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: MsUsl6aRXy5r This e.g. allows compilers to bake the offset implied by using ff_vc1_b_field_mvpred_scales[3] into the general offset; for certain arches this is also necessary in order to avoid building suboptimal code. Signed-off-by: Andreas Rheinhardt --- libavcodec/vc1data.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/vc1data.h b/libavcodec/vc1data.h index 90dd8baf61..3512dc169b 100644 --- a/libavcodec/vc1data.h +++ b/libavcodec/vc1data.h @@ -30,10 +30,12 @@ #include +#include "libavutil/attributes_internal.h" #include "libavutil/rational.h" #include "vlc.h" +FF_VISIBILITY_PUSH_HIDDEN /** Table for conversion between TTBLK and TTMB */ extern const int ff_vc1_ttblk_to_tt[3][8]; @@ -204,5 +206,6 @@ extern const uint16_t ff_vc1_b_field_mvpred_scales[7][4]; #define AC_MODES 8 extern const int ff_vc1_ac_sizes[AC_MODES]; +FF_VISIBILITY_POP_HIDDEN #endif /* AVCODEC_VC1DATA_H */