From patchwork Mon Dec 13 13:58:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32420 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp5468496iog; Mon, 13 Dec 2021 05:58:37 -0800 (PST) X-Google-Smtp-Source: ABdhPJwtohNyixLcM7PQWupPy9Ff6ir98CY1anYw26zL2nBnI/hadcfyVTCQGCV+dVFKgLH5uYAN X-Received: by 2002:a05:6402:1e95:: with SMTP id f21mr66716449edf.139.1639403917188; Mon, 13 Dec 2021 05:58:37 -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 v15si14468828ejb.737.2021.12.13.05.58.36; Mon, 13 Dec 2021 05:58:37 -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=H9Rg+gQP; 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 45A1B68AF71; Mon, 13 Dec 2021 15:58:33 +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-vi1eur05olkn2013.outbound.protection.outlook.com [40.92.90.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 886356801EB for ; Mon, 13 Dec 2021 15:58:26 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cVQrXpOmopzBoTSmmWuN7K7bzwDXiGGgbqE2hoUHJ21BX5Xj6tXfURgdgpka0PIEAnhaCOL9/inrObocb4VL+TmSDx76lFXLgvBZXNMEAr3Q5nLqbLnk3ShoVHf15vrvR8Cj2IXqAnUIwl/MaYTpkVDfTbpPc4s4VKqOA6nbDPO2FW7Rkbpx+rlnBoBk295W2PcZ6MCRVcO2FCijkRn6YFK8nfBI81fm/QtbR5L94kdwDyG55hdJhKlfkwFlg4bcpAesr9eeuIh4xJXhDaBSqYX1KclxpnnBXIbVp7b3JKhl/4WCMQQDZZvUhrZIEyESW5mSPHYxzS2epZzkBV+SOA== 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=ca1MlGRQwrGQpcFnh1jbbvg199ZKIIV1dJT13gikkLc=; b=UgQe6+XYCRqm179alG5Ff/4zs/L2wn9rEIubFYIR7sEEQPm8hBba3gmoZ4G8rbiAyLRsYloxV1DhwVCkF7OiQByYKClWHL+fmqxOPRdnSHxRixhqe3qXp7J/cnhRXdfRGIuUlHXpSzUOuxx9T3L9ZaH03O6sN7JhADuaXWC30FjW9yugDJmwaL5Np4axWzSEkF4CGqjhXDdpf90HxWYduH3g//apfyGUTp/RITDaNFo9KkiprLBSCmgeyBzRYZby5wka5U8LKz7fFfsMb0RQDeuQo0JawokO/OkI1BEgbqxHq4FBeITv2olnyimfzQUBA/P/8kFJpxRsUQxJo/BMEg== 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=ca1MlGRQwrGQpcFnh1jbbvg199ZKIIV1dJT13gikkLc=; b=H9Rg+gQPRaUPgnoFndAr7iTK2nRkXfSbwSQfVFjVAjwCC3W5s4x4DAkcO3aW5Zhban+LazphVuUdqkkjRpagYjyqY4TnaQ+RwIR5YbBU1w2tVfTUsoAHLRHJp+tR4kHOzMmCSCRW4iyEj0G4kQ8x7l4aHpd4g2xqcEnaSFJQTIKpiqlG4csaS5oTAQT/+hPqE4Urou7umdFiZNECxX+nYRTCx9hXfDe1uY88ZGZl4y162718khbDp0IncsYLztB7seQ+y+IRU1YDh9M7uTnfHynE5aDQZolnqaR0b9CsBsw8irapzG9fqhC3BvLb0zV3cnkhnZwgRB7pffZmWWPSrw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5251.eurprd03.prod.outlook.com (2603:10a6:20b:c1::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.14; Mon, 13 Dec 2021 13:58:25 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%6]) with mapi id 15.20.4778.017; Mon, 13 Dec 2021 13:58:25 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Dec 2021 14:58:05 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [YD8G/myv7qI2dzyCyYH+Elf5nulMxr8W] X-ClientProxiedBy: AS9PR06CA0232.eurprd06.prod.outlook.com (2603:10a6:20b:45e::29) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211213135805.1926941-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 117ab5e8-c6f6-431f-1fae-08d9be40a1c1 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRmQk3JzeNKq9EEHvkF/P53V5DWnaWlQOwvXGTQOQ+y/bZlGnDDSJJSrgnjajiq8QJb2RhBPaWiF6G4PB1g8YCNCyJMhxb1/KZgun9WjxC5H9vuEA5aVXdqVY2Wb6OQ7ujapKeo/5FGclVr1iL4h8LWjZcIrGTsjSVAQdq/WdixbVb08cIp8VneO7iKlwHt8xPa/XS1EFXFsKm4g7pEMHxFHCcfahqlbMHAiITMzFpqE6Z8i59te7n5tuA7QQGshJiGQcbAs1LkneDPjKQXTMzLKz9wzdIpqD0Dnavp2W4lF6ukuoOIAfUtqie/ZqbXg62i+oyvp8fMXdkh3ahLvVm26cMCIU6gUsjotkvxpfMd6Db2gMS95UPBfJIqfLjqmt3+wsP+9ParpAor8bTniQIYuLPJ2ZBeQH2YFMMXXN8C4efIOFxxIiDbX8we2OI2sZc+yzgEZ+FWL68PQe9Ydi4VJOweqB3S4I54CKl0fiaO/BWs+sXgsrgCJK12mwsDP6jRKYYPonYcrJFoxr1WHbpSJfsB4EfCbrqO20s0DVZQzMoZOuU5/ou/ukQwLVpZqNN83A6wmNY9uk+oNI252PGJISUoS0D6d637pySZX1W5E3CGPdz8B7D2pGbxWWY/0hZ27DXRTHqfMZ+yTAdtPPjdqZwadrd2nza4j5yqCRh50MHc+BSkxd7ibHU2tz1C5LjXpSrJ8NL2QMIPdhOsJw3k4hC8dbPucpIPW5FL5wlHpfA8nigNrpT+F3Z27Regxq8= X-MS-TrafficTypeDiagnostic: AM6PR03MB5251:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sDjWvK62fsXbOp7zUqKMxHxy+l1AnsphHp8stlR30l5jLERepmbRbBFJF87QHEC+Kt2I8JcXNNa0CmlSh93pLVppBFsSyWrtp/GVPqu+xYGHMhTIYTCMoJSz4wQXYVVY1FbkznOl54LdfeKTOmwZ4SCiJCkDAVuourUdfva9eDfluIiZtGqULQDPmR3++LgVAgqrUwU6FCE84WGso+qokyotCQ0HQwaAO3dUmwBNsQezClo8PfpFtr7ap314FS2t7eV7QU2fMdIib0MoGwQMao/LGbUgQ2qhPv84UZCYGJCe2mddYnAeQs+bxSP9lOGNmliv2VPHdemL0/Oj+iMCdlmRoVDptw3tM0vjLRv9/csm3T6uR+YqBnAKVu3dLzY2aDU9b+m4JSVq7pnzcSuso6a1cGhEKI9rRkVWesvLj5TI9xiwDsSp7DZ/19MuIzwLlTenQp04X/Wg+lSiFjjn0fQuaU7gHXCIgfFd5tk9XlhAzZh6DwQwfdagYvhtkL615q21OwIp36DGmkQVFPqyumD3g5Aiq6NScpLgr7nVrLKrFP4Bf31pTm/m7Qu3Wl44hqyVjsj1FzalBbFVIznncw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 25K1hiVVCdx4glA62KToIrG7IKl1CGuKFuUvYCAWWOBzc5yVYITcYVTWZqUTSRAUs+MFhAwsGkyBWkFIduxPJ25u/Ok7IQHX9P+wSxr0qZ0F1oGZ60JZZcy7nzO358rXzGGXSPIqLAZxjGvNFa3osXUCcjBSuKDfc1YNNBWxDE8im7FrzR+aWaodLjPNqus4itvDzvc9POfOeEK0I+CP9hFeEDPzVoh9QJkIBDanyZOjEZkvNfTCs5PKnEUNm+bQbp8VAOjfIcW+as4cFCYgm9vvZ0UotEAthuFptKamiAwX7eRUp0pOoVdWwhqbRm/gL+HlIuwgeDhCd4fxoc1QwSUARq14QfFSo4BuOvZCbCIOpLbOUZXNZZ7xeUZ72ecvl3lhFDBxZPE4+l6uOyCUxSjS9gOSggfUhVi+AYEY9AFNPHXjHgVcR6wSTXHW5kOWugIL8WtAeo/GyfmDSqz78gy166nH23SJDLr369pj37mDo43S0+2pCLRMt/+ZjWYmMeijrRNVSJB51NKFKEEDWHrSHOiVk3UNUE+HutVvWpZ4Y6JHdscBFkZUBJv7bDPnFD3qS3JIrJIF++tV5n+Zm1v34stIRX1gacWzGz5ztBe19uJ9sIQ9WUs0vfg4cMVYGuaEecW8PzpCsWkC9oSEyb+8n945x6DRZ5/WtMlWFkTsTqy2gBEtYZVb2E/A0OftofiGN6ncGtnlhERBEoQaGynd5tg4m92j929GxWrYIyIlQPus4PHTw6Zy5uVu3Qv3mtLymUnwr2kYnF9ntsDEAZFvk7e60HK4AhgDITejEhhlaYbekcOmwyD6Xv9oKOTex2pnq8aYRSaos0uW5Ifse/uL22FBsJWohNMHmIk7QmkcK7EFHMD0Z30CrBDYX2dSE9JM/5761p6hrk9NtTkKYFFecaUrDUbnxYsS/rJVnHeIYgrbRlNGuRwhx0P5KiPbtEZu9q87+9OOe2R6znY7og== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 117ab5e8-c6f6-431f-1fae-08d9be40a1c1 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Dec 2021 13:58:25.3055 (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: AM6PR03MB5251 Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/mpegvideo_enc: Reindent after the previous commit 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: deNW0B4bjnHI Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_enc.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 8865e38293..128d1a327c 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -3697,25 +3697,25 @@ static int encode_picture(MpegEncContext *s, int picture_number) s->chroma_intra_matrix, s->intra_quant_bias, 8, 8, 1); s->qscale= 8; - if(s->codec_id == AV_CODEC_ID_AMV){ - static const uint8_t y[32]={13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13}; - static const uint8_t c[32]={14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14}; - for(i=1;i<64;i++){ - int j= s->idsp.idct_permutation[ff_zigzag_direct[i]]; - - s->intra_matrix[j] = sp5x_qscale_five_quant_table[0][i]; - s->chroma_intra_matrix[j] = sp5x_qscale_five_quant_table[1][i]; + if (s->codec_id == AV_CODEC_ID_AMV) { + static const uint8_t y[32] = {13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13}; + static const uint8_t c[32] = {14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14}; + for (int i = 1; i < 64; i++) { + int j = s->idsp.idct_permutation[ff_zigzag_direct[i]]; + + s->intra_matrix[j] = sp5x_qscale_five_quant_table[0][i]; + s->chroma_intra_matrix[j] = sp5x_qscale_five_quant_table[1][i]; + } + s->y_dc_scale_table = y; + s->c_dc_scale_table = c; + s->intra_matrix[0] = 13; + s->chroma_intra_matrix[0] = 14; + ff_convert_matrix(s, s->q_intra_matrix, s->q_intra_matrix16, + s->intra_matrix, s->intra_quant_bias, 8, 8, 1); + ff_convert_matrix(s, s->q_chroma_intra_matrix, s->q_chroma_intra_matrix16, + s->chroma_intra_matrix, s->intra_quant_bias, 8, 8, 1); + s->qscale = 8; } - s->y_dc_scale_table= y; - s->c_dc_scale_table= c; - s->intra_matrix[0] = 13; - s->chroma_intra_matrix[0] = 14; - ff_convert_matrix(s, s->q_intra_matrix, s->q_intra_matrix16, - s->intra_matrix, s->intra_quant_bias, 8, 8, 1); - ff_convert_matrix(s, s->q_chroma_intra_matrix, s->q_chroma_intra_matrix16, - s->chroma_intra_matrix, s->intra_quant_bias, 8, 8, 1); - s->qscale= 8; - } } else if (s->out_format == FMT_SPEEDHQ) { s->y_dc_scale_table= s->c_dc_scale_table= ff_mpeg2_dc_scale_table[3];