From patchwork Mon Dec 13 13:58:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32419 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp5468280iog; Mon, 13 Dec 2021 05:58:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJwLd68O+t7dZBxuemYtEVlBDRNxQXBSwSiaVoqU56861iqxLSJ7HL/JZb0fUpuBrnQeBAJ6 X-Received: by 2002:a05:6402:5208:: with SMTP id s8mr63756607edd.394.1639403905133; Mon, 13 Dec 2021 05:58:25 -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 ho38si18721564ejc.745.2021.12.13.05.58.24; Mon, 13 Dec 2021 05:58:25 -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=pNZUiSao; 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 4D41268AF78; Mon, 13 Dec 2021 15:58:22 +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-vi1eur05olkn2051.outbound.protection.outlook.com [40.92.90.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0888F6801EB for ; Mon, 13 Dec 2021 15:58:15 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Lqa94BpPB5bwqoQk9nzMg8K/5RiIDtQ7pJMJwjTQGMToLpOTGGeQS/2HADL0O9ae0b06tznWHEX3AnHpc2q4bz2fDqG1frclSjV3sN7ELAYk8YfDnqfzRX+awaUXnFSIHquPPQhuzP5w33EHVaGPm+3asnEiv7+9Cf4FdLmYuMFJ2+b9EW18vuFsDDkCvOAIDp+O8xSWk/dlMnu1dk0T7gBmjji2bFHuu60VhgqYJHNhJNOg+kRJQGDA4w1kEhPt/A2xANQAVG6gOXprnr1znLI2eFYE0DVy+IDg3I1qcWDOdGy0UuQHcQj2TtbOBjp+kqA3EHD3ya/nCM7mVY3wEQ== 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=cYX4MBqsKZxxckRtdK5cJgN5s6BdY0O7hdQniv682yA=; b=N/o9lgaQMbYyasoRsdlkBTBhoRpY1+OhFGwHxDqgdDwtUIDCZoJReEHFdG/jTNgsynQIyDHMj8mwA+xUuqLwoLWEuNSB6Qm7X58Ah7yHGuB9Yps5qa8kM3cIN8jIGihLfTf3vqRr4ND47VRzOPdeFloy41BoWPC18aysVXSCru0ZapPJEiHRVgnU4b+7iQVZO+k92tEDelC/R4IZOQNkPspcnBhtFpluXzdG0nqnhmsaYGziA81pvFBk18oiWdKGqkgUolOuiVu0aE8k+0+NhkxTG3401gFRTvNChFB3GrQEiV8IKTG4qSRVSX9jIt+eHibw50OZR+27LMn7moPsoQ== 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=cYX4MBqsKZxxckRtdK5cJgN5s6BdY0O7hdQniv682yA=; b=pNZUiSaob2SNpigbJSgEDxo2gp6DoLby7TmJyqWMmsGyey+rJrN0Jt2M77g+qUHogD0cnQtuTgQkgCHOzhB32d2yA7DfNJf/RrLP1ueWmUqdDlVVinc4dM+bKN3VOCmgViY+Apq2mErnVVjNb7UAhlNf3xeK7Uujfr0Y+VpDudhw75MSDn8Asqx0B3RgrJiT10wbyFjnb7lhtKx6b1juOli98p6Cus2vka79UOlWZCm3pYPqwxpZiVBJHFVnjABfRPtAc421zS1Wmn5HDt0nFPjhqaHLWFC+UZc+DFXN6ZZ5Z5LvA5FM36Q5dJapuC4wH9tnsdvfVAGdvoSq9C8Qhw== 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:13 +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:13 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Dec 2021 14:58:04 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [/gDVJ7n99IssYLcbjRHXX1c4KLdPFsMS] 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-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e8c8bcb5-17ab-448b-b8e0-08d9be409ad2 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRmQk3JzeNKq9EEHvkF/P53RwAgzR1sHLK5OYQBvjNTEVsZaYiaiWuPKkJQs8s5waE6gDpRmtqBNL/uLz8TS728qKn/c+eziaROrFuwDo6kYI189cKz3n+Y6wxCFuFDiYREvNJB53gnzz+en9dYVp94Nlg8HtPYCEKzLv6d3WfRD6Ux3+huiYTHDDg2oXW0tAdhoqJkKys/phYUa3jXboFejSXVLYkYYwjPTYnQmpuTCLGpvvHYCCTbDtHn6Ntyub08PT5OnyU/Zd+TSpZ8OfS2EOlVdp5eR3O8azOGGqxRiB4XEZCq4L7lOIH7VyoOFOietrxLX0/DFa9mHWOGc3RRonBg1pAJzNJ/euLGbhpsc8aMBQamCsDUcaJmKg9cV+23N/R4+ug349QDc08zDNzYv58/BY7kupuh53IWF7YY3Wie/ErqgxPbH8rF6Red/ZqByFKQPDrybP7ZNxPgl7SCpMDFjRZ1KR3+yoxDdGgNYJLkluftiK7O/XRpoTcF03Jbesc/46cd7gZswaEcQIWlfaZicYH62uCc7CrzPTtOfD+pdccWcx0MdguGuETux0hOZPTEtvZkB9bAhXlJ3Kh5OkT8jp3dfs/6W6b4s++qKBPq1R5SVPiWRYsyj+Ron4tRki5RkuHy2m7TD0fxEnSb0twCdXLDNSiIjuiDOboZpynDZq76pNRvOY6RBG4KKYqbD/jwGSLTZHMu1fA0btCo3ulcw4RpV/3qSigTBrLtdZObM45Yisy0skyGQkzIwQk= X-MS-TrafficTypeDiagnostic: AM6PR03MB5251:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: t1DRFd/MVE0xyJgB7b+v5iV+ji+ASv7RZrm+ZqWqGK/KXepsPwljKxjvd43HOovJnDjbSJtInY+0lvM4+YyzYl5lDmch1FiBk2pkm1sDgp0eqvxeiSy+oY/Ah/f6+GsB54V48RRbXc+jlIJwHnfhQ/LOKw6U9L/yIKBwiWXUtGBGGx+uai35wlapq84mmhtRErHwclO+wReGWodNfqvhwgkwj3qtVpvmOXkw0A5fIJq7B+xeT9/HgLgyYEq4fypV3yUd1e1t2TPO5U44qmcIzGR05D2/sBNqGsPUDwDLEeyGbJm7hEwyjx3+XZzuJ5eAPeaBd3Rg9gc9ecWTgb60Rxl6O+mpCoHwCijed9QGC1m+xyCnylXXUmqLxXfCvMevaEOTDBAk3l1mj06gjUuiodQ3gdum75/azKbOJREG7QLIytanGNLx48ysfxhzeNZ9lQtQQHOtBsDbyzWwsbNfC2Ks9YGSoVnvURkWVGjbtyQU2zukNXFNLo6Br9tK7e1j8Ga5i76exzkow4Gch+EHTkJNq58y7lAcLvrMVsZy3byvefPmc4yXi9Po5BsJNJhoCLlxe9glmueXmOr+1C8RbA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: yD4SMIJuJMtsBYBI6+9ChtGroja87gzAFYr3M2iE2kpkXsRFUuS/eZD/Ylo6YZSykBeQRtjBZw7cigYfKt9AwbHAZqESvpIY+pBFEcPYom7cjjagw7gUJCzFoGDmr0V3cVb+hy8oyQA07GEMFlK2x6uQ5rFULM168aa2skBTudanaOhPc9WNEd3QM/8pF5Y2uK56ZWfoRB6Ccl+In061GIDromKA/j5zTn8jPImhgEiZyjjkKebCNNpSQBAPT1+y2rgbZittShSpQZuB7xlKqDkVXCLgRgMNex9Lpwz0Jx7ECmpNTYI29AuA2AwPo2VQV0TfLwdbHZ0JoE+9Jyahjaw07NlsTbWP5HMrFvnoPeQPB3o8km2bc0hC3nkEDPRvfkEsnJaUUjBjqIKSYV5qc7QosSFz5YTBDvVIaoaZxfGK+HBsGVJypNFLrZ7uVa48C9FkSdxglfIs45dy/5tUfQC2oJ/KM61vyPY3Vj86XpEgwKK+d5mZTW5ZaBJnrDxmv0d+g549bdqyU7AJJw3854yKcKu2KFq5b7IZ2oiANOZmiCEgMWs/2CmCjy7qCvYRlSuNRz7nWPHlAzlHNu2iSv/WJ4zCfQWLuqRFoNjpZK6gReQlwSp1UeV+2pLl1iuP7zDsey7+paGyM8RE1y/2OzuCO5WQegsHLXO1I1rdPQJ1iqdd502fP8kWQC8wHNUZO/fYlYzeaOEtXnXgTDbFH1X3mRa5+cJvVYCtAdxbz9XQ1k1Di0nOrxrI2fcSV0FjtYDhZhBLa7Zl0sQqpXT8fv9qupA5L1klkAAojIMEpzep5nvd7csXxTYcFeo6xtSb8i3Kyu6FowY3Tjj3PkE5echV9NuvJmp1plwDPTeN2uZHiAbMjvAyraLHOaUDufPqvUCwu+s+G/LOBS4nlN5HsiR/ymn/mwGPpY/PiQF0ziFKwsug0IdSuCaNHKYXtJWeWMexc3IgQpIiVlccgBbabg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e8c8bcb5-17ab-448b-b8e0-08d9be409ad2 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:13.6820 (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 2/3] avcodec/mpegvideo_enc: Remove some impossible branches 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: FWOGD3cWT4AG Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_enc.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 4adb95eca7..8865e38293 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -885,15 +885,16 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx) ff_set_cmp(&s->mecc, s->mecc.ildct_cmp, avctx->ildct_cmp); ff_set_cmp(&s->mecc, s->mecc.frame_skip_cmp, s->frame_skip_cmp); - if (CONFIG_H261_ENCODER && s->out_format == FMT_H261) + if (CONFIG_H261_ENCODER && s->out_format == FMT_H261) { ff_h261_encode_init(s); - if (CONFIG_H263_ENCODER && s->out_format == FMT_H263) - ff_h263_encode_init(s); - if (CONFIG_MSMPEG4_ENCODER && s->msmpeg4_version) - ff_msmpeg4_encode_init(s); - if ((CONFIG_MPEG1VIDEO_ENCODER || CONFIG_MPEG2VIDEO_ENCODER) - && s->out_format == FMT_MPEG1) + } else if ((CONFIG_MPEG1VIDEO_ENCODER || CONFIG_MPEG2VIDEO_ENCODER) + && s->out_format == FMT_MPEG1) { ff_mpeg1_encode_init(s); + } else if (CONFIG_H263_ENCODER && s->out_format == FMT_H263) { + ff_h263_encode_init(s); + if (CONFIG_MSMPEG4_ENCODER && s->msmpeg4_version) + ff_msmpeg4_encode_init(s); + } /* init q matrix */ for (i = 0; i < 64; i++) { @@ -3695,7 +3696,7 @@ static int encode_picture(MpegEncContext *s, int picture_number) 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; - } + 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}; @@ -3715,8 +3716,7 @@ 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->out_format == FMT_SPEEDHQ) { + } else if (s->out_format == FMT_SPEEDHQ) { s->y_dc_scale_table= s->c_dc_scale_table= ff_mpeg2_dc_scale_table[3]; }