From patchwork Tue Apr 6 21:55:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26789 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 7FB4644B689 for ; Wed, 7 Apr 2021 01:10:31 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 55A1868A5CC; Wed, 7 Apr 2021 01:10:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-oln040092068025.outbound.protection.outlook.com [40.92.68.25]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 77A876806EB for ; Wed, 7 Apr 2021 01:10:24 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DzKh0GMBLVQ2WmQ0tBiOPl0s1rBdm0mUlSPaAfEdzI53lHSUeh2dqZWoQnsGx7paUGpY8LSsFuGER268d6CTRD880BHrAwapLrytLKnaC3J9ITOr/slKTRn3O3xZ8/I1bZbIHmY+khSnQe+/dmlZyoqG3D6xCmfZroTetv/+jDCcUezwacE3BLq82OodPl3WFJ2BY2AaAEPe0H8JwD7X45E54iBIHiV+p3aPn4rQt3Lpt6twnemckjzLrnjqzd2MT+hhUJ86JkALdl10KIeYZKfzmlWar8CeE/HpcqmNFiN88TmWs6RPR8KPUFDRhLuKmlRBJIxwNJCzfktjve4Qjg== 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-SenderADCheck; bh=A4gOGZXN7MHX9ksu5wvrlb1alzjx8RdMRd2fKZ8Ja6g=; b=Jjqpa8OV8QzAedkMd3q41ExUcHiqUXX1k9ya1Wd3iJugccas8zq0lULWEgq9jL5zRuKvfL5Uwas8eAXcIS9vdhBMZyee7QhU1UhQanbJEr7C5r7KW8lR9CAxmgufoamZCdXkWWjzRy9OfvGAe1GMtlBo+kt+PZ1T3T6TP812vc//VNQ6fj9QxwzrumrJtoYBVPkmKcnukj3qyW8YBi+286RmwD8yuk5P5hnyq1Vc2YaCOcXphd2ZvAObBS3AAGEzNbjQ2ku35ovZMOOQ83hYVP3a9ZxekwkoUTZEfiRYvxLd8rLl2UPOnvthnX9xh19nShi3NnsCOB5SJnknZ3IJTw== 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=A4gOGZXN7MHX9ksu5wvrlb1alzjx8RdMRd2fKZ8Ja6g=; b=cfW3SPnKQnLAQXgoFd7tm8q9f3TKdAXwisJJEgpMiiLFGIeWWhl4q5DyaFQiuBXv+tJr1oXJs9RvZQQp4Y9IGpkrXZfYYHcBqtF1dGAeet5nwY9uTSob0p9F5hbPvW5jRE4B9txFvEutVvnknJhxf5PRX3jIofthlap/pxURU9yILUCIRtUCHhIDK3diFbALUITtXoRjYfv1+yHDmlIyvR/AeQwbrhOdd72zNkt7KMWkpNIeNovpmmtZbiTNYGeIF7HIuJIl9AA/Agbf/xigARPz/AmxwX1Mg7WexFE30EDjPAkavBoh2drXjqzt2w596ySXXjch+u8AVCGAaeT64Q== Received: from AM5EUR02FT037.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1c::43) by AM5EUR02HT189.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1c::391) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.28; Tue, 6 Apr 2021 21:55:38 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e1c::46) by AM5EUR02FT037.mail.protection.outlook.com (2a01:111:e400:7e1c::182) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.28 via Frontend Transport; Tue, 6 Apr 2021 21:55:38 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:709D39AF708C2845C3C4CFB7D1969985E32E539BB050238749DD396DCCFA6888; UpperCasedChecksum:E02AA42BF1983F11E3FF724B5C75BEDBF3D81AE7B9296709E3D00C59EF5E1AF6; SizeAsReceived:7599; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::8128:5de5:4e94:9a21]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::8128:5de5:4e94:9a21%3]) with mapi id 15.20.3999.032; Tue, 6 Apr 2021 21:55:38 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 6 Apr 2021 23:55:08 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [0RL5MjLn3Owmd9fdLx7m98BUeFvvoSDo] X-ClientProxiedBy: ZR0P278CA0046.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1d::15) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210406215516.832944-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.137.96) by ZR0P278CA0046.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1d::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.16 via Frontend Transport; Tue, 6 Apr 2021 21:55:37 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 50669f3a-d0f3-40fd-140f-08d8f946b6a4 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRct5ooVDkA416xUUNF5iBF3CTj8GD0Ti64aDgYoNZOaJEobCyGwrcKVCgfCMuX4Rnw2hV9Z4Xmam4Q928gUTn11VSseLSOXsSApnZkYOLUWhLPo3eFy0+ydRx/GQgHsaXwEoBmnfaJ+bUfBDpRfSxe/KyTtJsQIGIfppDjhNPTFx8RmIrqZdiokaRwUrRwe+qwBHDMj3ufpWx/Ya5qd6R+PCwfUxvnk20iLjYjz6wLNqdZ/z6mFJR8F2wIPqfnC4TK23pcDgOXohXKYmaloWbN1kkAauw4npxcqgEc6yg3/Uo80IHz6u3KrIvgGs05GV9sj70tKsq0Yg/YmeZbTmrJCMBzulL0GjewEEFchBh//i3ut4fbZ55YnS9GRYTTXn7O+ND1JiVISz5hShSCujvo+Jvf9EJKsL5dDdNrAYpLDMP3RXPOrS4ABw38TetWo4MWaKaZ5ikz0Hk9eZ067/ukuCYXSsNIWqaZ4VNIsX7ZOtzjjikIgSf8ElbU3oCDSEAeLIcN4pynZgrkQhG9k4kBt3BPZerhVi2kM8vUsQoWqeXAPl93GS6oHDHSgkYQW77mc8uZ/BIIt9Txg1+RbqO/qMCUMx50vhlyYqWVP+7WRYoLBVc1Ofn41tzU4i2OXqfPD3zKs4Wgb+wGcHyxe6bswlh21JeIwrdjreTwj71Q0oA0aqUAF32g0NsUDb0+McBHTb+QGgfM4x9GVYU+SYhS3/fep/1BFeKhBOJfowz1lHPXozQDEWxpn5Yu7phfoac= X-MS-TrafficTypeDiagnostic: AM5EUR02HT189: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rdp/NAgIrc8q6cKuyk+tzOFHi0NqSfOqK6qOZPoAPLd82Po4GF3vvzO7yRkIKlMCBH4q3b9u/+XjS4z4rhPgM7CeJyzY49c562K/+ZqDyXU9JJADMQ4imc5Asu1bKaYOOkabiAKNKUbXsYztMLF/4yDH5PVxf/oUCEbbHoAohzU+daglIQDlVEAO/8nFqCxGpvkSw1Ib1FdweIePwGFqTxOBKLBYP3vu4KmziZ54iBM5PuSTT7zKOmKUIynT3Yg2yZdexLHwgrOv/R0V45WU9FJmUU4OVObf1y/g6zyoCSt4YZynzGrxHsHZ/WYwTeC9ggiQVCs9CqP4Urz1lSDQzRtBu7ffsj983v3Jxafu5jXL2cAHrTwKb25byaPesw1io8m8Y54Dv1QsETvNv5/9uA== X-MS-Exchange-AntiSpam-MessageData: IWyelrN79DncsfNjPq8CT59Kt9+Fbo02IuyOaxfims7sUTjijVEXLLe2Mq10vxjGjzYFwsr3cyHwmDjMXijOpqsFpM1ATUnjxByMjKTJrmn2y+Q2Wp06BpJK6Vuxmli5hRW1wDOdY6JfsJPsmjEgyw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 50669f3a-d0f3-40fd-140f-08d8f946b6a4 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Apr 2021 21:55:38.1887 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: AM5EUR02FT037.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5EUR02HT189 Subject: [FFmpeg-devel] [PATCH 11/19] avcodec/mpeg12enc: Move MPEG-1/2 dimension checks to mpeg12enc X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg12enc.c | 8 ++++++++ libavcodec/mpegvideo_enc.c | 14 -------------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index 5676caef87..b7d3d1c6b0 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -144,6 +144,14 @@ static av_cold int encode_init(AVCodecContext *avctx) { int ret; MpegEncContext *s = avctx->priv_data; + int max_size = avctx->codec_id == AV_CODEC_ID_MPEG2VIDEO ? 16383 : 4095; + + if (avctx->width > max_size || avctx->height > max_size) { + av_log(avctx, AV_LOG_ERROR, "%s does not support resolutions above %dx%d\n", + CONFIG_SMALL ? avctx->codec->name : avctx->codec->long_name, + max_size, max_size); + return AVERROR(EINVAL); + } if ((ret = ff_mpv_encode_init(avctx)) < 0) return ret; diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 2a0fd60cbc..d1f2460409 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -534,20 +534,6 @@ FF_ENABLE_DEPRECATION_WARNINGS return AVERROR(EINVAL); } - if (s->codec_id == AV_CODEC_ID_MPEG1VIDEO && - (avctx->width > 4095 || - avctx->height > 4095 )) { - av_log(avctx, AV_LOG_ERROR, "MPEG-1 does not support resolutions above 4095x4095\n"); - return AVERROR(EINVAL); - } - - if (s->codec_id == AV_CODEC_ID_MPEG2VIDEO && - (avctx->width > 16383 || - avctx->height > 16383 )) { - av_log(avctx, AV_LOG_ERROR, "MPEG-2 does not support resolutions above 16383x16383\n"); - return AVERROR(EINVAL); - } - if (s->codec_id == AV_CODEC_ID_RV10 && (avctx->width &15 || avctx->height&15 )) {