From patchwork Mon Jan 10 17:51: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: 33187 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp2949265iog; Mon, 10 Jan 2022 09:52:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJyuNS04bEpArINZCCdP9vFXuvsP+62Nv8mc1MNt2V8BI/nmpQwpdXKjQL+/j440a06pP25w X-Received: by 2002:a05:6402:520e:: with SMTP id s14mr810268edd.10.1641837144602; Mon, 10 Jan 2022 09:52:24 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id sc25si3989397ejc.417.2022.01.10.09.52.22; Mon, 10 Jan 2022 09:52:24 -0800 (PST) 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=eFJSjFH9; 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 99E6C68AEFF; Mon, 10 Jan 2022 19:52:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069083.outbound.protection.outlook.com [40.92.69.83]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ED22468A199 for ; Mon, 10 Jan 2022 19:51:59 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OTE4wK7nO5YpVVPUAa5AZY3Xi2oEBAjChn5m5BkQa1jm6dPewt++tw2SVItHb3X+OlLz23mwmn8DmNovp4UroJ/ty71uNrPDEg3ohobYPPLR8tJL4Ga3N0Ytfh8uglyWMNKNccKRfWR+VoxJIe0eK26HbXQ3REEB0qcosmDtrlVcpn19GjAe1Mfr+donfGPov7LKBfc/v7XGFrAG3L8g0y6tq3aB7dW3GGYHQmhGuJYbsBLLeQTNytJf3XB4nPGA8bDUiDekk1JMZTH2f127lnqn+HEm+JHx7VBf6obpJWbNjeTWhjOPkSND1Ebh2yzea1Kmtmvbl/G5aiqHhSCKwQ== 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=+IqFB49PA0+wGT8mcH1yOhjG9hMpwOSLmAr55xnLObk=; b=ntKtkL6QPJJDUYViR/g9e+xCfzyiqM/axpGZ+b63EEVygzlZYUxBixNevp17qcKwvZQWfCe87AbMRoEspdmsG30pbUoMBAfI4TqgrxUOvX4ITXCx+QkuJAs/QRWacdR43jN+nzAMrG4wZuOkYROp9eUaFmI3TQ7Bu0chBh3aZS2my8xXU0kzo/ahOKuk75jGCQzFo2BisFKKtb0WpxLjlUDstMLuTRvPKP+TC45lhFzlMCGYlK7iHxFKBNOgUS8Oy3sEE+ZyZ2mjky+Fzta2MU452YK5PU4PVlLqv7Bet1aKHltAkE7GQAMupCx/iu2ScUd8/1zV6WgAejY7hyZjaw== 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=+IqFB49PA0+wGT8mcH1yOhjG9hMpwOSLmAr55xnLObk=; b=eFJSjFH9cedr3VmDO1yAXzXU3LTmSZna0kyDVtGW9GDD1V2okmp6LmbDN01DlUgZM6wjKVNdtsQrMi9ASAhPLs4O6OdsOASF2BfttK2/rul6no1hYAIEvnXC4hwhwoPyzI/+OL698iQvPyYNPFCSL/oNVOqjNlpOsaCLnSw5Js/OS5svnWVcZusVxABTFD+yxBGcKRJlWeAQZ/egrQJydXo2jD1kF+I65og9C4IXyHaErVzNcnIf5INepcWkq59EpBI7vRryNGUBbs9Mp7TrlQq+vzOSi8IbEuM6U1HMXcMDoj2YAyP7kVbcfGG3oS5Hac6BWRb5TFewdrJQw+ffNg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR0302MB3400.eurprd03.prod.outlook.com (2603:10a6:209:1d::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.11; Mon, 10 Jan 2022 17:51:58 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4867.012; Mon, 10 Jan 2022 17:51:58 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Jan 2022 18:51:46 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [dKLW5+KvHWEuZ2yVbi/fhMFSkKoq80zx] X-ClientProxiedBy: AM0PR10CA0047.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::27) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220110175146.610875-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 53e28ef2-4359-4c8f-5f03-08d9d461e5e5 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UJ+cHfC79vTguh6WqLpD1ahCNo71l62gc5revjxsp2U/N7Ijep5IIL9mZIkWx+lhRJ6iRiyQcukFRX5BrHGXa3jFRBSg3E35idOe09Ql+7h2BGsalZCbU+WIib6gNPnnbwnH2q5cbbsNtoRJo/KHhEgdKoK3x51solh4oKiUh0kPr7RedJizYlrm+dIiYbFoHztpempKT8Gg6NV++k2YfQl+M/mgA+vUT1k1JINE9NzNIJeiX3rah4SFySKcdZYQ8+GusV/jch4mRFjToTqcvRJrG52JwO3UaDQ/u/hoCmWYu+N7IbHai4q1niCFv8/Id3ITjIlZVfIuWJtnfGwDm53XokSySqRhq9BkjGBb3usDJ7QG/RN9qkgrLrFLPtYCEBav5ZLacGYoFWiiVsLU+4MTcNItCwcGded01TE9nh8paZ5GMitay9rr/nFsLXySGEjgOV+tommOzKV0b/+nvM3r8LKA3VkaR22q6oTShI/hZazsSppl/J8TM4dexSZ8NBZvG2MRyTLd8gH08ZY/KM8NcTFa07BCKYexW3I9iBBC4ope9knVX/Zz6n+l9nooipXEZ3q82atZMY2EJ8a60DRh9bhfCI3wH0pY0U9unex3KgGiZzPP5m7TcvVl2b0Q1UzLZkos8YsJT+r0I9u4FTDGEu30FQUdHKFDr04ZHF7ydk72LPG6UhpBYWzFFW25sTlJtzifKadrA== X-MS-TrafficTypeDiagnostic: AM6PR0302MB3400:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ve4PQ2va4FUhsedgMTEBPgrxhajX7ybM3J4ReMWWmn+j9r6Drgz0v1Fmpl9dm/lRymIblF01Olc/uKzwUHRhkHS6WDNxtWPaK8vLGsceyj86D8hkAN+q63Nd3XF4L42GWTmOpjNPrKDFKaTlOHYOivpMD9XQury5riC+TrLhQqEY99WahCvoU6n924/s4Q/1V1BKwdz7WeVJduimAeu8m6eUvhfnNHs3yUoQQ9IhxoboMcgNoGSTtoEidsr+azl8Qq04W8OEovRBT5lwyqWC8S0PDhlUyNkxKQ1s1/jbT3KXS8PkDbs3AXVTrG07c6eRyEVDDCV7+ifd+EeL4ANgLU/EHjdz45HrzvxM0f25nlYULkHXABdVV+yhIHDMdDGJMCN8DhjZpBDBQ0KWNgOSQmBLB87Gw4JwhG8F+BMQlYlz3iUw1yG58cFX1qqTsKxhXQXSHyFKxQDMYVXKeWEWEETB/0TiNJmlnYymV4C+wSbAFtUGvE7KVvmLdfH8QA8piFU54c9kgibxxI9g45X9QWRZPd2/XSt4s4bf8dTv23f4T+W/AT5ymznG+C0sJDhtt4/z/qLXBexXMgMI2+o3xA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BtQBCJ5T7VEXeiUZuEceVQdBqFcq4mHQPgaEmWvQkTrTp1rK/j2+6Jxb5ml7hVO09v5+O96/1qG2pTqwqVZp4WrAgg3Ioi/8ZLZV/AG3vB+2KMaY3Twl8MaDCSHCmLA4ydYPQjAilihIB1CaMhsT8U1NTPCQwiNYMPXXnilT37lBFzyiAmuctgTCG3lGfQ1mFms1r+dE9vtQCylVqij65ZMAw9EjtlAgpWGSVXt0eU/S7r0VoIY+Xpat0iKUPzc5qvVqqGpsvbqnEfnfurf7OkIy0olKZfezioia10QXsb7ezw8HEgZFy3C6QmbIPitFFtMjEjuOZVWzuU6y8jKX0AyALNxa5ht+bVAvj6rCLyzqNFs1ZrR/xvbZKPHYNCZy0p4uU9EcHHOKu3z67cWmusZivn85mUeIrdGKE/0zRuKzbYBGrLVF4RNWPmsfxG3Rs07GvzUXYKNDiX9wZohhdPWL03Iv4Nl5LTYVvgg0vHlOihvTwsm3Q0TC9PVXGGWGjdCShAiT3D5C3HHQSZX3fRofmoayDw9H/geoiDf7OGFcfp9AWx2buxKXyUQB2H5mX8an8fSfbjZO7diRImHligYA5L1lmpKf6F+pzNqqdqI+MlP5qpNIycJVGgblodZD1BOFHGRAcNMkrwFSZLs2M0qkJEVXPU7UUQ/UXgurXkpfUSsAguV0J3C+Plj+nLZRfsZfg5RQDWll3ipOzl75w/ppvyYH8CQPFRm3vbPsX5WGY2fba5fl3jUWbY3y72TQ0FjZpQXD9nif1UfoqxRRUUbq0t1OZOdjuv9ZLbYbIbMLPD/J0YibV7CbYKJp3Fr7YUOtR1hyZgv1fANsj2dRvrlH2mZI1Apz9OBGGgF3vgoFv3LXaRJCUruRyaitWZfwGR63oyVcBsMpofTUOz8JmUzpbfyxMXyDwoVjQqrwSQK8S63V2m2XzQv8/iz3do9V6pzuYvUgD2BfTAlPFryACg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 53e28ef2-4359-4c8f-5f03-08d9d461e5e5 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2022 17:51:58.5440 (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: AM6PR0302MB3400 Subject: [FFmpeg-devel] [PATCH 6/6] avcodec/h264pred: Reindentation 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: FSMs938geeKZ Signed-off-by: Andreas Rheinhardt --- libavcodec/h264pred.c | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/libavcodec/h264pred.c b/libavcodec/h264pred.c index 2d115f7b43..d83ca37a69 100644 --- a/libavcodec/h264pred.c +++ b/libavcodec/h264pred.c @@ -445,19 +445,19 @@ av_cold void ff_h264_pred_init(H264PredContext *h, int codec_id, #define FUNCD(a) a ## _c #define H264_PRED(depth) \ - h->pred4x4[VERT_PRED ]= FUNCC(pred4x4_vertical , depth);\ - h->pred4x4[HOR_PRED ]= FUNCC(pred4x4_horizontal , depth);\ - h->pred4x4[DC_PRED ]= FUNCC(pred4x4_dc , depth);\ - h->pred4x4[DIAG_DOWN_LEFT_PRED ]= FUNCC(pred4x4_down_left , depth);\ - h->pred4x4[DIAG_DOWN_RIGHT_PRED]= FUNCC(pred4x4_down_right , depth);\ - h->pred4x4[VERT_RIGHT_PRED ]= FUNCC(pred4x4_vertical_right , depth);\ - h->pred4x4[HOR_DOWN_PRED ]= FUNCC(pred4x4_horizontal_down , depth);\ - h->pred4x4[VERT_LEFT_PRED ]= FUNCC(pred4x4_vertical_left , depth);\ - h->pred4x4[HOR_UP_PRED ]= FUNCC(pred4x4_horizontal_up , depth);\ - h->pred4x4[LEFT_DC_PRED ]= FUNCC(pred4x4_left_dc , depth);\ - h->pred4x4[TOP_DC_PRED ]= FUNCC(pred4x4_top_dc , depth);\ + h->pred4x4[VERT_PRED ] = FUNCC(pred4x4_vertical, depth);\ + h->pred4x4[HOR_PRED ] = FUNCC(pred4x4_horizontal, depth);\ + h->pred4x4[DC_PRED ] = FUNCC(pred4x4_dc, depth);\ + h->pred4x4[DIAG_DOWN_LEFT_PRED ] = FUNCC(pred4x4_down_left, depth);\ + h->pred4x4[DIAG_DOWN_RIGHT_PRED] = FUNCC(pred4x4_down_right, depth);\ + h->pred4x4[VERT_RIGHT_PRED ] = FUNCC(pred4x4_vertical_right, depth);\ + h->pred4x4[HOR_DOWN_PRED ] = FUNCC(pred4x4_horizontal_down, depth);\ + h->pred4x4[VERT_LEFT_PRED ] = FUNCC(pred4x4_vertical_left, depth);\ + h->pred4x4[HOR_UP_PRED ] = FUNCC(pred4x4_horizontal_up, depth);\ + h->pred4x4[LEFT_DC_PRED ] = FUNCC(pred4x4_left_dc, depth);\ + h->pred4x4[TOP_DC_PRED ] = FUNCC(pred4x4_top_dc, depth);\ if (depth > 8 || codec_id != AV_CODEC_ID_VP8)\ - h->pred4x4[DC_128_PRED ]= FUNCC(pred4x4_128_dc , depth);\ + h->pred4x4[DC_128_PRED ] = FUNCC(pred4x4_128_dc, depth);\ \ h->pred8x8l[VERT_PRED ]= FUNCC(pred8x8l_vertical , depth);\ h->pred8x8l[HOR_PRED ]= FUNCC(pred8x8l_horizontal , depth);\ @@ -475,15 +475,12 @@ av_cold void ff_h264_pred_init(H264PredContext *h, int codec_id, if (chroma_format_idc <= 1) {\ h->pred8x8[VERT_PRED8x8 ]= FUNCC(pred8x8_vertical , depth);\ h->pred8x8[HOR_PRED8x8 ]= FUNCC(pred8x8_horizontal , depth);\ + h->pred8x8[PLANE_PRED8x8] = FUNCC(pred8x8_plane, depth);\ } else {\ h->pred8x8[VERT_PRED8x8 ]= FUNCC(pred8x16_vertical , depth);\ h->pred8x8[HOR_PRED8x8 ]= FUNCC(pred8x16_horizontal , depth);\ + h->pred8x8[PLANE_PRED8x8] = FUNCC(pred8x16_plane, depth);\ }\ - if (chroma_format_idc <= 1) {\ - h->pred8x8[PLANE_PRED8x8]= FUNCC(pred8x8_plane , depth);\ - } else {\ - h->pred8x8[PLANE_PRED8x8]= FUNCC(pred8x16_plane , depth);\ - }\ if (depth > 8 || (codec_id != AV_CODEC_ID_RV40 && \ codec_id != AV_CODEC_ID_VP7 && \ codec_id != AV_CODEC_ID_VP8)) { \ @@ -531,8 +528,8 @@ av_cold void ff_h264_pred_init(H264PredContext *h, int codec_id, h->pred8x8l_filter_add [VERT_PRED ]= FUNCC(pred8x8l_vertical_filter_add , depth);\ h->pred8x8l_filter_add [ HOR_PRED ]= FUNCC(pred8x8l_horizontal_filter_add , depth);\ if (chroma_format_idc <= 1) {\ - h->pred8x8_add [VERT_PRED8x8]= FUNCC(pred8x8_vertical_add , depth);\ - h->pred8x8_add [ HOR_PRED8x8]= FUNCC(pred8x8_horizontal_add , depth);\ + h->pred8x8_add[VERT_PRED8x8] = FUNCC(pred8x8_vertical_add, depth);\ + h->pred8x8_add[ HOR_PRED8x8] = FUNCC(pred8x8_horizontal_add, depth);\ } else {\ h->pred8x8_add [VERT_PRED8x8]= FUNCC(pred8x16_vertical_add , depth);\ h->pred8x8_add [ HOR_PRED8x8]= FUNCC(pred8x16_horizontal_add , depth);\