From patchwork Wed Dec 22 03:25:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32820 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp6022245iog; Tue, 21 Dec 2021 19:25:44 -0800 (PST) X-Google-Smtp-Source: ABdhPJwwSkFBKT3HV1gJZJSYzEidsbaX965hOtv1/zXMgsuno1NE8I5/X753NolH8kN+Lvt/U/tZ X-Received: by 2002:a17:906:d935:: with SMTP id rn21mr903551ejb.491.1640143544477; Tue, 21 Dec 2021 19:25:44 -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 o11si401077edw.288.2021.12.21.19.25.44; Tue, 21 Dec 2021 19:25:44 -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=H95f5JUm; 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 B6D0768AF98; Wed, 22 Dec 2021 05:25:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074084.outbound.protection.outlook.com [40.92.74.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AC23C68AF78 for ; Wed, 22 Dec 2021 05:25:29 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ym0EigZAaVcfrvVenfIARF8c2LnW4LlmJLKk+iQHvLnU+jl0XVzY81Yt4Fy6m+6cohSI07JKRVV+z3oTUXsfeklYdGk9DGX1GzdY+BTN5ySTI3Y6aPgvovnQ5Kv4FJ7SXM4JVjnUZJWzuDHaW74/RptuUz7Kn0dp7mDKojX4cvIsOmqi8s6AbYDNLOr1GgzTzZsKZWsD//bvoOsOfdfHFJ+5q7yYH12uVlzK/ZHLn2Uys62mtNF/CWZ39oiE5qNAKOXCH+S+C/eyJuiCaTde4q1oShuKBdSJhIBl/rjWMbfUBOxZJo/mmlo/KZa+6yxN/ajJ2UbF3biO55JJpdYPfg== 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=uFwbC1HTb5a5TssLqRgIRIIA2kTT+H693Frdjyqn/s4=; b=jVAxYBi1Xru895VXWrXbV/i5Pv4j36yIjlzc22m7b9pSYgKD230yvvppda4Wnn1Uo0oy49gLTIL2KgNQ2Q2JvTsxDVtrfyLKbfnGZvXTrqvtsKqv2/C0h+lWdqCxpPK/2uWPhpQHbfKD74RAXDaZj1KYoFrB3LsKwsALDpXsyIXiZ/QNADZQf0htIskBrMjGgDXBpQUje8iuvhqFpQ3E5aISRAmPjr4lozNAUYiWl6Z2ERin0uva7ZJ4xmPg6lJleBurctKJcCm1daqmjAHYDrzmcrk/yG7DPuVVg89W3efpq8GvHPEkK3KhT9qt0HpW3aMu9i8GDgTkiYvuYce/wQ== 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=uFwbC1HTb5a5TssLqRgIRIIA2kTT+H693Frdjyqn/s4=; b=H95f5JUmKRt+qeQgykGIbpU9ibhIupoRjrbAwu4mavbckzt7DOuFqYPCX+VjDOoH9a1oGirjkf81AxojZYHlDCGDYUVnXkpPSSsFvAxSxbB4KMoM4KoHbqyOT4JSF3zd4C2rNWXEji7/FaVodIePTWH1uwGxC4wTUieCSMlgFi/96JpQMHUuj1v1hfmMu1qcpf/lUn2o6e99PSfTC+LCJT/DWuGgOhaDDvjyBZ3kE8puQvQjRds01s9161yysV6IQDESn8uSnNMP1JysfJQeE5M93i+2XayZmdZHQVgEsemxituCyLkMIDBhZzK3v61ALXKP+L+MuBvsN+KS3MueKQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4104.eurprd03.prod.outlook.com (2603:10a6:20b:18::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4801.15; Wed, 22 Dec 2021 03:25:23 +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.4801.022; Wed, 22 Dec 2021 03:25:23 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 22 Dec 2021 04:25:03 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [Vy18XTSdmtD2m38jh8aK1x0spjEiolGw] X-ClientProxiedBy: AS9PR06CA0323.eurprd06.prod.outlook.com (2603:10a6:20b:45b::19) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211222032514.896794-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 550772dd-60f3-4cae-e001-08d9c4fab0c8 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWm3GLoeUntTG6KfWWWbWhlFAWiMxpDNELUy+k6hpY4//KeSvlQv6aj4p0qBCpvCFk7hQlLVROWlitG2UugqhV5HXdvFRtJ3VKCMm8g2hPREEvq8sBjNErKGZ+E1IXfUzMcW0wboJLMbHIgTilqKBWOxJflNY0MfATtNvKkwQohK3A6oBjBWE9EiCrz9jP9PpbG8JkPA3AnZ+GZg/VO9EGDLY3NmirRSlcxk4bWbd52XCfYpKfLM2I4Btcx+9rAgCy7Bn1kglR811UUkgf977SvszGkByCLV2hodZ0xzlnx/yHiW16XKkBq3A/XKNhfFpJcbNcU3lKrjims17Caht48s6oFme+Gpd4KDP6yiLC0ckhIOVPTSlQtbzsT53qy7YUuTa+M0N5FiAdBnRNvwaybFwRKlhdbhoCiT7r+FDdpboIEMBkAHb03HmN5L7LQm3IhQAULf8kJv4e0A6diwlmw+RPnIQDkIjYo+fTYSogzaP0YuY9ef2U8VVto94Qbwjwz0m41LgHQDmWaQw6Y2CaNwlz90C5QcYYdf48EOwFT+ZEmCQCpiQDqiVpw9mFYOQJPzQv/xpDviBufRhEvzzgwXslINIDttCMgd/yoVurM1iv4sMFuPxXzTxaLS6xo8CpbWSs1Qw8hkDjo/X+MNfWDXFAzM3qz9Kk2GQn1qOALBQujwZ8VcM39mOor3a4taQOSThyiHeUN7W41B19w1ilaxVdyfsgJr4s= X-MS-TrafficTypeDiagnostic: AM6PR03MB4104:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YMaAw+7xi0DOFCppviOWX9UZjagPoeBBhnKYQMwyaDEFpXEybwwfqrfNf4c9S/ay2XlTapoA3HSMCf/2LNsPeaWvC/JUpqeZTTnr+s7L3f4iWpGj1Nst1mc1NFW+wZsNPH0aD3PNSLW50g1GZ4clsX/dmwwiEYfdouoOURu8tjUsMZhG2i0EcbX7zhuvrxkBTEzgoERIimO+27jNPhNGgukA6+1FFkeW9ZVBqXxok9b9fqFlyU27IT7KovleSl6FurOtBrsg4BoM9swZDi8+mIgo5RYqkixdt8QcmJibUchfKdR9k/Q0uaynaNTTfdS0FhF0QukUxjgCGgJ1yLZjDKMBbHZlGlap+0NLYgHKN1LuxAzTBOfy/0FSwYGyzkmYrw0piDIWpar+S0+JxoSzX9zLzmdHNTILTa/XONQih7Nip3M7c5B91pJu+Jr1muVIvSNwdaTT5t+Zk4QCPPD9FmIy6eqCPPdKh8FTopGub158cjJqxIvRcdnGKTC24lsy17YFhpHPzdXiILW4niVMLQ2y++1gTXC3wGGcBs6hpkoAB2x0Yhl89jyz1UOPOJC1NNdwraSklMH/AdBj+qkSpQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: AdgsX10Ii3/lM8BaNvt4gTw5Cd+URd9Mi/OuJPRxBX3XVn64xz4KC5/dmWly4YmTe4jOhIVPm6UDnN6JF3q/ylI+a7ghzOQcKMEgtAr2apuNfLSAg2WaOKGFVLUYnarEGs/d2wo4rD8AChegXo8GpHlWd9vcnSGTfO34IB4DNuMi+i3+3ycPQwr08kSDPjHeFwVo42ODkxUskmghfdn/BKrjK9OKrdfV3bMzA0Tcm8vKrlg2kE8YnsvdER9GUqD3d3f/Jzp/BVtAmoVgFYJ3o7HFDGRnbMR3ANYPDsM1AXVBw3EtMoDWU/wXLkv0LxoXBJ4AOAFUsG6dBLJXxFIjiuVib73hBj09IzV/mQPaPhpu6K2DTJt5f6o5FIt20FtosDKdT5tjZ90p+Da/oq/FZajcuPcTegrFTdVP5k8XVzgQgRt2S13HzFRFHLHvkuaXT8VVsVofsfIppwhlnurANsieo2Mh8AxtLJIndr/12VwE0E63OppbtASQV5yFSOhuqys1oG0FBX/0KBnF2FuLJQCoJJvMj2ahc9fZS8Q0iFRAQJoMoVbVRYs8AB6+/9RNwX4RGO0egbA4OhYBQfd+CDpb5H+iBJn5vSqhMEDcZIpGI5qBSAkgat8DPGBbJI0or7l2V3T3CSztejgZH5lv/wuT9gocqFqVUZnflhok6Ging9piwLi1OxDR01ObmarHJtZLf83vu8API52mYd4XPrsn8ApMxyWcFWag5JBBR8G9UNm6FbvFNczZi+Secmy7xguATjhUWvd6rtGfB1gmmxSVds5mXM5kqXofPBh8oCWFOjJ7w7ZMYhOC7xaC/Cp+SJZW7GQityezaRXkwwIdeG96EKq893qS3xS3KsNds88fotJWW7PerKvKDJK4fMEveDjYmBdxr4GAzlbygldLtXwzqujhoXwOOPT6x9Y58uxKz+z12/gVFcnKnMcxD/N2TqiOJo+CBeP46C7miZ5Xeg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 550772dd-60f3-4cae-e001-08d9c4fab0c8 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Dec 2021 03:25:23.8177 (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: AM6PR03MB4104 Subject: [FFmpeg-devel] [PATCH 03/14] avcodec/mpegvideo_enc: Move MJPEG init checks to mjpegenc.c 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: jk35DsHjQHnT Signed-off-by: Andreas Rheinhardt --- libavcodec/mjpegenc.c | 10 ++++++++++ libavcodec/mpegvideo_enc.c | 12 ------------ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c index 1652087948..8b51058f5d 100644 --- a/libavcodec/mjpegenc.c +++ b/libavcodec/mjpegenc.c @@ -276,6 +276,16 @@ av_cold int ff_mjpeg_encode_init(MpegEncContext *s) av_assert0(s->slice_context_count == 1); + if (s->codec_id == AV_CODEC_ID_AMV || (s->avctx->active_thread_type & FF_THREAD_SLICE)) + s->huffman = 0; + + if (s->mpv_flags & FF_MPV_FLAG_QP_RD) { + // Used to produce garbage with MJPEG. + av_log(s->avctx, AV_LOG_ERROR, + "QP RD is no longer compatible with MJPEG or AMV\n"); + return AVERROR(EINVAL); + } + /* The following check is automatically true for AMV, * but it doesn't hurt either. */ ret = ff_mjpeg_encode_check_pix_fmt(s->avctx); diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index d2520368e1..7e45fd0ff3 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -370,9 +370,6 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx) return AVERROR(EINVAL); } - if (avctx->codec_id == AV_CODEC_ID_AMV || (avctx->active_thread_type & FF_THREAD_SLICE)) - s->huffman = 0; - if (s->intra_dc_precision > (avctx->codec_id == AV_CODEC_ID_MPEG2VIDEO ? 3 : 0)) { av_log(avctx, AV_LOG_ERROR, "intra dc precision too large\n"); return AVERROR(EINVAL); @@ -573,15 +570,6 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx) return AVERROR(EINVAL); } - if ((s->mpv_flags & FF_MPV_FLAG_QP_RD) && - (s->codec_id == AV_CODEC_ID_AMV || - s->codec_id == AV_CODEC_ID_MJPEG)) { - // Used to produce garbage with MJPEG. - av_log(avctx, AV_LOG_ERROR, - "QP RD is no longer compatible with MJPEG or AMV\n"); - return AVERROR(EINVAL); - } - if (s->scenechange_threshold < 1000000000 && (avctx->flags & AV_CODEC_FLAG_CLOSED_GOP)) { av_log(avctx, AV_LOG_ERROR,