From patchwork Thu Dec 23 09:13:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32867 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp7106813iog; Thu, 23 Dec 2021 01:16:19 -0800 (PST) X-Google-Smtp-Source: ABdhPJz1TaDafsKx/STQIQdJ2VxNxiPqHvUzvJbcA329DeyTMQ8odfqGoUdOYrHIEaCvFhpMq1qI X-Received: by 2002:a17:907:760b:: with SMTP id jx11mr1203808ejc.99.1640250979717; Thu, 23 Dec 2021 01:16:19 -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 sh18si2228204ejc.593.2021.12.23.01.16.19; Thu, 23 Dec 2021 01:16:19 -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=EBoMUrYv; 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 961E768A636; Thu, 23 Dec 2021 11:14:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2023.outbound.protection.outlook.com [40.92.90.23]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 147D968B17A for ; Thu, 23 Dec 2021 11:14:22 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TTRVi5H9VSXvR2KweBb26rq9zmfzIUd7vT+1qOtgXeNIj9C1+DRtZq5vngKFolLxHu/o3obKmcMEjQTFaRoSnQSLkeOItx7AfQkdeMDxhITc80m5kSKLic/DSzoH92MUJ4uiRyxNgYrgZPZsqNFCPO2HnF40LG/cgR2BQmPIshpfJ3jaOWmQQ0tMusOv4k0pgdFjc6B1WqZ6UKD4e98RBwiuONjER8bZ0ZdzyFKM5KIcp6Won+6XDSccBF+Yam8z8BPGkZIiCBam+DC3Z+RWc+FIeU5jlMzsxugf/1nGfknE1drwv69fik8ZGDWcepcuyRMNfKeBiNGCJDUJIutnYw== 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=cxc0a6W2gVqWvMzph0CN3zbxRNnqGpZq7/GzVFXgZ0g=; b=YwKU7MeTsHZXcLdzBxcUaSIuwDGZCHIbspiL8WebszHrYc2OvOTy61CMdibY4Jy/42rNmYs967LIhiUGDwTb2mhJJ4tDFccP6Nawe09FPD73TofVaCb3oRvPJuwgaCHzboVt2jy7840AZxM61jXL8RgEefUA+NuU0CEQMbsVQP3n9PpJP3ayAx8qO+MaomfZpHARM6XBKdUTmMkiTygd3KrJdyWGDSne9V0kH9WBcD2q7vsyV8QOw9tkAs3H/P0aTZ1ulwGmC/yF/43QnCtbDDX8s8U/EgaX+5EFoWP/wBKKOtxm8qsh9PMsB2xLfDolsXH0e9wV4HSYHHRum9Ss4w== 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=cxc0a6W2gVqWvMzph0CN3zbxRNnqGpZq7/GzVFXgZ0g=; b=EBoMUrYvfF/4Wx6Spbfa0zh77R5uCG9DC0lUtCwbL+Gq4gaCvMUIxy7cks7VJShqqbgo3hRtYlHjmVQqxF46Bc7ibqzGPR2Uw0d01Pt1zvPBbowmxaPEvv5LOnj4hXEC/3zsM6ERI432FWrJNVY5Y1f1mMKIZu7T5d6Rm1XTL3tF+D0b0EcfeSAmC1+kXU27sup1ezLHfhiqDIdaWua9nlC7SRG0asV38CJMNmEQdhrdJpH1x4bLAVFM9xOnJWrrpAsAdxr01oUzVXDRJDrGXCfgcMiNvNMmNgZuUpqmON2xu+ehpOIPaoyMrH1HmGjY7DhAA+R/L7eJYy2lZOuHag== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5607.eurprd03.prod.outlook.com (2603:10a6:20b:fe::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4823.18; Thu, 23 Dec 2021 09:14:21 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%5]) with mapi id 15.20.4823.019; Thu, 23 Dec 2021 09:14:21 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Dec 2021 10:13:38 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [jyc/u0M1khhYA+L5h0qr4bn3d4SN8MIz] X-ClientProxiedBy: AM4P190CA0016.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::26) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211223091340.1450013-14-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5178b5ed-95ef-44e6-7d98-08d9c5f49b43 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR3EehW4kxQzdNcP2D/mG1JXOPMMpMEL1xbJ5shcvhYK62SabFWdRkuxTjg4DEASjoPg8zc1OnHmOnj7jHjQpWTmbfAM8TjPcFYmvXBDR6HsTM1X7tAJJAUPEjySR3V197gcKOuSLmHGcEZM6XaTkvVhbep/CTvHK4KDugObFRf3q4u+Giz/SGXcWv0SVkk8zu3cQlySzMIMK4922NrE3u2RWLGa1SSErkCPEj5kgB9RrKz7dJbhzBPcBoofTHlwaZax7dLbw+T0DZP4ydsGOxJI/xGM0WSziex1Vl/3e2HVhwBT7HRxfGHTwONvMCxUNNGEoD4gwkZYeR+XajL/zcpSzYHC0R/Wuy6y9PU4/7wLO7hwv8XKonf0LYSN/XbDyzcl20PPs4UBL2uHiVrXnvnWqjhAPj3CfTu4fLXNBvaFW5i5F5fKtgEZMSTAj9a80f960RrfYrLXESykZajyb3dAidStfQspsgJeU9n9b8/6HsnekL/JU4RnS20i49FOjkyZTzh/Kg+izkttWby7+7twEjaz64eMNGjON8C5p3UFbqHn8GLyzKLtGLkhKAsmSujKPcm1pUQmPj0/vLfu9f8SdUGO/0oTCfYTHxdU9+WV6Xjbvtwv+UIYyuoh3Kz26mMHtZubkzXpiN6iOcxJHLVSvEsqdX8LprapRgaopOZW5BkGei2AXOBjy88ffUBJVJ2yeLPrekm4d4K/hdi0Mb1X2jwwn+47mjJDCmf542LRsvhp4+DcPnAuBm/fO2Pwvo= X-MS-TrafficTypeDiagnostic: AM6PR03MB5607:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cpiu4xA9jtQiudR55f6vurDaJKSx2bgR7k1G2aWtbRq0LJQYLzJafxTpLyacByqUVGYyqWjy/1bPfmeK9ZDAXDzAnixsUqZbL2kbHofnCVyZOFBAANbv4wTRuulqcDc5pTjty9R4yTY8M48OBXia8U0R2lJujUqL9CQ27u5JXs+VZKjDmbw+GH3MzbLPips+TY2IzfLvDy0sxnKHNAvujrdu9AAeSGFyFtYH2zCDd4fqc+29diRV88/RAKVmzZxzCH2daD21XgcrvvAbHz8yhWpd8/dXrvMS7guBch7Q/9W44kQvcfR3jZ44HJx69U/mZypNKo70PbenIK3kKxAsjQtpdTFenEalcDd12wdWS7rkCpKAu59TsVQ3jVGDSUcHhnB37s2qy07ixfjwOKm8UWf1El6WFT2vaKSOpsBHND1IZKjBwB/6Dv1R/HS8HhtEUtelL6XuGwhjrFmH2nYQY+55aCeNXyiaNbC53No/aJ+2AoQx2oCA4r0vuA0GIIroy4/nZOj3eIA4c926pZUfLPrG+9IhoI0SrHU4vVfib2Kz3nB877IX4ydFv9QZzEJT8T004INNY7b+RfMokhh4gw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: lMk8T8CgYtzIc6An8qWcP4A6vrmZVGUkq0YsMBlQleFpG5AyOtlAZ47DZAm4QGmzjJ0mI2zovGiYbZiRuMchbK3g+IzngSVdLguNnOBgNhyBr1SrFkCQkyMmgTXo9GbkfoCDiOtsi9018J5fiN7VwmyedWidVGCO+E+DHynUqydX8BRulobgP1ha+VEKD8nly9k2ZFL3HPMzK9jnqgBXY3k92nPJ7VvF4C+1c4yG3ycqU1B/uK+LWlcGtEPufLdsIfxLdYhJxGSvQKROF7IOAFakFfdB3BB2LxQkjOU9DbaXeLkZzAT3BQMNjjkEkbpuCTzD+P9ptB10PZsyRzFDW9wGoXL02Mf1HWv+oxRAx6oACnmc9tp77j+XenuEE0NwSYRzfBq+59r00X3ynrDypJW/kfE9JmzJ44IIV1ammWihRm1CVhpB9sT0jWu/MtLC9NmqCXHHpYb6r9RWWERFPaHUc9nbid+1HaNTTh5QiEkK0PPUobnls9ECH1cjKq47OlXJs8VsMVLCswcdu12sgrS+4kf+rJdFRVlJjPkYkn3zD3YWomnecC9ObiY4XXHXNQ1BP7eAFHDZb3JXMM6m2bnOYBqPbU2ZXV91PC5w5OktheKbTmsgYBCFyolhiqlnxPKpM9naUMt3mlKQswuLoButylCJvYtTnn+lVEzfl1IBRss98zXsC72aPRsgxY2wtXO8xkMe1aDJZuGneJ0bn4Zfg1kN0HKR7wIVlab7dShBRI659Bd0WCjzbbu+WDQFnHE7HuyqCq6NyW5+VhzeBKPEk8RNjHRngZ1Ap10SEghl+cBSNi6bMj4KeW2CkRp1P1WX3Xc6PF6IBV4zqTl0Tz/jMwDJxJb2oBd6MZ+rG+RmFAlBD0N/ppMEjf57BDkag4lTljMCFNO1RpU17YDtYAGlVdeXrYAa48O4yVuRa0oMM7f52f/wYKiBgFHv7za2Ho78Zayy7p0CX8iDlLhKtA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5178b5ed-95ef-44e6-7d98-08d9c5f49b43 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Dec 2021 09:14:21.9094 (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: AM6PR03MB5607 Subject: [FFmpeg-devel] [PATCH 28/30] avcodec/mpegvideo: Try to perform check for MPEG-1/2 at compile-time 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: uPqhOXtLmIty This is possible if CONFIG_SMALL is not true. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 5e1a1522a2..73b91b459c 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -1962,6 +1962,7 @@ void mpv_reconstruct_mb_internal(MpegEncContext *s, int16_t block[12][64], int lowres_flag, int is_mpeg12) { #define IS_ENCODER(s) (CONFIG_MPEGVIDEOENC && !lowres_flag && (s)->encoding) +#define IS_MPEG12(s) (CONFIG_SMALL ? ((s)->out_format == FMT_MPEG1) : is_mpeg12) const int mb_xy = s->mb_y * s->mb_stride + s->mb_x; s->current_picture.qscale_table[mb_xy] = s->qscale; @@ -2076,7 +2077,7 @@ void mpv_reconstruct_mb_internal(MpegEncContext *s, int16_t block[12][64], } /* add dct residue */ - if (IS_ENCODER(s) || !(s->msmpeg4_version || s->codec_id == AV_CODEC_ID_MPEG1VIDEO || s->codec_id == AV_CODEC_ID_MPEG2VIDEO + if (IS_ENCODER(s) || !(IS_MPEG12(s) || s->msmpeg4_version || (s->codec_id==AV_CODEC_ID_MPEG4 && !s->mpeg_quant))){ add_dequant_dct(s, block[0], 0, dest_y , dct_linesize, s->qscale); add_dequant_dct(s, block[1], 1, dest_y + block_size, dct_linesize, s->qscale); @@ -2183,7 +2184,7 @@ void mpv_reconstruct_mb_internal(MpegEncContext *s, int16_t block[12][64], } } /* dct only in intra block */ - else if (IS_ENCODER(s) || !(s->codec_id == AV_CODEC_ID_MPEG1VIDEO || s->codec_id == AV_CODEC_ID_MPEG2VIDEO)) { + else if (IS_ENCODER(s) || !IS_MPEG12(s)) { put_dct(s, block[0], 0, dest_y , dct_linesize, s->qscale); put_dct(s, block[1], 1, dest_y + block_size, dct_linesize, s->qscale); put_dct(s, block[2], 2, dest_y + dct_offset , dct_linesize, s->qscale);