From patchwork Mon Oct 10 03:13:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38648 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp166300pzb; Sun, 9 Oct 2022 20:15:06 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7X0xPQFQYmDqiMXCzPBIZPyheCV92iJgqZpGXbDOFq/s6PC4lecGx5LTzbpS7VM4AKI4F0 X-Received: by 2002:a17:907:62a1:b0:781:b320:90c0 with SMTP id nd33-20020a17090762a100b00781b32090c0mr12716409ejc.255.1665371705997; Sun, 09 Oct 2022 20:15:05 -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 mj4-20020a170906af8400b0073cd848ae8asi9310319ejb.321.2022.10.09.20.15.05; Sun, 09 Oct 2022 20:15:05 -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=ahgSY3ge; 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 46A8668BCD6; Mon, 10 Oct 2022 06:14:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2036.outbound.protection.outlook.com [40.92.91.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ECC1668BCCB for ; Mon, 10 Oct 2022 06:14:29 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mgGdJMwkA0I4ecXlB1D+D67cxWN28VXEwiCzCuf4cNEfejVbwFmnd4I3NJsoJVPOmwpdqQYFSprM9zUB+EMm47GFtOBJf+utakcxSGiM/ZcQE/qA05lRXEDqnDEqykyMgYILohKP4ilJTavvCvtRVNRdiQ36F2Gnj/RSFvCYV8nEjHCfsRNdMpCppNcZQ9bEFa9KaEcTXn25mqlHxIpMqaxLlrA7fpsyf17yWK4sPVp1TqOGx590QqUwqkIcqJA0BlEHX2mtjsxEOyUWRKIrXhwJ56W7S9j5oLFrSDxro87G4dxLgfQC5woqDcyDl5WwUv6xB1x2muVcgZ/I7K5s5w== 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=pUcMjwXL7GaSO05SlJ1yWhC31FfxHNIGDoYinFAI1yE=; b=DmXvJZLuYTwclDL/3pRppJi0ycMCglM4GZpD0m6sECXqqSinna2t0i6V08rO7GoLDnat7ceJJmMvPH/nmOTUu5SzgAhpUeb4u089d1UAAqHtwZt1PwnjCaDJg8bXq1OAtYwu84TjlgE7UXlp+vgjrdzLKkZ3pAywzLq7sIaTMF33bdVH0dq61aj0d6iv0NHyJm29VSWJUjTL5ZG6E3waim8kIboapb9Sxw2fZWnLlncx5BEkatxf1FCqqJdXVm/xx7b+7nv3rdMCsJf4e1Fmn4MdWfmivANe6h22tBtq1OSkWBhd2uD73KegvMtqx/fcTgx1sgLRYNvXLUhkEiH44g== 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=pUcMjwXL7GaSO05SlJ1yWhC31FfxHNIGDoYinFAI1yE=; b=ahgSY3geH1iXicSEDyIdJp8ZtNN4MVHrr1wAzJAfZZVgwMlzHDnGm3qyXWNXllVFrvLtUqWfR2ANa88zh3paylexOfZRTZUCiD/RW1qLtAvL+/4mNbeL33G+thcYFEIS/EusuqIh7h4vJrtcxogjUeCxbBRd7VYgzJPFHxvUvgEAQWOQB/yjG8HsIqXChMXWvK4G6zpbepkFK7istRW0wkfQHyFd1EqqA9JBDka2BwmUuKGrn7/RZdZOrEHhNmKyXQBJf2Udebz8GJbNEM4OrJSVN8J3wkHbpXmGhpFqHT5ziXh20Fb17CPz1pHzIE8233kV4zA2VJFCiIZ/ucRIzA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0354.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17d::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.32; Mon, 10 Oct 2022 03:14:28 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::f9d7:680f:70c4:44fe%7]) with mapi id 15.20.5709.015; Mon, 10 Oct 2022 03:14:28 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Oct 2022 05:13:10 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [vDdQgXMvzL5q732vT/yBtKyb9ANP9gwvcSfytPhfRM8=] X-ClientProxiedBy: AM5P194CA0008.EURP194.PROD.OUTLOOK.COM (2603:10a6:203:8f::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20221010031310.187429-12-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0354:EE_ X-MS-Office365-Filtering-Correlation-Id: ef9b5d40-ca0f-4099-1a2e-08daaa6d8ada X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmruWxLySsUhFVxtZUJ43WkHqHGvyAeIcodnmqYIaCfAmRHAp1KjAHBiPJkT4MZ6a6rIyoUWIRYOQstzUzFGqehslxrrk8QKTXLL9fcSlnmVwRMSyDRZf6rr5pOGmKIFG8yNRUbTp1UspgeGASmMqfwHUEahXFi/nRMBQ5bAhOF/BAzRO4sBs1JO7SJ1NP77y0NKfnVrfWicaCTA+wR/aww0frinVlVpbmCe/AGI3l5QE9AcH45N6NIZTtzJ+fkto/GkkT+6jyxz4mlKSBeS25Oxr0LEv4X4vqI3wQIdOzTuYaUB6XgLz72gy26wABtQ44ybXzJwgylVZToXBywNxcF5Pok2OY2GObOdtWTUPRWG6O0lmtFkI0t2bnJZoJ4caHm3OTv4H3h5ldV2heEdd69h3kgyZ67ZNtEfaa9qu5gnkdxlMRgGc7hLf0j6gRaDwkwZnaS5lZ0wg8unfX1mI7bMgN8GIQXMSYKfpLH9b0HtY7Sc6J9QqEeqdCsjawf2u++Euqu4Z0wId2PBPkBVneTTjGCzU+I8WC3pFzu6Dso4ZK92T4oo8BA2OBDXj9RUYxmDAnFGdWi2G9T2e0MpCeJfblEOmqE5ZS6F6dROgAGzOAAiVxxhnpiVOX4S0DS2ASh61ATaxQ7IWPIT5mTJT6cp+hHVDn68qX0wgpxAOnM3ER6E9X9T3JdLvLScb9cbWiTbCh540JoSoiOhzJCnQEWx+IY1O4B3IqPSZMDwVHcmxTBj86M4O/e1XM6PrYMV0As= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: P0c/yOKkprAXTGnTNLq3YDI8zJMGZlXM3ejnmm8S5rsSkfABjJOvYV7mY1k/c7QTUDS+7mPBudi/IaLph6JfwdfK5QuGmympHmBzrkYASHi0EDTxSTapPl4Kx4QZl89MX9OYNSPF4VWPGeUlkp5qUVTsxdjlPUndlID1UJrMhrCvMwA1MrarQ938llWD+7jNjCCVkttCKKgOHUL7JlU0NfxWN19i7GiAL/DZOxsYku1DyObk7Gwikn8Eg7I+BInGuLsWHNLShb1Kx2wI8YGxxObEz5hD/MYlqbNLSEzCzRczLXxbYTAUdbhar7Z5fmotFmwG3Mlnvy78SfN8FzFUei3nORQYNgToxkOtKEwY+QJQ7nQTO1BzhElZzzD7RWCyhr8kra4uHNNn30s/sXkMGZZuPv5C8leVVrsf62UoOY83ex+IdhO8auYq7kyv6TKwIc7FIOW+LQH9vpmRKj3p5AFGrJpsaigNoWiH/q+QFZhLBZCncce38t55S1BeYE/BPYEDVpuXuGVvMRNUYnuLFF7QKgPFYYlQMxxyb9MLs9S9VkxhP/8oueynGRAd04EcJdb/f/R4Yonupb3tAMw27OhLPTlvzFT8LxPqtpB2Yn0+mWhLju92jGKfl99GUwVNIX1ib4c9RtB63gSuhWLO9uczUlMpUn59XVQBxcXeMi+uzzg7hyEBDj8DjFPt84cg X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Q1l65fW7RUENEbEVbUFXrbq7MMHLaGpbt8QdEwo7JFQc6qHVvJliB4fQf21trZymY1h3rDq1ACPBEQWeX4rW0hYZa61zaawy9gvkC0T0K/qvsApz+aNbWf9CU2DBfpSgOASSuQOkKK1SXPPR4SF2DL9sFE8ait5p0+b13f4xc85TU5EFvpOMSbq6m2ngoet5JgKdlArtpvFcINJGD6WSb0vm+BeNT9jhFleGTHTD/RoydOmmD3DwRLR2TfFG3vhL4lp6J6hkEW7j35XG4mmhxHl2ylzq5WkjjLedRO4V0Z24TBAGW2Zzz5xFsabCNUDj2QwYZlU7vNs2tqYtaotz3LhFM+S3V8TJaIwJsK6iOAszbxrSQZJM5T1yvpWddLfJJ+Ao0xe25tqS0v2tswzAyPwDWpFGuMUv4euNSWx+0t2l4Cugo3CCCNxJNXiLfhgQL8gmf4jRmiz0RvpZiA4RSKT3U/gmVDcZyCA07CMdnt03O/rZM2Wf1B6Uw6HYXMbWFYB6pi9Pezq0PXJrI2TCX+lO3sx/s1RD4AG4lQAGJloRLgyrwULNx/+J0A4FApQ5NCaks7qPEODGOR17zvuzEkTPVHj09XEEEWNcljp79QQgNiKYnh/R7ltn+autOE5HS0GfeUqN6HJj15fTogXltV3L1INNfbC0hvEDPuyvL7KfPDvg2ILh3D8viybl1cmu3zxPT9b67zI6jCsKj+AmtG4dfNNDo4yJyt327vntAqyUVHzkrlkU4y9SyL0CqwVFumH0yzFXu7H3gdgr6f3JDc3ivk+7ZKiheMcqipCVv9IuKDB9iW0J7TxfeConG+4A+nnB213QLtIPs0kCmAEn29fK/5HrLX7mukZMvgipvHmQDJ0x+4k/I0YukVICkTkWC0K+HRDimBTm0ZcXCbDEI66i4UUWE2OuqGFDAn7cRWa4d4E+NKVKYhS1J5UlC4Yui4goA/uvbKgc/K6ZhN8kTwAA0GLuBHZU/mdEyECHsOGMcmhRrwVUWusGF2KmALqh3Ec95BRAlvquTCX3YLV1kIRRu684R5+rhrJlGO/vHYMFKTi86Ns9Ibq8VDTkDmo3+F7vb188vUPUF7Iggw/h7+bgDqZC/kcfLEsKghhUQld7N7SDe1tEI0d/XLsL7rubbvJt/3OvUnn2DQvuFtQpeeWLvFT4leYqs/oJ9i+Uh6tiRNXWGWk+VwlRPB2wqBP8M5+pcycnxiDoombkOG3CoIGx2MQWoqQMnTwyh+yHabrZYyH9OrwNVVhLfCJvyUkXtQe2pH0YJP+iEh463FBpQmf8F2sl7GmvYHSgyh2iB2w= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ef9b5d40-ca0f-4099-1a2e-08daaa6d8ada X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Oct 2022 03:14:28.5771 (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: PR3P250MB0354 Subject: [FFmpeg-devel] [PATCH 20/20] avcodec/snowdec: Remove debug code 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: 5i236n1VU+0n The Snow decoder checks two bits of AVCodecContext.debug via numerical constants, not defines. One of these constants (512) used to be equivalent to FF_DEBUG_PTS which has been removed in 302554835e39b79b977ed60c9afe81b44590dfef (merged in 6e69525e6984d51165de0b17b796bbc29f9dd6e7). It is unlikely that 512 was intended to be FF_DEBUG_PTS, as it has nothing do to with PTS; instead it makes certain parts of the code behave like it does for keyframes even if the current frame is not a keyframe. Whatever it might have been intended for, it is almost certainly unused now. This commit therefore removes said checks. Signed-off-by: Andreas Rheinhardt --- Actually, I'd like to remove the other debug code (debug&2048), too; this would entail removing the mconly_picture, yet I wonder about the size of scratchbuf: Before a4ce3706595edd9b537861f0e5447e31babf2100 it's size was affected by the linesize of mconly_picture for encoders, too. Is it possible that these codecs are built on the assumption that the linesize of all frames stays the same if the dimensions stay the same, so that simply removing mconly_picture would leave scratchbuf too small? (Of course I am aware that the pixel format check would need that is currently performed with mconly_picture would need to be replaced by something similar. That should be easy.) libavcodec/snow.h | 2 +- libavcodec/snowdec.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/snow.h b/libavcodec/snow.h index 8da3d99885..0c59fb7ec4 100644 --- a/libavcodec/snow.h +++ b/libavcodec/snow.h @@ -418,7 +418,7 @@ static av_always_inline void predict_slice(SnowContext *s, IDWTELEM *buf, int pl int w= p->width; int h= p->height; av_assert2(s->chroma_h_shift == s->chroma_v_shift); // obmc params assume squares - if(s->keyframe || (s->avctx->debug&512)){ + if (s->keyframe) { if(mb_y==mb_h) return; diff --git a/libavcodec/snowdec.c b/libavcodec/snowdec.c index 13948398b0..60eb9a7f52 100644 --- a/libavcodec/snowdec.c +++ b/libavcodec/snowdec.c @@ -191,7 +191,7 @@ static av_always_inline void predict_slice_buffered(SnowContext *s, slice_buffer int w= p->width; int h= p->height; - if(s->keyframe || (s->avctx->debug&512)){ + if (s->keyframe) { if(mb_y==mb_h) return; @@ -694,7 +694,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *picture, int slice_starty = block_h*mb_y; int slice_h = block_h*(mb_y+1); - if (!(s->keyframe || s->avctx->debug&512)){ + if (!s->keyframe) { slice_starty = FFMAX(0, slice_starty - (block_h >> 1)); slice_h -= (block_h >> 1); } @@ -709,7 +709,7 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *picture, const int extra= 3; start_y = (mb_y ? ((block_h * our_mb_start) >> (s->spatial_decomposition_count - level)) + s->spatial_decomposition_count - level + extra: 0); end_y = (((block_h * our_mb_end) >> (s->spatial_decomposition_count - level)) + s->spatial_decomposition_count - level + extra); - if (!(s->keyframe || s->avctx->debug&512)){ + if (!s->keyframe) { start_y = FFMAX(0, start_y - (block_h >> (1+s->spatial_decomposition_count - level))); end_y = FFMAX(0, end_y - (block_h >> (1+s->spatial_decomposition_count - level))); }