From patchwork Tue Apr 6 05:40:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26771 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 9A97344A9DD for ; Tue, 6 Apr 2021 08:40:48 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 805D468A42C; Tue, 6 Apr 2021 08:40:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073107.outbound.protection.outlook.com [40.92.73.107]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4BFCA68A497 for ; Tue, 6 Apr 2021 08:40:42 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CgrNG1F2S5gmnhKcEI71NqMImRNlUXz4RCCK1RBTl+SBKbii0G9hOz/7VstJ/txWXYAQ4iZZOYR0WBTP8/VZwhnB5Mol0EhAfzfHp+sPhizeEC3j3jN11XjG+3bly6PJAk/CEpCpDznPjNejFO7gjBO6PoI/X3Zt6Sds7JSYlCF4NM5EE7BdJQ9YtWDzAmkif+D2eMv23w/YtcUWDQClsNCxnu3LRXUt7E09fjYKDODG6jeQugyPSfBxivrr5mmng3zg/J/XLIqCkyFoPeA4jzkbJCGLwhhwpZQMs0fOCbbxqUOwv8K01pvvPXTnPl8Y0+I03CQZ4CyyACf8zIiB/Q== 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=Mi/bADP7sduD/l2/NcM91xsQRu3D43K6MlLgCs7oE8A=; b=W/mWDnKcSF5bJ1Jm2mH7BT0VOXicofGk8WmP4fS2UgRVBv6EicBJgh3OIT1WO1JsbmQnSi5vdOQFl0TVSPgsZJvRjwltV7FyhhT+yFZ+0ENyUlUwzo6fmIkAlV82NCFhp2e14xxl11G60m0nB6mbcVHkvmh6pfOTkzy72zquGDEwhYGjvXpTO6K34VjmMqr2Ht/8zDfVWoP0mBVijmWg4ZtSSHAqANX39X7j29mBkN9dSU6QjmGcdMheBYLELCzjfP2UacNFmagusyWjRU/9CNbmk4XLEh5dbWcZcHUTCirJclB/YMI2Cym4ovQsE5JmpssMvwXgrlFi/ooXuP/DmQ== 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=Mi/bADP7sduD/l2/NcM91xsQRu3D43K6MlLgCs7oE8A=; b=EaYN6R7Xfsb4ajgFqw5Yhs9LkrFII+ZSNoiFTax3Bwcs/v6kYzMNmJ1Y77Bk3boLPfNa6zWmwV3jW4b36SpCvh6MCtL6exJat76YASaX3Jdw6ra/1V7RZ6yDQN+hcupzt8SNdy4KtFn5tMpQ63ECVFlthJ1cqym9pG3kF2awrhtcCiNkDEd4Jr5FfvZNjm0egBwNfUJSLmowt0cM0fP3zqp/7IqP0cAIm/r8zmGXvz5CQhoMXniucdGLGwNYodx3SyKGgpBgIhsqdB9W3YoaHxUVQhCrYhXh3NEt79gdpa1AWM7nNJpAbqiVPjf+zWd+EEumAPlfbBsXbltYnqZDjA== Received: from HE1EUR04FT014.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0d::41) by HE1EUR04HT192.eop-eur04.prod.protection.outlook.com (2a01:111:e400:7e0d::98) 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 05:40:41 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e0d::48) by HE1EUR04FT014.mail.protection.outlook.com (2a01:111:e400:7e0d::164) 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 05:40:41 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:D261B2339D92EDEFDEC6198EA494C7C28D2790483EBCCA5DB2E4B46E9B06B5FE; UpperCasedChecksum:3C41059AD44B2A74A544BDE1F3FD73EB35C1BD914F58A1236CBE9F6D4A1347DB; SizeAsReceived:7596; 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 05:40:41 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 6 Apr 2021 07:40:11 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [papM9nm2iwHZ6dve/GGcpcL0XGWZRh+M] X-ClientProxiedBy: AM0PR03CA0024.eurprd03.prod.outlook.com (2603:10a6:208:14::37) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210406054016.452174-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.137.96) by AM0PR03CA0024.eurprd03.prod.outlook.com (2603:10a6:208:14::37) 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 05:40:40 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: eb7d9a10-7cec-4648-d956-08d8f8be83a8 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVIvygFamH8o7OZElNfARO0jmsB2gt+PIPEgSrUq88LBF32o6bwu4azFQbCpbW/FacI4RSld7fReQcc79cZXzKxF5n3MraO+LdEJ2KPRSplwkWiq5b2bnwC/tL6uFemXyMBnIUiJeO20ipnVIUWAj4QN1ZR91dumz3TGs/tJRu0r3dpRstM6ln2a+jQXv9EyEe5CobJFgsnlfWjuGpRMqHL+N81JiX4pNylIIgO5uWLWwZ0EhQ267UNG53I6iCbTkU+t7yB0sNhSaYpZjmNuFVruEMa0E2vKb+Wq67moJq2AJyNSxZU5Yetz8545tDiWJap8j17EHLANZMquDXSbSaD68/NaZ4+8gX4obLnPRDVnMW1gm6od8E2fsT6JszwXAG/aRgStNCIEVPwPKPrzaVek8ybhfv9EbJPGT8miC3ma5cuxGsc5c/Y5Q17uBiGfgGS4u3dJcAef3I9Qn0kdX2U64PRBTY3MdtdNM8utl+1050/h384NcBOSAydoXHewtRZfqmua3JADR4NHFnZpCDt+r2RjEnD9DqebPbQLAArDeVKqTnv0GWkRcIdflwcT/jdxin54XGEGdyoJhQBYI1UKaqUdZduJqimgc1ZArmBi69IO9zrBXLydocarKUL/wWPYHDzDnADx5wkcs9yRf0HGo1VA6uVGEb0Lp7hLBlnNskl8t9PWpQXPGIW32VGQpy/tKH55hBRDBo86FCW3pyQPZQL5XFmyYQ= X-MS-TrafficTypeDiagnostic: HE1EUR04HT192: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QqH7fyoerZWa4iZuf/q4ID9vO+g47C6oMjAscfRWHIUOLqqNfUmc3zIIruj2WY4tH2USMuF/LPjgJVhzRqt+eQh19Bzqx3aBJ1Y2zH5M4BKHWscaCoSDQYAhq496r0NgOmvLFfo+OxF/QJj10/mt8G4iHIqsAFueWQu+4ReSIo0Gef4ZK31BjPyA6Pfh2KRzoOPZAbYchmQA6feOoanoUVPmq/EgIWFtdX0DjG8zXd1yCQW8akLm8eXxlJD3xSurNGhElzpHC8YsW42V2asq41YLiR4fQ14llJd6KZg3CJxezvVaEryNmrBA7LMycPW54U427qGoHE33dj+WE2chPszutkHREuIBvo8KiypA3YAvLTd2aqXcBBI7k+OfYgBkmKw7P4Y0kvB9RDjlnEKjGA== X-MS-Exchange-AntiSpam-MessageData: BkY2jPFsdTTR43f3inVWQY1Rothq2SdeH3uKw+U7fO7R4a3nm9eIhaM66XwKunGSt9LsXAsrxQg/bvuRg3G9ofgE1hHderMcBszbWrKWXOtuOyEsQAWEEsOaU4arJgPL71VooWMC+IEb0Emt6wxdIw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: eb7d9a10-7cec-4648-d956-08d8f8be83a8 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Apr 2021 05:40:41.0870 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: HE1EUR04FT014.eop-eur04.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: HE1EUR04HT192 Subject: [FFmpeg-devel] [PATCH 4/9] avcodec/mpegvideo_enc: Remove redundant pixel format checks 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" All encoders using ff_mpv_encode_init() already have pix_fmts set so that the pixel format is already checked in ff_encode_preinit(). The one exception to this is MJPEG whose check remains. (Btw: The AVCodec.pix_fmts check for AMV is stricter than the check in ff_mpv_encode_init().) Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_enc.c | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 7c9d1bd894..0f38f63de3 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -302,16 +302,7 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx) mpv_encode_defaults(s); switch (avctx->codec_id) { - case AV_CODEC_ID_MPEG2VIDEO: - if (avctx->pix_fmt != AV_PIX_FMT_YUV420P && - avctx->pix_fmt != AV_PIX_FMT_YUV422P) { - av_log(avctx, AV_LOG_ERROR, - "only YUV420 and YUV422 are supported\n"); - return AVERROR(EINVAL); - } - break; case AV_CODEC_ID_MJPEG: - case AV_CODEC_ID_AMV: format_supported = 0; /* JPEG color space */ if (avctx->pix_fmt == AV_PIX_FMT_YUVJ420P || @@ -334,20 +325,6 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx) return AVERROR(EINVAL); } break; - case AV_CODEC_ID_SPEEDHQ: - if (avctx->pix_fmt != AV_PIX_FMT_YUV420P && - avctx->pix_fmt != AV_PIX_FMT_YUV422P && - avctx->pix_fmt != AV_PIX_FMT_YUV444P) { - av_log(avctx, AV_LOG_ERROR, - "only YUV420/YUV422/YUV444 are supported (no alpha support yet)\n"); - return AVERROR(EINVAL); - } - break; - default: - if (avctx->pix_fmt != AV_PIX_FMT_YUV420P) { - av_log(avctx, AV_LOG_ERROR, "only YUV420 is supported\n"); - return AVERROR(EINVAL); - } } switch (avctx->pix_fmt) {