From patchwork Fri Jul 22 19:32:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36894 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp625176pzb; Fri, 22 Jul 2022 12:32:55 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sAw7VG2WOWF0HptlLOJbaxyNeBekUy++ELK1sx3olmPkWW704tKZIMApDRxgI033AXT+Ik X-Received: by 2002:a17:907:2bd3:b0:72b:44ed:6d6b with SMTP id gv19-20020a1709072bd300b0072b44ed6d6bmr1090908ejc.632.1658518374970; Fri, 22 Jul 2022 12:32:54 -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 n2-20020a056402060200b0043bb8df080fsi5639049edv.606.2022.07.22.12.32.53; Fri, 22 Jul 2022 12:32:54 -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=p0410320; 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 1B03468B6F9; Fri, 22 Jul 2022 22:32:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-oln040092065106.outbound.protection.outlook.com [40.92.65.106]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BAB0968B373 for ; Fri, 22 Jul 2022 22:32:43 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KWCT0tFlSmHJa3J+SFjL1M4QFn9O05sWboZ2Li9QxO/iSyYIhrBVVkgjQslfQgs436Dj3Zibwu2HkU17Ne/U/G8ntermtzRqd/wU7O5Rxttz/PHGVHtyfN8IeeV1bTqI/yL33GgAQsgWERrLuKzh4z7y9lJ9nGkU7mc3mMaXvm2OS5nSh56VSFmsW9zKaacghljVm1L70uFOMIA83KKjnQEtQoI76tnQTMZaZlcmYF3ji5LpIRPP4KS/ZtyEIMgVeux+LJX5fD76xnZ29TJzUX8UA5Be9ssGhDz2di/G8v5hMKJlpwHi9EGs++NVQvf1eumr6JhcttPALNEGnhJ5og== 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=lncTUG9OXQymokbF94MJeJaN6FHDpwGoR+bE0t6MrMU=; b=n7CkUbhRsfFiTgFgnwnu0FlJ833iEdxx5FMJ1+5uAPSPt+O0rPbSRb39NFh5XU0Gi4ov0j4RZW1KJpQuUzxlCYl2vU8zeNFCNdJSPaNwTDlTHWCMhDmlkKB4b2EjJXESJUOaHYi+mSBPOZwfelR5rC25CuDboj40jTIekZ4OYUtYgBvs4ta1xIXGUfNyTojS1u4azjyE5+A5emqtwjoIUhOjjvacvxjRD5X/cqSkyJ/NywK7ZmRHwswH0cDXtEPLotPtfFrqQ7WySPxwba/3HA9eIhxKXmwzENxCNJZ7yUnjdCqMs5xqhSwptQ/3+LBxDPeD9TBJ3YOAr1IC/ptAjg== 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=lncTUG9OXQymokbF94MJeJaN6FHDpwGoR+bE0t6MrMU=; b=p0410320eMRW7Bs8q5dk4n++SC3ogwRN4YPqMuGLETK2ilNRbkBBDi1xP/zTxESSkTiSlMC4b9QIaTXReVD7sy3TM6seEWdLkwTQic1BRu02W/iPrsnvuBC91kH38uSDUsDG/Gn4bd5MK7Jr6MuXlMd+Bj/CjNbExeesqzfWwfMdpiKzHU1R+/PyMxbXqXW7BRpOBLceaUI70zlRIbTvsVXihHQy3+KmlVKElR/rwsWKKItdHFBM0diM4PuYW4S/YqZEiOmYatLXQEZQ0IqFjqDPK69HmgCgx6quP8s30g9A456W2FQcSQmbTapVIUEsSklutp3D4TZhueBfeB109w== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DBAPR01MB7127.eurprd01.prod.exchangelabs.com (2603:10a6:10:196::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5458.18; Fri, 22 Jul 2022 19:32:41 +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.5438.026; Fri, 22 Jul 2022 19:32:41 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 22 Jul 2022 21:32:34 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [3qKE0WEf7F+ya31q41S/vl/8RL9iwUID] X-ClientProxiedBy: FR0P281CA0071.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:49::10) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220722193234.206594-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5520b1a3-e52d-49e1-2c4c-08da6c18f130 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiToJ1zOhCTJMxCCEpyIerpRI7yCYjjKRDKWz8K5Y727B1gmO9ravmlaVIKs4NG4Tq0d3xDkHrithdydeht0HqwV7wWS9F+9vjlxPInuDtQ3bL++CF1SjzYJGciZZE+UycMPj+gd8UI11dfVbjwZEVF/ZcnKbX0SCob1i9gObLhgdDnJKwmczyXlnvq9hIgUJZNKO5v0Y5ZAfdsD4cLH7TrT5A6ZZvmnWNi7K+GV+YSzV7Jy6GfLMUKM+wM1VO2oI/8m4q3sVCC002rcinZMkbExBTesnda3zRl6rFkojcYjrycwVuIHNP/WEIG+p9hN1cQITMBtjGofJuwoLdq/bUTvoGLwTa6IHgNXGLX6MkFiuHl5IzjYSJuvOXQmmhapbgstfPqN9t0uTMFPkX1gpYREnWI19Z6XSBijD2eGQKBHY26VqePVYMO410q2ZKKH5BKus7BEhzulYDJKLRTiS6v6pVj/GI2uEBSFXmeGe6d1pLKmocZa8zil2PyMWxBUdSXzCClnTFyENtwILTIptFc5N1G7w6FTLWB8Uz3R2ieQ6xTudcsXk0X2GGkdnq1d50djmCXr6AEQF0eGZxGFloozuyrZqzUkVD0dpnHQLzc8OEoVcpte7iX1rnuXqwdL752tDlcOMcjVCabKZe3HC9Kio9Ceb30RLiPK/f+BGOlrkj/cXL3vD8kbgItbAv0fChz2PBp2kdkTH81Aj/+aP8fpYxwuXD7aGXrZiEZhRuRcALr5bpAq3bwymsmqy9FT//M= X-MS-TrafficTypeDiagnostic: DBAPR01MB7127:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: l8q9d4th3+B9qzFdz6jyFN+RroCooMLpcFOrhITX9T8QYRtSucNssFpjk4mkHI+IBvjhCI70VanW9conL3IwIozPgGd8MfTwUtmudW/SKHw4oqxh5hA+ExJotF/DWnjoXCfABuJmDDji3zz20A/8w1vmTpvRex85+gsMb6eNnla+Hyf3LoODV0Jdn1shFfDl3k76AaHZ7ycsidgnbvxuJWNACfPYUwyHs9PGtMLL91Fk04bhZFkacFEVX25SHfirpz54vOM/W3qzmLpYNhMnXDPoJGlfsBqu+5UfNj00PU/IkK+Ztegro3jH+hNuGifMXDGd15aKlwu/FrVU3TYW/YVB8w/qz8QPLAkIn8GcgYRpNcFUco2vNb4bRdF+Ve3EQDcWh5p9qNtNtA2PINRJ+37+q22zjCR50hdz41YY6AgyPpHCfJS0qSj+FveF5cDYQNG90URjnc/EcEsl49V4ERaqZFYv9sxVEGGXK1OfS0gJXvJWKipOlpXRzloY49al/HAe/fSBYy6w5qk6HFr3x1sON40F0g+ySKe8mkdiC3MofsRR5maYPo90RndZe7jW7NWaV/WWuwz+sxf0UYD0oJY3RmXMmaqSrHvtg6Qw3FZ97CVb9pntNtQU6obihbNGXKVSNyDVVMfzq5X9lb/qUQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: /uF5nuoE66BsdZQV6axK/UtqBtPVn3VQziiiKGH1pTO45aC+3Y7K+Y3JPEAh/zYIyG/ti+C4nTlSU4lVsAgyCC6HYB+srXIwA3agXjJAuAeTexr9zaNgCixWSj1IigsM0GXgt6Ae5DSNtHAKLeT4vDdB53D2dusUErsSUxtzD25wRh3xIUH9XCzOgGyistI2ihpqd/bVf/hnnm5aOLBO0XO8GqkbpvvKa2SOOSnsWuPsAsV/6z6IVLGKhlcvSA9Ozw7hjoCDY/Yz+lAyRDawQ5ooMi+eFjSLzgh5zOUH03EigyHpJREYWeJIismzl58GXjkS5YB+gvQFPDD04iwgfpFFkOsrBywkRw82GBkmL1H+jYiWLPNOAanpzXfQSMAGmdXcvpSgd/mKg0mHFf0iC6LVuaR38vzfLO6pltAlydQ7BvWKDBESVVUY3QiM8xLNpPCeb9wjrFFLB3Zfso2ryYBSwS/qXG/SQEyneQ/zikWSkNWgUi2jRYHY5OXPHJSOgJDdPEBsxf4IFP/hsXYyawzdWvr5UwtCf2ts6DhoJutlf18ETj85F6pGpTiq55/RpVprfEenzDWVpb09VHWoiQcqN9Udsus6goR6FCKhKAKVIkAAocHsB/UrqehGZVB1oMZwsMC7PXtdYpLLKUZ+zySWmwDQ0PKNnaPOugJNNL+hSZSorj0bUbEnp3kua9C0PzeMcFcZH3KSSD3bDhVeW0c0CxjH60h7Edvmne36AwkgsV57d7V66Z4anKKaC2aiLAO/50gzXA+5IW3gLI5VtxhlqYR4OaBC1oubCoXZ49F7pLeXJ+a1IkAYQSdHdXQbreWaROSQG/PD31XeQDvz2TGgjAFr8gz7oajSnlUjABlXrqhEU5War2yssUlta/TGfAl2WSR4OGc9QPNPqkgnyhJSd5Hor+7gfGnN74uENGrljXr4C8vV1Yw72tNxasXwr4KthbO5oapIg+LMQBwwb9tqkocAttobFRVj0VSToieLLKua4xPXAz87MmWiommQhC2VNnyjovTrwdvyDkdsL9Emfk3yUay6EBlgU13hJIImlCmff/iGbO7nQNcdjU292xF3RDb468+OMDFPMJ7N3c6UbxIb2gUurtJ2xEC7e/J3U7s94LIa2QPsys2bHGF4PXUkGbEhC21ZlOAmH6IivZw4J6HXE0Rc0Vx88bdU8lT+HjCo7a7zBVGBZdQNyyft1pFhtA8NMm5j4kfrxm08pei+ION1fqpnN7rei1ZTt2l0+4Q6YI57xU5YxPTPO3pm9CeKzxMyUODwD8t20yjBtLu8QJZu7kJQszHjxG/2QXM= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5520b1a3-e52d-49e1-2c4c-08da6c18f130 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jul 2022 19:32:41.0796 (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: DBAPR01MB7127 Subject: [FFmpeg-devel] [PATCH] avcodec/hevcdec: Output MD5-message in one piece 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: FkvLR3jDhT8V Otherwise, there is no guarantee that the various av_log-messages are not interrupted by another log statement. The latter may originate from anywhere else, even the HEVC decoder itself, as happens when one uses frame-threading to decode the BUMPING_A_ericsson_1.bit sample from the FATE-suite. Furthermore, the earlier approach suffered from the fact that various parts of the logmsg were output with different loglevels and that checking stopped after having encountered the first plane with MD5 mismatch, although it is probably interesting to know whether other planes are incorrect, too. Signed-off-by: Andreas Rheinhardt --- libavcodec/hevcdec.c | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 2d06d09b75..3c95398b96 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -26,6 +26,7 @@ #include "config_components.h" #include "libavutil/attributes.h" +#include "libavutil/avstring.h" #include "libavutil/common.h" #include "libavutil/display.h" #include "libavutil/film_grain_params.h" @@ -3374,17 +3375,12 @@ fail: return ret; } -static void print_md5(void *log_ctx, int level, uint8_t md5[16]) -{ - int i; - for (i = 0; i < 16; i++) - av_log(log_ctx, level, "%02"PRIx8, md5[i]); -} - static int verify_md5(HEVCContext *s, AVFrame *frame) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(frame->format); + char msg_buf[4 * (50 + 2 * 2 * 16 /* MD5-size */)]; int pixel_shift; + int err = 0; int i, j; if (!desc) @@ -3392,9 +3388,6 @@ static int verify_md5(HEVCContext *s, AVFrame *frame) pixel_shift = desc->comp[0].depth > 8; - av_log(s->avctx, AV_LOG_DEBUG, "Verifying checksum for frame with POC %d: ", - s->poc); - /* the checksums are LE, so we have to byteswap for >8bpp formats * on BE arches */ #if HAVE_BIGENDIAN @@ -3407,6 +3400,7 @@ static int verify_md5(HEVCContext *s, AVFrame *frame) } #endif + msg_buf[0] = '\0'; for (i = 0; frame->data[i]; i++) { int width = s->avctx->coded_width; int height = s->avctx->coded_height; @@ -3428,23 +3422,26 @@ static int verify_md5(HEVCContext *s, AVFrame *frame) } av_md5_final(s->md5_ctx, md5); +#define MD5_PRI "%016" PRIx64 "%016" PRIx64 +#define MD5_PRI_ARG(buf) AV_RB64(buf), AV_RB64((const uint8_t*)(buf) + 8) + if (!memcmp(md5, s->sei.picture_hash.md5[i], 16)) { - av_log (s->avctx, AV_LOG_DEBUG, "plane %d - correct ", i); - print_md5(s->avctx, AV_LOG_DEBUG, md5); - av_log (s->avctx, AV_LOG_DEBUG, "; "); + av_strlcatf(msg_buf, sizeof(msg_buf), + "plane %d - correct " MD5_PRI "; ", + i, MD5_PRI_ARG(md5)); } else { - av_log (s->avctx, AV_LOG_ERROR, "mismatching checksum of plane %d - ", i); - print_md5(s->avctx, AV_LOG_ERROR, md5); - av_log (s->avctx, AV_LOG_ERROR, " != "); - print_md5(s->avctx, AV_LOG_ERROR, s->sei.picture_hash.md5[i]); - av_log (s->avctx, AV_LOG_ERROR, "\n"); - return AVERROR_INVALIDDATA; + av_strlcatf(msg_buf, sizeof(msg_buf), + "mismatching checksum of plane %d - " MD5_PRI " != " MD5_PRI "; ", + i, MD5_PRI_ARG(md5), MD5_PRI_ARG(s->sei.picture_hash.md5[i])); + err = AVERROR_INVALIDDATA; } } - av_log(s->avctx, AV_LOG_DEBUG, "\n"); + av_log(s->avctx, err < 0 ? AV_LOG_ERROR : AV_LOG_DEBUG, + "Verifying checksum for frame with POC %d: %s\n", + s->poc, msg_buf); - return 0; + return err; } static int hevc_decode_extradata(HEVCContext *s, uint8_t *buf, int length, int first)