From patchwork Wed Jan 26 21:34:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33864 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp1882080iov; Wed, 26 Jan 2022 13:35:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJxQp8mLCbcR1KFS9aEuHt2SjjM51BO0tfuEsgkpEO53w5dicJ69XYgeOygB9bYxTjbV70vH X-Received: by 2002:a17:907:3d8f:: with SMTP id he15mr461848ejc.623.1643232912625; Wed, 26 Jan 2022 13:35:12 -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 cy10si220195edb.39.2022.01.26.13.35.11; Wed, 26 Jan 2022 13:35:12 -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="LOivEm/2"; 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 48BD468B054; Wed, 26 Jan 2022 23:35:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-oln040092071048.outbound.protection.outlook.com [40.92.71.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8312A68AEE4 for ; Wed, 26 Jan 2022 23:35:01 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZI8whhNvfHfM5o6J3o0QxIUsw3CoAAEqaLeXPMkSsD5su/zc0j5MzQEn1rd6xSfxWX2bNB556wuIacFWU7DfCKVId7DhSgtE0tR4EiymjuxHqWG3ZU3UeQtJkSCwmdjmS/5XoqDdg5QuCiGdJOVvp+CqZdyqKt0ym/08FDnYzuSxQwRxrNW8IVxN86KZulh8oZBVEsw+4jXaoorm/yB9dLktVPsGeRR7tCDbl6udFUtOo3OeLyJQZDb9/6zEmJQrgBnMW9usT0sL2k78bNLTFIV+r+UBY59CSSPHfCPxjr9eROkNR6n0eoYxIdRDvs1I0dzHlpWHDvNXvn6IiihPzQ== 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=bRUVXz6jwBh+FQ3p5mj+WqYaYq0Qsq9/2rtIPbQ2VPw=; b=n3z4ghZAztSAWjkG3WetMSBdZ8/LswJeTGUBGf9g17chS01iclDL3dj6/PSDliob1kpiYQ40EHvFleSGHlVBi32Y6ZL2vh6bPkUWA147r9vmhrj0HkGIpLnQHSwrJ+bmy07L30fNc2TaIYeBKGPjd79T2WZxCAEOKjw7HTfS1Qs5km0uOYMf7FEUVcXxFq0ulP3x3YY68ylRPbfBJtivdMCu7QXkUM2zMWx8Qloj7a2mwy2EuGMuhZ7oi7pOLYUGo5g3SO6YSTowFn75gjSk+bXyuplHm6kyVPSZ5DVTMKA2i4muXEOjfhKxTRe/GQqSms7PksUGjS5o2nxvpqDH2w== 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=bRUVXz6jwBh+FQ3p5mj+WqYaYq0Qsq9/2rtIPbQ2VPw=; b=LOivEm/2q/C82SYcowPQ8SFUQCUmeQOgR5jiMZ4kTpBJNqJfvNpVc6oQjvlga2CM2d8Q9Ixj9bNaRGpptCq4fTGKSeU9Qvbylm2NBpl8rHEJED6v0Oc2jSqeIL1Rf2ghCv4J7X5qBSoDT8K9d4lHUUqvF/dWEC9O9ivinYNmRsk1KJqz1ztuxznc1k/1fz3uRkVg1+AUhOf2uh/VYWcrK/uGGnLiy00sE7cU7Xq2Pt3IjpE24DtTwKf/qhwaiLnT9DpqzWefX18Y3nMhkMxsjIMf1OJ60oKV3TLCMM7dQaOumvnCdyyXZgYteEkakY5l3bwT7EQfU0cGGRKoHmvDwA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by DBAPR03MB6406.eurprd03.prod.outlook.com (2603:10a6:10:190::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.15; Wed, 26 Jan 2022 21:34:59 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%4]) with mapi id 15.20.4930.017; Wed, 26 Jan 2022 21:34:59 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 26 Jan 2022 22:34:40 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [SMO/HTFyDDVsnk4moLNxDgDwdmUBNYai] X-ClientProxiedBy: AM3PR03CA0066.eurprd03.prod.outlook.com (2603:10a6:207:5::24) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220126213451.1887291-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a2b2c820-2a90-49c6-7bf5-08d9e113b41b X-MS-TrafficTypeDiagnostic: DBAPR03MB6406:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: H4yZB2GvJuVOIBOoAHSWQg8Ao31CEQjmy2gCtPzXktbjptwKthi3dE+dJ95w2X3IfmE5mul5cnrUctRnBKW14PKxhN2DIXTLpAhD0Af1z7Ommvnu0rkpeLtvWLEC6Op0mQN1aK91zBktQW9+fHYFWJbaEJ8GUk4qOoBAZ3MwPZyykOYo2HFO+wtP9JUvnEgiNNydR1Sl0VtvK6ug/1Bnq13Hns5ohLMCQ5gBJZdBDmREvaU7mQfPcc9LZkjGWySwuK6IPcNdhOUnvnhhUX5Lv753DMF0N22DXFNVcLU/OWG3EFKyFBXkFRiSywV25ugQDu3tW3p8wagZADMBRbCWTLpJAc5q/DSxTMucsmG/NEpbMARKf89Ooso1tfGh91f8zQErEXxKGBPYixJ9ft4coJwp/DWs8CETvsOKyL8r70iHcjpqCHS8Pznkb67izDWw7Jo7fLHAb0qPkn0zZc34HJDhKGU6eQhuSThdd6L6pzY+eTGUBS8dyWzx7uGwoeT1TBx3+W3uELeNN5b4Ht7BHRtwgocRIdJHqr34LX/z1gxdmMNo5nTogtmKVNRvvDGK X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: EcpzvecZy1H9MkPz5u+VfvheGftSw55sdJXgZoLQNf8gnlpONnS2kHweDCEjkp2CmSNwUplqm0cl9nMqNXNvSeC5erNmDiCjCGzO3MfVqzjGZsG+XiLanC+wCxRSDbGiXxLEnHWJkWZJMEPRzEpFZRL9KL9Lb3zbc66wSU/9oFuqVeN65PMP2JOeE4XGikznoF2JDe+UIGmYzCS0ovnfO1Nt5y6yLB5qu8vi4+WlpFVVjmqGLlRQixJSieo/T4xnl7OQ66lSEHzfT5BQWusAPBGD9sG6S92V/YJFBT13D61uoXh7ZalSgowJBI4h0yuqDjnHIgWt0AUZGZbOuahMX9z16NarFuGA3lgVgriIvnWOQwsUVpx6/aTH7/l5WWXOzWHRMrH/16wJGV7jiuL7tqH0V6eWWW0F6Ng4qCWxNMZfhQydw7qnUyr3k1Pw8Br7gcRlzOnexqgDwS7gZ1CLtzh/uN0u+QYy4Fm6C2p07sernpGz+xjuUtDBnyKmgDSDAqNMtNNJ6DQ4eQ+jizHWeG7xNNHEUf1+O46GI4ZlH/ko9NYMS4M6rSqQq68tcZVTpMsElE8sxCBvFpW++URtmkeiu/vR24fyxV4TkFsvlAm8+kTycIrp85LHfMqmt9hgyG5aSZ0o8HEKv1zNBo1CT+fLbNGtNz2rNlqlEr2iSQoL59gisBDBF+nyA5CLCFw9zYQhCqIj1Zi7jsy1NUIG63J6qa8NS11Xk15x2O3WkZGeGwg9eWzZKuVHfAJUe/tArR5uRwvFmvd2oK2cUOy+OmQAfiA2AW6bK8YFtI+l0WZ3K4heppEQkf74A86ZImaFGowf+cxeMNzucekR3XEvL+9hBE4ZKGY+rSkw0EUBo+OTfFrtLCc+YGVuSELMmvPdvL6Ekv5hs2teVwB/gjeU8/T3Ym6BSajtq5uWDotckEvZAqlA2g0T8rmqLQJv0J1KAehfZoih5f4P2FPBsb/IIQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a2b2c820-2a90-49c6-7bf5-08d9e113b41b X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jan 2022 21:34:59.3682 (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: DBAPR03MB6406 Subject: [FFmpeg-devel] [PATCH 22/33] avcodec/mpegvideo_enc: Localize check for invalid number of b-frames 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: 9XOC7R9dEdeU Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_enc.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 044c675014..920cb337a1 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -350,9 +350,21 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx) av_log(avctx, AV_LOG_ERROR, "Too many B-frames requested, maximum " "is %d.\n", MAX_B_FRAMES); avctx->max_b_frames = MAX_B_FRAMES; + } else if (avctx->max_b_frames < 0) { + av_log(avctx, AV_LOG_ERROR, + "max b frames must be 0 or positive for mpegvideo based encoders\n"); + return AVERROR(EINVAL); } s->max_b_frames = avctx->max_b_frames; s->codec_id = avctx->codec->id; + if (s->max_b_frames && + s->codec_id != AV_CODEC_ID_MPEG4 && + s->codec_id != AV_CODEC_ID_MPEG1VIDEO && + s->codec_id != AV_CODEC_ID_MPEG2VIDEO) { + av_log(avctx, AV_LOG_ERROR, "B-frames not supported by codec\n"); + return AVERROR(EINVAL); + } + s->strict_std_compliance = avctx->strict_std_compliance; s->quarter_sample = (avctx->flags & AV_CODEC_FLAG_QPEL) != 0; s->rtp_mode = !!s->rtp_payload_size; @@ -499,19 +511,6 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx) return AVERROR(EINVAL); } - if (s->max_b_frames && - s->codec_id != AV_CODEC_ID_MPEG4 && - s->codec_id != AV_CODEC_ID_MPEG1VIDEO && - s->codec_id != AV_CODEC_ID_MPEG2VIDEO) { - av_log(avctx, AV_LOG_ERROR, "B-frames not supported by codec\n"); - return AVERROR(EINVAL); - } - if (s->max_b_frames < 0) { - av_log(avctx, AV_LOG_ERROR, - "max b frames must be 0 or positive for mpegvideo based encoders\n"); - return AVERROR(EINVAL); - } - if ((s->codec_id == AV_CODEC_ID_MPEG4 || s->codec_id == AV_CODEC_ID_H263 || s->codec_id == AV_CODEC_ID_H263P) &&