From patchwork Wed Jan 26 21:34:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33865 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp1882165iov; Wed, 26 Jan 2022 13:35:22 -0800 (PST) X-Google-Smtp-Source: ABdhPJw22ZaHDmYNUmcz+2at78ZcjPhESUGEjJS/1m9itG4681MqlYH9SxA0Daw6KT7+dggvTvfh X-Received: by 2002:a17:907:96ac:: with SMTP id hd44mr596291ejc.46.1643232922140; Wed, 26 Jan 2022 13:35:22 -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 sh31si224409ejc.857.2022.01.26.13.35.21; Wed, 26 Jan 2022 13:35:22 -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="mjlGT/hQ"; 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 4BC4F68B0C4; Wed, 26 Jan 2022 23:35:13 +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 9DE5368B094 for ; Wed, 26 Jan 2022 23:35:06 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QScj21GBxvxVIw3WxSjSZ4a5i1ylL7UeY6W/1Q2ubMZmX5KD3xRQAe5byj+4w5eTukSDiK3+OHUr1YR+CvXYb0y4gz+klyir5qB8OTApoFXXYdNKfUS0XMA/cTgSBXv6AfdiLSO7tyHMvLvmfZicbQEai4hEZZjsJXOP74pVcGFXcFhOCaZr8EJ6cU9D8ecThJGWfIZtX4z8ReN9IxltOSbXvRm5jAq5aCqZyzTYSBneVKd0beJem/E8ltRBmhc6+yAdzfeFC+MOYD6x2n7m4B37CG28+fuJSzCc7jVuygbRgBTKMVmTyooqzQUzBBdlGE9fqyJJX0vsPSf0bjTvKg== 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=uWkoUUD5wUqi0Zzv8P8IrpJ09DGCjDz7GHpIMvyySj4=; b=ERl0H/B/+bqcEz8ydqcQlJBDDWf+A5YXMt8okMyqyJoNChtgpPVzXLW+0ZwHNBid36NqF3MoCKzPVFVs3RM1/YIL6KrhjEOYIjpJ/O4tE9LUk8Daykc5XaxgdOiovZ1zKZiJmFK13+b1hiv2h45fJd3PKFuk8zJ7NNXLPKgxAQDR2EtK4yrz58GOfPCbWxZGr6J+hwaPAZgBVcGmjlEcflgdcaaDpLdU5YTEQ69I39FYK6H3CWgUpABXdgobIoke9ijLouE6kqT73Om8aNiZaMsqWRgMBPJvf6KarnYjVBJWM1kNLCpgYPJY7A0/tnP1Clf5qrW4vi+dfWBWgx/KLQ== 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=uWkoUUD5wUqi0Zzv8P8IrpJ09DGCjDz7GHpIMvyySj4=; b=mjlGT/hQ/Q3s3EZdzdkqgTwmhwaPS0CF2ZoXA7a9+CpHWae4/PYbrhKnC1O6/wHledkSZpvOOyPwwI3kHBOm5uhCSh1Bwehhdp+6IF6zRT7W5O/spmuBEfjD6tJjlyBt5jADKiLjFZr5ELhypho6GQdKnYoYPps6MnCnQtgcDzikilqAKgUAteOW/Ohg55nvYb5c+NoHFAX/P79kXGTfg4IB9wsaxRfk9di95PQuwEP0P9iN6Pg+pI1sejDgJQeS3esgHIukIDJ+I3smfY6Py0FkSppE3W6xs/Zjj/YAsXFZj0lpi6lWBNe+bYulaUIDlYOTEYO6swrWLHnRVZlVpA== 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:35:05 +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:35:05 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 26 Jan 2022 22:34:41 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [X/EbqmCaKv45fIeMmfaPOqEgmwnZyo6a] 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-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d985fc26-b2fa-4769-076f-08d9e113b780 X-MS-TrafficTypeDiagnostic: DBAPR03MB6406:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ouH/cpEQ5kmQ6sqd9N73T1yeXcsdplyDR1nwyfqaPCA7VcR5Ce7noLxYxsnEXANQqWgMFLWpyevYmd4wRn/snGkepLc5ws1dAJ0RygxBIHZ/mCNTzwMqKpwZbRPc+Nw4XtFYk8GfQ9nB8bFvVY04IhmKN475G5soQ3R1fFArbNuiiIkhYbzqupzkJnu14/2eG90Mg0RBuLQpsSWeNdnUmsRgNmK50kig6zMH3GQ9FPS3P9B794ReY6sME1fNZ9657QZPEACXjwpHEi1lWRNQmmtFBTCigB0jJjj7h0Z3gDPFHWFif7B/o6kve+ASo1yuY3Ay59w8y0sgP5T2k2AOTCBVQw+SKeZS0ScWkO3FXFDtXrRZZSP0xmakiQ+CIQSEEd3Ely4Qs9v2oPg1yRYwdHVGCNU1v5eVnLr7Upuv2wH+CGWBwkMmzLPmj4OBdIiJ15sYXB3LXo1LYdlZHInFSBJYs8xF/xoloOxl4xbtdApE9+eQcHuypjbbFtv3vD1MTfbmjtjwhsSQno2SQKVepqI1YrCOqQmELLQWcJRiXY/na2IoKmQF+02qt6/4e1OU X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: XFXkMhgAv9JJVGZ0hzAt+pqZ5BiNH1p2i0+oWvTtcpnhV4pmaNIyPVnvbSSLFiY1Q0Mo9Z6P+9SBzOCXIviDLYHp/+a3YTJgBgyzxIrEUFwe5mvSeFAppOmVIXNoL2vsytQAq3ijJs4wS3fGux0Y/sux8JcLgwRmnnNSJOHnNr2MRkD9dtA1gRlUa2KztVwRAElDH92LXXlLNC3y9RRYn7cZLGwrfw9aZp77YkBU0i48LNnvw6bZ0unkC5g+oD4RqhiLs6OKVryUNj2PHjN4aQmKvPF9NFupXnKEAE7CHiTWPf4LdhFCfx0kU4erppW1AaqH9KQc6d9sVY4W3D29rFs6IVY4uJMabvAdgsSjsKyxL9yIRencZ+pPR7t7K5EFGUm8X3A+6jOud+3k8LQmK0X9FsoVddU+5ow7bHhc/7mDNhiFG/wh15y3ASh0Edjftr9lWUvzjQU4ehp+vpvf1Gwa+7nFnxQHjruOsw40n4M6InW1WpFnjCC9jI+tpgOL4qamM3fxSIvmXyGUwc28TBzDjq1P1FYY3elPRIBb1CNhs0rfAODasnzwY52BJZ3u3sUY1oLu/WMqZ5QI4f3FrFn4+mutPllqmVkEkXS47rNbo+vL0+M1QZnirKSQ9V+Qgz4PwYaYrG3JrMRI0KtTvrKsk2lpjEfJj7eomH2B3VcQq60RXnSNQoogcRU6psh4JC1QQV+Mn6GtfRpKfrHtFi6mrSLxJ++aK+67bWpdYbozx8rd/HboCqckF50X1kBchhjMXXrMOTvq2Qimmj12ozm8mPXKzW/m+09S/dSqRy7Vub9hx9+2cXLpHRFGDblVLVTcXeOVlZyUAAs1NePXctXHJ+rFpWmcsVEUsOVl+6lmNtuAtNDRTYyv/hJT62s8l2fYSBLhFqrzfDZvdeeI3TiLeA9EPWPXJ372BC0GpZ+zV8vYILyphD/SHW7n7QB6G16KmX1CzHBFDDEkpbCp3A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d985fc26-b2fa-4769-076f-08d9e113b780 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:35:04.9978 (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 23/33] avcodec/mpegvideo_enc: Don't hardcode list of codecs supporting bframes 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: recitSpb9Bxe Check for the encoder's AV_CODEC_CAP_DELAY instead. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_enc.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 920cb337a1..9a5634c505 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -357,10 +357,7 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx) } 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) { + if (s->max_b_frames && !(avctx->codec->capabilities & AV_CODEC_CAP_DELAY)) { av_log(avctx, AV_LOG_ERROR, "B-frames not supported by codec\n"); return AVERROR(EINVAL); }