From patchwork Tue Aug 9 18:34: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: 37197 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3d0d:b0:8d:a68e:8a0e with SMTP id y13csp425976pzi; Tue, 9 Aug 2022 11:35:13 -0700 (PDT) X-Google-Smtp-Source: AA6agR4BnIeigk7YG5jFo1JNs/NdS7lGRuhgQyIEj/GSM9naXIzJV6TiVrVIji+5ct95UzEdxbhU X-Received: by 2002:a17:907:3e91:b0:730:ba28:28d2 with SMTP id hs17-20020a1709073e9100b00730ba2828d2mr18545626ejc.10.1660070112794; Tue, 09 Aug 2022 11:35:12 -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 h6-20020aa7cdc6000000b0043da6d85bb2si8175233edw.631.2022.08.09.11.35.12; Tue, 09 Aug 2022 11:35:12 -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="ma5FEl/q"; 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 9478468B371; Tue, 9 Aug 2022 21:35:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2104.outbound.protection.outlook.com [40.92.58.104]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B17D268B371 for ; Tue, 9 Aug 2022 21:35:03 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CmXBz3a9AHiagWn0uLMDeuoHLzO/+dET9RyujdgLQSYyVCSoxSlBeG7dExM54VInWcNTJU87a0L13hgKQ0HDErH57kL5ImrsD3GSGTmHQE2wPGSmzwpINib62GUPpgMdRPiCQT3nPi2SNDa9nY4YnNfamS3vzTUuDoJLCJ81rLJoMxoAUJQii9fL/qVTSnpXm9lHBqAaWKMCnAbnYVcejCPFG8wk959xS8zRo35z6EdyLgS186hYsfyn+hBAdsX7HzrbuEsSEEels9h2wJW9cG9OYxCdWidUP22q28ve1v4hQlfY8y1ZyvEmBtQTKx8ctVu+KQk9e7MVXSbLnjtmHQ== 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=8l9M5E4yJZQFGFI4PBfHWfE8VAhURMzkIHAbYiEqxjo=; b=jv9SdEZPRMU9oVacpkaJpioFnRlhN/9y/L5bDwH/Nb2e/ihjGDb2oTWshRooyZWllzcpCuUoWlbTNOr6fh2ZcSO/VkRFfuQWf9e07MLeI0BXgfJ+U10qAyYvjRCkuEzSKFpYvccZ1CC4nN8Uz5rAXOrV4ivzK1kcwCH5nGZkf1P72rn6hCYMcZulez5wIosGrgOesTfUh5zLSX+sLSOweH51NVdVrIuXoJBBA9N50/hBa/8jffqoHNmOhOqERazzXZJZaUuiT92g9CVoXc6HSdFlICKGC+T3r3ZzqLfhpmFEkmYXfl4hxq8Se/5pudVawD758F1yuBa4EKh6H4xUrg== 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=8l9M5E4yJZQFGFI4PBfHWfE8VAhURMzkIHAbYiEqxjo=; b=ma5FEl/qEJPEd2PJ6A/OJlBHjWo3LTkO3kQHbFmFv1ejqefdFBUJKW1jSIgvpxJVik6XRQq73Cbiozvw3eRNkIcNRkzVCrzELBSmuOPJxN7CNADogR7g1N7zMzgHbVNZeI43HjJEhnHH886mL9sAJWBsMbeju5EdDHDlD5PYW/uWHyiRoWTuKSP7/h4NrqRTTpGf3fSdBqXRWn39rGBSvSpBszTpAh0L+tX5GB0h1heFAjndomrh5uX/uif/iJscB0hkV7hcrDpVLm2I9b4ELMXKHfY/NLkcATBv/K1gwOO7WmmzDCDWSmp5aExILC9+astfsGnU2tg7k/F39uwg9Q== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DU2PR01MB8093.eurprd01.prod.exchangelabs.com (2603:10a6:10:276::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.16; Tue, 9 Aug 2022 18:35:02 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5504.020; Tue, 9 Aug 2022 18:35:02 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 9 Aug 2022 20:34:46 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [Fjrftvsh5rCAi05VZIUrUbLwD30J4TRT] X-ClientProxiedBy: ZRAP278CA0011.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:10::21) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220809183453.220687-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e946bceb-ed4c-4b10-5376-08da7a35ded3 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNXow4yDQWpczRUJbygObe2vr4AuZwNh6RBFzutJbV2T+1aMmHV2jBtXeE3NT/IRU0NoahP3L+AmveydttH1jyE5lxpU01THEJkNtEZ4h/DlFjnj6XPB7eGW6RZZNFHoX4HkR3t2gdKdjTsgYe5BU4f4+QInRsA4f6kQ6s+Z3ns/Iv6EHphE8CPva3ZOrYMpAdrQN2dBZueLK1rGMjywMyAe9lCIwpxcXiHP51WITQMYOYssA1gzMno7hkuOE/pWGsDJDiuYRi32pTWMpZWaG6yRNvHueHDLY7eMEHxQ+sZycYgLAnKo0vp5WZuJMTapuIU5H4ynV1B0TWeVfX1MzVJ19YUJYUVAoa6otUYWrWL4O0ZMfD71PPJ2aUBrlgL6pPwMnhgQUMzw3H2EZ9eKSOvEb96IjcGriSHHAhj80wICfLi8q5aWxfmEpYZmGP5aODcRxEe8uaZFNqwrZy/AYomZu7cygMEcQeCq+5+Z7fp6wFJjViBYVXjDRVKf23Glyc1kRO/XruVgaaOjoLguCRrau2zNy9/RU+hVmkwOP44R/Gq2kybT19Mm6/eTdcQ0UmB35F5xo+4ULAL0PcFgjtGi5BDEfM5da/phsRizxT5CMxxaQk0PNrUXm2ElJIDOPW6IUydLbVQzCloRl3Ow60+67IiTRS9mq4rVxfhw1WpmncDs/a+BiEqVSt37SuoBwRfVOrP/Dn/CaJweJ3rjxqhN1XZj8xKCH14= X-MS-TrafficTypeDiagnostic: DU2PR01MB8093:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: l6D+yMdOGKDVeRWCrcnTU6adFxxOLaZLOn2Q7tROJH4nhJaBRrAQ2RcGCyQ0ON6MmDxqExvQK0cJHOlbuOfCIQ2GlYXY7w38ZHvKPHzOyoJvQpF0pu/vr5j6gOVHqRRbfe+Pcg7x9vo5tHjQsPMM9BC8ZzUN7RFolo4YoXC0IA1wCwzwl0i2K5v25ZBcEr6YQkDLdB8UWuUl+/FMtwBvGr0B2tyRpqIKxyZDVTmofQiEzB7pU43B9tlBGhNgE923qRAVNtTAbT+cWv2v8GQ+1joW+FUp+lWGjig56ESrRBP9ZF5w0fgbUueFGPGfK5vz4L4pXTS7aSC0uL/bWn0eIxxLHblOSNJvSjn/gOeWPOtH0xMi+ZbVTeeHapoyiQHCGWgGg4Eb3MX/nWGLi4/k6PkG+K1rw+u9BCZfLwELgG6ixFTmd6kLjpsNVMiD2gxgmCNJxtuFFXdUdAQ0f1ZGpib8QYvTlpeV18oyFmASFbxOKT5ehawvRXnXWcL8Vo4eEMPnQyJRd/zFR5ATdnK9uVcSsHV1rkwRu7QraL8Z2FyxQLkV4hdaB7hpGgY+KfiZzC07yIy1i6lYj33jWPAtxhl4iSFVXEPhNv4tRe59usl1INv5HyvkKit7G8Trh1yECfhBAaTEmmvhxTG6sLJs1g== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BZcO1Pa2rmEhYcFd2AbxYydmFraYz0k2hXiDa5ss6DrJgibjc0mL/PB/f3/l+gu1fudNDHc66SveYmiBTMqqbBnCd0EAMkk2HYhRVTH/lCfyLQSGk2zWXFP9G17vSysuzzrX7ZY6NsiW0j9O8vmmNJnYZhUzZz8X8C/YgkS7DNyLMYJ5+bJEg/PH6koFPCQXla2gh0iKPHS0VDnx/rTQlKEV1jrQAbAQhuoJTLchCCuKRAZCbsO+uC5ZIqHRCrQy2S/dgktBb1p55KjKWKPVllf6n9Bl6Jx0mckzM8ugHEaOIV/eKY/mCfH1ad2Dh+DQVF/r+nfOi7L4Q2cg1mIC1KoUEpA0VjhkULH3RmPmxUTE1UUoda4w8WP16YZTa2tkCLJrH/WiDQZOwXb9PyV+tzys/26FeTiRGT3An9EzVYhorl2h3ObfbEiPNUcIO8pyCg5SG05ECXJmCB3F48lB8fXJd09PbRUkvRVPfa57RgTCt/h1Fc8ZU1yosOfxGAzXkJCHtSCsfaefBQCBM/Ql4Vj3nVqNYSwzbqHMccAmgFp6HMTST3zxcynDWTD+I7Du2+qHXxS0yv/YEOx6gEOwnlhS3cPgSS9pjKTSefB7buahgukGUb5FFgDKcB4rDSwm5l50zquHDyXbDP/krqdmIIo5WRuW1Sxa4p2yolA7U0rw5GLpk9riGy8GG2yu2Nl7Jg8Gv/rkSwah02YgwGVTW9GbaQGAN9MA5fgHtpHXqejA/8kgjAdk22pw9fG7t9QZsLC50dLwFgLqhKpWC4dHvBQCelAQzvw0s6r6rFlZyrNU+1/sR+WsUM8WgyZs0bUv5fcjQuEzDajE1S/lP9Wf/+QtIDWl0DUthy8+hgUQ5Ajrd+AY5P3ZJXzOiRtHylJkAh/dUyIVLAVvxKGJXHog7OiYmcUdtQcJesMW3WK6WCrK4jonWJ0szmpu+Sh/NV+5E8ztNQza99kRcEoLBS+QvhYIsANf90hFH+oWxdS9gG7O0r358Kp+xXhxuGDQ16jMTj+n75t+Ew5ZG2plclHaIkQuNMz57gxueJ9LOfBqFg1XPc8JYrnN6auW4cvGy1OQPNWeu/ev+DMGUukgsCm26la5BdYgCoAb3j77nPUHC+yokLTW/l8ZSoXxqBxLaY4zhY7Xb5rskOvoFjGbcMG4QlUqO79aNDNmBiOMOWDRpO2OCRj1gdop8KSc0lQW6Z7YZCWYc8AWxKSvdHGyy9GjtwOqUjEqb7hy5y235UF9KSHK+olwzV9hPptCLCuTsMGSpXT4Fr4u0qHoS85OW8US2q5dMlaA3hqvFjFkjgtbsL8= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e946bceb-ed4c-4b10-5376-08da7a35ded3 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2022 18:35:01.9405 (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: DU2PR01MB8093 Subject: [FFmpeg-devel] [PATCH 2/9] avcodec/mpegutils: Combine multiple av_log statements 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: kI+C0HjtiuaR Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegutils.c | 101 +++++++++++++++++++++++------------------ 1 file changed, 57 insertions(+), 44 deletions(-) diff --git a/libavcodec/mpegutils.c b/libavcodec/mpegutils.c index 4cbc474543..395bd38ff5 100644 --- a/libavcodec/mpegutils.c +++ b/libavcodec/mpegutils.c @@ -100,6 +100,59 @@ void ff_draw_horiz_band(AVCodecContext *avctx, } } +static char get_type_mv_char(int mb_type) +{ + // Type & MV direction + if (IS_PCM(mb_type)) + return 'P'; + else if (IS_INTRA(mb_type) && IS_ACPRED(mb_type)) + return 'A'; + else if (IS_INTRA4x4(mb_type)) + return 'i'; + else if (IS_INTRA16x16(mb_type)) + return 'I'; + else if (IS_DIRECT(mb_type) && IS_SKIP(mb_type)) + return 'd'; + else if (IS_DIRECT(mb_type)) + return 'D'; + else if (IS_GMC(mb_type) && IS_SKIP(mb_type)) + return 'g'; + else if (IS_GMC(mb_type)) + return 'G'; + else if (IS_SKIP(mb_type)) + return 'S'; + else if (!USES_LIST(mb_type, 1)) + return '>'; + else if (!USES_LIST(mb_type, 0)) + return '<'; + else { + av_assert2(USES_LIST(mb_type, 0) && USES_LIST(mb_type, 1)); + return 'X'; + } +} + +static char get_segmentation_char(int mb_type) +{ + if (IS_8X8(mb_type)) + return '+'; + else if (IS_16X8(mb_type)) + return '-'; + else if (IS_8X16(mb_type)) + return '|'; + else if (IS_INTRA(mb_type) || IS_16X16(mb_type)) + return ' '; + + return '?'; +} + +static char get_interlacement_char(int mb_type) +{ + if (IS_INTERLACED(mb_type)) + return '='; + else + return ' '; +} + void ff_print_debug_info2(AVCodecContext *avctx, AVFrame *pict, uint8_t *mbskip_table, uint32_t *mbtype_table, int8_t *qscale_table, int16_t (*motion_val[2])[2], int mb_width, int mb_height, int mb_stride, int quarter_sample) @@ -211,51 +264,11 @@ void ff_print_debug_info2(AVCodecContext *avctx, AVFrame *pict, uint8_t *mbskip_ } if (avctx->debug & FF_DEBUG_MB_TYPE) { int mb_type = mbtype_table[x + y * mb_stride]; - // Type & MV direction - if (IS_PCM(mb_type)) - av_log(avctx, AV_LOG_DEBUG, "P"); - else if (IS_INTRA(mb_type) && IS_ACPRED(mb_type)) - av_log(avctx, AV_LOG_DEBUG, "A"); - else if (IS_INTRA4x4(mb_type)) - av_log(avctx, AV_LOG_DEBUG, "i"); - else if (IS_INTRA16x16(mb_type)) - av_log(avctx, AV_LOG_DEBUG, "I"); - else if (IS_DIRECT(mb_type) && IS_SKIP(mb_type)) - av_log(avctx, AV_LOG_DEBUG, "d"); - else if (IS_DIRECT(mb_type)) - av_log(avctx, AV_LOG_DEBUG, "D"); - else if (IS_GMC(mb_type) && IS_SKIP(mb_type)) - av_log(avctx, AV_LOG_DEBUG, "g"); - else if (IS_GMC(mb_type)) - av_log(avctx, AV_LOG_DEBUG, "G"); - else if (IS_SKIP(mb_type)) - av_log(avctx, AV_LOG_DEBUG, "S"); - else if (!USES_LIST(mb_type, 1)) - av_log(avctx, AV_LOG_DEBUG, ">"); - else if (!USES_LIST(mb_type, 0)) - av_log(avctx, AV_LOG_DEBUG, "<"); - else { - av_assert2(USES_LIST(mb_type, 0) && USES_LIST(mb_type, 1)); - av_log(avctx, AV_LOG_DEBUG, "X"); - } - - // segmentation - if (IS_8X8(mb_type)) - av_log(avctx, AV_LOG_DEBUG, "+"); - else if (IS_16X8(mb_type)) - av_log(avctx, AV_LOG_DEBUG, "-"); - else if (IS_8X16(mb_type)) - av_log(avctx, AV_LOG_DEBUG, "|"); - else if (IS_INTRA(mb_type) || IS_16X16(mb_type)) - av_log(avctx, AV_LOG_DEBUG, " "); - else - av_log(avctx, AV_LOG_DEBUG, "?"); - - if (IS_INTERLACED(mb_type)) - av_log(avctx, AV_LOG_DEBUG, "="); - else - av_log(avctx, AV_LOG_DEBUG, " "); + av_log(avctx, AV_LOG_DEBUG, "%c%c%c", + get_type_mv_char(mb_type), + get_segmentation_char(mb_type), + get_interlacement_char(mb_type)); } } av_log(avctx, AV_LOG_DEBUG, "\n");