From patchwork Mon Jan 10 22:55:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33196 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp3164346iog; Mon, 10 Jan 2022 14:56:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJzg2od3b5yQpXOLe94Fb7BVlC4WOet/CQHbIqfJmXljqCsCX4pRImbfQTb9t9SS+IC3XM1O X-Received: by 2002:a05:6402:7c6:: with SMTP id u6mr1748227edy.160.1641855368411; Mon, 10 Jan 2022 14:56:08 -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 j5si3859831ejm.844.2022.01.10.14.56.08; Mon, 10 Jan 2022 14:56:08 -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=LFdAbwtD; 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 E17F268AD96; Tue, 11 Jan 2022 00:55:57 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074097.outbound.protection.outlook.com [40.92.74.97]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BD7E668A51B for ; Tue, 11 Jan 2022 00:55:51 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oGGlIeKGzfQdDqfm+wz02DuRycprxIKII0LBEONv14H6T+0JXAol7pkfUzf2PMWtBzs+P/VIXqhNFXsFhZM1pbMeAkTsmSpUJi8fa1cUFInipApO8de4iB1pBQR8lcSIpF+I7EYUwJoCK0Es8IQHoMeT/ApyX7dSVqfVmTxlHqy9OW6+riedgpcdaH2QwurKVHprosC9VRkj2vJUgluKOP3sLeeiel3fYYl459hwQ+0KMIuqUvKIm1rOEqSZsGxrEiSpOFkVz1fqBWa59ErjjdKhwIOkK7NDmgwRQ8zRFc/Kitf5U2anVErgxSHmAywz+/HodHxniL8zH4b4alpGNQ== 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=KGWVjsmO39K/OuXPemkFKGe6fgbpf9XA5GgKBofYO+c=; b=a8+MILOAKgLvWg6lRC79TNFs+evojFLQ9cnvmIufExQdl9pXNcsZ3tDAMPAi3lCQ1kNrmcH34zq/v04wOQJQgnbeKXuWkPGWa9et8p11Nx52M6rfigwJBFFYSB4mER3efKzsD+zAdDKsqMgyZmf4RhR/UBlCFgYGNZbBqy8UII7xfBLlQa4fviBdsbYD8a8dgsHPemGQC+LGQ9B7/WLdtNtXVDzgGepHnWfwThrnpMsxQicziOLs4hoW/qWkEdciJeJW1jv/4vPEzqzid+op8qU+RrmeGAjY3HInGQ4Qv3TVAG8vMdKOZzDG90emSiLSlTeFljj+Tz4pqrY7t8Debg== 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=KGWVjsmO39K/OuXPemkFKGe6fgbpf9XA5GgKBofYO+c=; b=LFdAbwtDjlWooX+18hnEK8jtv53u8bjSGvnl25+9Js9nN5comGsQrFUBoJatTPa6tt8YcsVBNXPYrNsIcsS675TiW53qyz5YbZSg0RZ9JIvYgr2DvdETVWw+p4um9gyRLbmZ/tULpfu5BQmuB2xIkeH0XR9dNwPIDx9EgSjff7CueZgsY4Wif3SPtVYfnF2Bg75CTHTF4KZBJIwOAwSOGGXvRPpzaNrOI/diICJrQyaItFqiifFz1K5UE4wVKkzFFg3UDNO9DIeu7uXpIm0om5CQCzCruWWXajDuockO+5w7bdgn5PQYx/LoK9XXmnxS24aIDtE8jKyNmFi2zfPPZw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM7PR03MB6181.eurprd03.prod.outlook.com (2603:10a6:20b:142::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.7; Mon, 10 Jan 2022 22:55:46 +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 22:55:46 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Jan 2022 23:55:35 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [1Eowdivscs82khbbofxr5Cb0cT4Ex7Yl] X-ClientProxiedBy: AM0PR02CA0021.eurprd02.prod.outlook.com (2603:10a6:208:3e::34) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220110225536.887209-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fe0f815d-ac52-49bb-60cb-08d9d48c566c X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWm3GLoeUntTG6KfWWWbWhlboByDTzUa5cZFVpG+pS0sFkLmDThoLlze8CbLuGDVbSfiJP09znTsvSwHXYydJd52V1k0Fayd2Dcpm/HAV1VSW6mucKDkPKaxFzJGNpdJuvj9Xiq67BTTf+b7JQ9LRY34cZUm6lR0kWYHF1Vn8UML3zkzczZeBGDPTj8zE7/Zj4RUW7SnTvMXxBhLrq2hfFN9JMFreM2hjmVQa3aNiMHdcGYileKTXmvJVKazH2Lo4Xb7QEoMiLmv2kTYAzfENH5ITWg3LCEdUv8gVFXnVKG36iZVxXJpWBcBPO2nHnEyJpo8hXlbnBC/xp0phJtk5a6dAAmABCskgwjY6wkc45SkwIIVmRDY+YC8kh/lTBV+MMY9MNcm3DcjcYbagHn1uJc4WCrsQftdrdaAZufR7zkSZTppVg/gK3nobpyw68BWHnJlZBVTDduY6NL3dk6pDsYCqqh/XV5CJ2U41hIPOZaqe5yzmgsgM7T4VNV6UAqgtYHxKzdpMwIzpSPL38ynwCQPxSDNwC4HkTEnllzQBI7cW/0Qc1qzpzG+nCrb2KLDdM/jokUsp8bdRvi94CQra7sAArxs1lg6MKJdlfsCnAEqWDF/3kOhYh+jCszgs2pjseavqOLqTbLCh9SeuINZ47CJLq/SOt0nc0zc5P+O4UUYIqyPF5CNSFviXAT65BgHKl1w8yvIfhzZW3morDzp7nEZ+LR8zvh3EY= X-MS-TrafficTypeDiagnostic: AM7PR03MB6181:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jA9liSUKL3pj9lybEel4MAxWVM6v0FDMxs0l0XoHMaX+x3fKg0ATE+OyfrqWbP2hkFwnbeKUcRMAMY0DnpAAldGGzNxqT4j50ZTxi5Az6dJjVRRNAV0c/jBjdxBvtXH49uoE6JqXaIYOF0e7UFUxA1wJMzjjxvDoUCGQc54jBCj8hZRo25zCoTbyrDTQT7GOQL1k2hO2NuiBenOmGWf5v3XQywj9A5HNkIeVoFTQwMNUzspHzGrGWsU5QcIgwWNpymnDUiFzLK4ZWHmAIoAWSBjWXLr8Xp7SHeD8R1APOsKB/0T0ebkg1yNiOU7oRgA3zs0EOvRUbAD01fHA8XnExJx1O328xohPT/sEffn+/GHTiMZOw8i6MDTjVcsRohyIe/yoGx3LxPBAu7K2mwjuv/4lou8eeRX4gNQ/S9hPU9jXipAaNkqyhcMcW247BdwgPgqKYcgl3L/W2C3xCQUHqfNcLkexOI+hboD4xrLRIx8ywIsCDsIftHBfvzG3kbUuzJcQV3uvdoMX6ljGV20SIs3u9lGV1Xj/BjRLRtp2hmdlRQgjVM09CaXiPqME6XtKsgBCFEacRA/MX7yHbeGLfw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1sR9lVGwBs0lMs4jUVOgmSLo3OTigq7VC9MShFGiap8CgwYXfguSstIjvR3hqzJ2ruucuSbfggnSIoURE8XVjxAspTtTqypxcEsYSsOd0CwcfO46//Pm//Jbc60opIFFQMwPXzN6KTgqP2DGRonNhzMHP5SJ94a3f3ahFF3bhcu3EljMZ3U3rzjQA9cpobAUaWjuo9PgKaJzroNhmtxK+mSZVx5tJri4esXT0tNTQJ2V9vsc0ZZNxCdBBI5kIF3+uAn6QUeLpme5eVXEdAYhX7gWyHb6bPoDLG3xk01bVg5102JfxNJU/fhF0mEYbOb7bfpatuVNzhrMwKLBlrkuRkBmFUdvfZhuhaMrvJGZ+OKiF7vvWAzubKdYnh/Bq8d+AXxCz7GSmjO+okudvAPMKVPYx5IHW48na9/YJr4CcHaJyr7/SJDzUSg/0z/j3P1bd7jVtztxuk/DMnTOsMbp890VDvZpSkK5zkztK9c1NNQJCDkLmc52xGmNg+Rf2K3BEOCWWjI64YSNTkzbr08++jVwOMOujS4WHx/3LPgbnXWR6JiaIqheNZd8Aqb+Kya+2huNaX3xp4+HCk2yX3ebWexuYCFB62s1yZwxtMBrMCKT19sCy1veY2PeOf+7Fw6TDG20ExaXZIlQg0ZADRlvdRbmeAkJ4WqmAt2I4jr07HglzPR2tBso/HPyG7fLog+jgLAL82FQXonmEdKgoQ2JEMO6H0bY7n4GH6qc6G7QOrkPQMyDyyi5sHb38IR9Xfm+EZG/vMkFKql+98ZLupYRojG8UBG3MDijYkLMp5LU+IATfwQyJ8NKHQq9wLwJIP/Ty79N/e/+LY1qYNvvjuDukx5yJ/tmK4U/9ByWnICC8B0LXGKH2yHeUAb9cOTYeTNHB/Ec2G2Bz/intY9ZgtM7Uw2ISIJ611CHxTKW9GCkMFAUrkG5w6BNNZV9oFJQPnnnM/GruMGj658r9AilojjAQw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fe0f815d-ac52-49bb-60cb-08d9d48c566c X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2022 22:55:46.1963 (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: AM7PR03MB6181 Subject: [FFmpeg-devel] [PATCH 8/9] avcodec/mpeg4videodec: Avoid multiple consecutive av_log() 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: d9A+fXP/8CwW These messages belong together, yet they can be torn apart if some other call to av_log() happens between them. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg4videodec.c | 59 +++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index 515a09d8a1..737689b35b 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -3276,62 +3276,63 @@ int ff_mpeg4_decode_picture_header(Mpeg4DecContext *ctx, GetBitContext *gb, continue; // no startcode if (s->avctx->debug & FF_DEBUG_STARTCODE) { - av_log(s->avctx, AV_LOG_DEBUG, "startcode: %3X ", startcode); + const char *name; if (startcode <= 0x11F) - av_log(s->avctx, AV_LOG_DEBUG, "Video Object Start"); + name = "Video Object Start"; else if (startcode <= 0x12F) - av_log(s->avctx, AV_LOG_DEBUG, "Video Object Layer Start"); + name = "Video Object Layer Start"; else if (startcode <= 0x13F) - av_log(s->avctx, AV_LOG_DEBUG, "Reserved"); + name = "Reserved"; else if (startcode <= 0x15F) - av_log(s->avctx, AV_LOG_DEBUG, "FGS bp start"); + name = "FGS bp start"; else if (startcode <= 0x1AF) - av_log(s->avctx, AV_LOG_DEBUG, "Reserved"); + name = "Reserved"; else if (startcode == 0x1B0) - av_log(s->avctx, AV_LOG_DEBUG, "Visual Object Seq Start"); + name = "Visual Object Seq Start"; else if (startcode == 0x1B1) - av_log(s->avctx, AV_LOG_DEBUG, "Visual Object Seq End"); + name = "Visual Object Seq End"; else if (startcode == 0x1B2) - av_log(s->avctx, AV_LOG_DEBUG, "User Data"); + name = "User Data"; else if (startcode == 0x1B3) - av_log(s->avctx, AV_LOG_DEBUG, "Group of VOP start"); + name = "Group of VOP start"; else if (startcode == 0x1B4) - av_log(s->avctx, AV_LOG_DEBUG, "Video Session Error"); + name = "Video Session Error"; else if (startcode == 0x1B5) - av_log(s->avctx, AV_LOG_DEBUG, "Visual Object Start"); + name = "Visual Object Start"; else if (startcode == 0x1B6) - av_log(s->avctx, AV_LOG_DEBUG, "Video Object Plane start"); + name = "Video Object Plane start"; else if (startcode == 0x1B7) - av_log(s->avctx, AV_LOG_DEBUG, "slice start"); + name = "slice start"; else if (startcode == 0x1B8) - av_log(s->avctx, AV_LOG_DEBUG, "extension start"); + name = "extension start"; else if (startcode == 0x1B9) - av_log(s->avctx, AV_LOG_DEBUG, "fgs start"); + name = "fgs start"; else if (startcode == 0x1BA) - av_log(s->avctx, AV_LOG_DEBUG, "FBA Object start"); + name = "FBA Object start"; else if (startcode == 0x1BB) - av_log(s->avctx, AV_LOG_DEBUG, "FBA Object Plane start"); + name = "FBA Object Plane start"; else if (startcode == 0x1BC) - av_log(s->avctx, AV_LOG_DEBUG, "Mesh Object start"); + name = "Mesh Object start"; else if (startcode == 0x1BD) - av_log(s->avctx, AV_LOG_DEBUG, "Mesh Object Plane start"); + name = "Mesh Object Plane start"; else if (startcode == 0x1BE) - av_log(s->avctx, AV_LOG_DEBUG, "Still Texture Object start"); + name = "Still Texture Object start"; else if (startcode == 0x1BF) - av_log(s->avctx, AV_LOG_DEBUG, "Texture Spatial Layer start"); + name = "Texture Spatial Layer start"; else if (startcode == 0x1C0) - av_log(s->avctx, AV_LOG_DEBUG, "Texture SNR Layer start"); + name = "Texture SNR Layer start"; else if (startcode == 0x1C1) - av_log(s->avctx, AV_LOG_DEBUG, "Texture Tile start"); + name = "Texture Tile start"; else if (startcode == 0x1C2) - av_log(s->avctx, AV_LOG_DEBUG, "Texture Shape Layer start"); + name = "Texture Shape Layer start"; else if (startcode == 0x1C3) - av_log(s->avctx, AV_LOG_DEBUG, "stuffing start"); + name = "stuffing start"; else if (startcode <= 0x1C5) - av_log(s->avctx, AV_LOG_DEBUG, "reserved"); + name = "Reserved"; else if (startcode <= 0x1FF) - av_log(s->avctx, AV_LOG_DEBUG, "System start"); - av_log(s->avctx, AV_LOG_DEBUG, " at %d\n", get_bits_count(gb)); + name = "System start"; + av_log(s->avctx, AV_LOG_DEBUG, "startcode: %3X %s at %d\n", + startcode, name, get_bits_count(gb)); } if (startcode >= 0x120 && startcode <= 0x12F) {