From patchwork Sat May 11 20:51:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 48774 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1706:b0:1af:cdee:28c5 with SMTP id nv6csp299454pzb; Sat, 11 May 2024 13:58:50 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWD+6NIQVusrVnYsZZZyT8+3aHS+BA38pDRUQ6M4YdAGtzdMuJiJ0+6inPvBlM+/GU6MkvcvrQ0pxLGOtuZtL+F5eIRxc4wMSvnLA== X-Google-Smtp-Source: AGHT+IE7GBuzM3eEUbaiAf5fVS3wQslxpdNx9DpgY3He4PJ2cwQ+FQQTJVyR8k/ickHNuNc4+mnu X-Received: by 2002:a50:d543:0:b0:572:9bd2:9a90 with SMTP id 4fb4d7f45d1cf-5734d6ecbb5mr4169285a12.31.1715461130615; Sat, 11 May 2024 13:58:50 -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 4fb4d7f45d1cf-57359c22d20si1923625a12.134.2024.05.11.13.58.50; Sat, 11 May 2024 13:58:50 -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=jiZ6o8yo; 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 6A8E968D7A4; Sat, 11 May 2024 23:54:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2064.outbound.protection.outlook.com [40.92.90.64]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 958FF68D7A0 for ; Sat, 11 May 2024 23:54:50 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QN2PwhtfdwyXbocj4PbMNOc2CaElPFQxrNPmnXM3z8yWnZbGCiVNpTXb8I8/k+2lWnF4Ml8++zRn9Hpu2pC/RFuZvBOwOSbaOY2Ro8bOob6l2IUoOtfdq7UdMj3+ZAKHZ2zvQii/ITENqh5dHc5jlfDyGLPAc8M6pZki696Usj+54pEuL/1QhPU7nn+CPq6ZFTSZ+NlAROdOitHSX9/VdgLKFwWuz9/AO0dcjGl+4OYvLxl5nXNNfV5a19adSoWYUA8KfgeN3925fFaIXluLdBkNiEybRHpYjk9iJ5pd6EB4k0f8ERLYUx4DmQBZ57FcleyraeN+iJLCCEw2ZBNXNg== 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=LT6kmRUsOyo5twdNqt1n18dwG/MenfKUTs4y+6RwTnE=; b=YPkS/Pi6ZPy7NRzT+Pzq7gtK89NBUyVtrnWUvob3NezQ0Tz/UL+PRxIN0mUUR7apG+JnFThcc1frq3ZD5p95YzJwsNyzd71/0JLNB3wquVVpg3yg/4i83m7wPBNAzuEIyWb0/dtbl1/wYvfS+oHHMuUTwoKI5NMs0/+NteaejtnK4wif5/4HmkXy57D8VQBTF0aSKb83lRcWaXVQGd/lGSeNze3Zb65CwfuWztKjuvceO3Bna8MSzYf72UkiYvpndE2dwaSg297nn2RFrkmackgKWuaFCnGtRqyNdklqoH1+aO+aCE/6q/5MXtrdeZjiO697kBJTqtDNObXYetQzEw== 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=LT6kmRUsOyo5twdNqt1n18dwG/MenfKUTs4y+6RwTnE=; b=jiZ6o8yoV/ZCNYeMzWwAnRsEeL1kmAQM6OmlWDZwMIEOm26NWtoTHt1w+4RNXqxmefrth1Fx8zG36++GOI5szwDHXYH6+49npByBJQDBkoX6oRm/CddsFnkYAbwkPLYt2vWmIwGw4KMvx4K6NFEuDqm0dJoGvIoqbFy6VbBfzRl6S/u4RI6DyfNTIrxN5d58eC+KNYDekWt7pOUdQp7MMNxTbzjuEQwMtS+xrfwXVi210oPijUxxmsLZYhBw9R8xN6ORk3olRZwS8pSEKghV8G9tQaxmU2QKaQCw5Xyg4Q86L4u/8zVcnUFxxcXe/66Oho86BjtplzNHGORXaHAC0Q== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0070.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.55; Sat, 11 May 2024 20:54:48 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%7]) with mapi id 15.20.7544.052; Sat, 11 May 2024 20:54:48 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 May 2024 22:51:12 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [aiGUZ2GJuYtAyc+LXSAxkvGygLQntS55scTuhv5ZzCY=] X-ClientProxiedBy: ZR0P278CA0172.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:45::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240511205135.2411886-47-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0070:EE_ X-MS-Office365-Filtering-Correlation-Id: 466b3530-bdf5-4b1b-290e-08dc71fc986d X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: FolVKt4viRiswAxle/iElZb1kePltFn7xaCdf6VFH6/TxlkW8zgpzn0fpC2P+9g1MdVsR5o9kz7tNrIz25OJE/FcMOaFOxZdfmphOuOawJLulgqUdRNMzmjJM2/IqYOXcT7A+bpfbi1Bc/2Io6uR0dlLroF9hmcJQCUI6NDgKs4DG8O2s9nYoEmV62Pfx4B0ZFZPPR0FKBIk56g7wI16DzU5rgUhyDsrv7lvM+6hyIsNEGch4n8CQurX2B8LHBdVF6qqqT03Jd+wTwQFgbLjep/qKSK6IJ2kOKkgHHCDsoW5s9YUK1QI0CCGEYMUIUTgnslvA+fodtxW5tTQrm+oxvfMxzmkEkhBpFerNwrqdKXeN1W9UTONyau2WqiSFehdqtYuFwwvvasYCpJqVOIgC/5IdpMu+by7nyd0VhZuhhacTJjr9suYlDpE254GOkzdBkVvFJAP8iylwnHU5G6IgEQmEozBxV0uuULm3WZrHqXpy+5Rx6w6792PFYooJuYkmcLTaa7sxjN+8YHc7F1N1n3YTCdPMaLvQv/BgUzRZQEiINTILJWvL+SIVu8t9K609luRuUw/wJdoNR3upRrZv39wo6gIXGe6ycgg09P5U6YdHyjhNlPs8AndCJk4+5d+ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: e/8dHjpBMlpXwZ94wfgdTm7dw7MSd6RCfRJNicfleO8xM5ppBC+CexBccn3GTkayZdsAoI7cCA3+6UdQAa80EaY15xsa6blhIur75/F/meJGxni2ADyg9fJeM0DcL+2p8aCX5pWuET5fLgos69it8PKoc/b8OLzI07I9jVgya/rI9Gj3rNmNzUfWuJ1OV/wl3y2TdAtupzy/hhx1h0cFmrQ+Z3dB2JCAEvpYVhHYoID1Xz2chmjXOcwwZFrtxj04GiQ1FUiZKishDMFq2idxAsyHJ4GBJyoMlLPNw6i3y9r2zl4+7bB+eAt+5dzAq1Ad3wqLGrmoc0h15+v7o1ykS/RySpk8CG4cWR13Ny+9VlzK7G0RLf9hVgjuZ8T7ncC2pqVZ7yi8KI2SWeQPwF5R/lq9rNsHeryu7BbvwojbS01aE6Z8GIW8o6b+iNdIDqoWYOI/odfLzx5iamx0s8gYtonE278dH9EKp6SIBJ0elolXxxGC/cD3LdxPHibZGAJxY0d5QhpZVe+l+p36BvkQTAEGY8+Z3VKFoWH8C1PuxOaRPIjYEXdhT9VDdILlTRkuBk7T94PHZq9mXG59lfL3muyBAmQFZw5JGKp8obm9osDFfxq6AGxNxWESD3wO5YgG0VzVLXsFkiQbrramP4tjlYZL1m7ocbOOID4zhHbRm6W4rNs0t8UHUGPJ8kFZZtrZ24pKLNCJf189hzKau0+uHkoTEkifYgbW7BvAiz/cwGJBlPTiG9ZAsIQtpDpzNaaQ6gcFimgZhr8xf21QnkiAAUAFhcsx1UbXFns1p49IIbY2o89hB6odgaHzpy0CHGqOfgsfACY8ktQwO3YOGra1b5NzXzatgP+W9l/k147X4vOc+II4ECryIkmbknJ/dNwP58nxhtLdrYrWWfKWAHG7L/HruUMoP7z5HcBi8Nic15PCN8wU8vFrWU41JC9ndp722nMIjuxdqeXhgM9JDuTEKgE9OB/+AMDjaEY2DqGT0UWdZfKKrsglx1vp/96y0jZ9n1vOLHbxKWjnw7ei3lwgOdfEBHeXfNsMc+I7QF9o6w2I3QAZ/0UsXxx3SdKcXs8gJsyYdPPDPlaFFDeePFSNepY3qBNNzlqy7vyW41Z/YlNH1sTuIvXdPrclz5+PlxSwDiu2A/iLuPzk2SWre3+/E/1quVhBWOwtFuBI4EL0oYZ4cnCB1q45PDvt4nV6S6hS/44lva3jw6oexGLSIaBEhuIZlEanG3f69ddlUiJa4zMclwpgJbt7FBP2K1sUrTSgca2SPdf0o3hYHPKAwgPBXw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 466b3530-bdf5-4b1b-290e-08dc71fc986d X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2024 20:54:48.5201 (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: AS8P250MB0070 Subject: [FFmpeg-devel] [PATCH v2 48/71] avcodec/mpeg12dec: Don't initialize inter tables for IPU 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: lzHTFDtQlcdt IPU is intra-only. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg12dec.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index e3f2dd8af7..097e4ba19a 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -2751,13 +2751,8 @@ static int ipu_decode_frame(AVCodecContext *avctx, AVFrame *frame, m->intra_vlc_format = !!(s->flags & 0x20); m->alternate_scan = !!(s->flags & 0x10); - if (s->flags & 0x10) { - ff_init_scantable(m->idsp.idct_permutation, &m->inter_scantable, ff_alternate_vertical_scan); - ff_init_scantable(m->idsp.idct_permutation, &m->intra_scantable, ff_alternate_vertical_scan); - } else { - ff_init_scantable(m->idsp.idct_permutation, &m->inter_scantable, ff_zigzag_direct); - ff_init_scantable(m->idsp.idct_permutation, &m->intra_scantable, ff_zigzag_direct); - } + ff_init_scantable(m->idsp.idct_permutation, &m->intra_scantable, + s->flags & 0x10 ? ff_alternate_vertical_scan : ff_zigzag_direct); m->last_dc[0] = m->last_dc[1] = m->last_dc[2] = 1 << (7 + (s->flags & 3)); m->qscale = 1; @@ -2846,13 +2841,6 @@ static av_cold int ipu_decode_init(AVCodecContext *avctx) m->chroma_intra_matrix[j] = v; } - for (int i = 0; i < 64; i++) { - int j = m->idsp.idct_permutation[i]; - int v = ff_mpeg1_default_non_intra_matrix[i]; - m->inter_matrix[j] = v; - m->chroma_inter_matrix[j] = v; - } - return 0; }