From patchwork Thu Dec 23 09:13:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32856 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp7105632iog; Thu, 23 Dec 2021 01:14:22 -0800 (PST) X-Google-Smtp-Source: ABdhPJyhn9FI/rKXyUMac2tJfmNCd1qwB+E5YsAnYHpRCOVz9kNQ7HG4lhgsHIFYxaw+0ytghy7k X-Received: by 2002:aa7:de0f:: with SMTP id h15mr1316952edv.40.1640250861927; Thu, 23 Dec 2021 01:14:21 -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 r21si1925070eds.563.2021.12.23.01.14.21; Thu, 23 Dec 2021 01:14:21 -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=Rlj8DC7u; 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 A7A8468B163; Thu, 23 Dec 2021 11:14:07 +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-oln040092071067.outbound.protection.outlook.com [40.92.71.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 779C368B03C for ; Thu, 23 Dec 2021 11:14:00 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MNyZvYIcXA6VCni5TzTZ1bpxcE9kjBsQkeGEEjDQi1CSHVCdBp6r52g1yz9qmtUjj7oLSl05QyUWbsk8W6Y1udGOYFw6ZO6Fn+9QoOwt+L2iSLGWOOdgswle7Vl/leROtQuoGd1Dg7AreEah/Gc8NC5dwA2yrnBTDhA9xyTDdW4nQCzPUvdsy87eWkyzcLO6FSjDofZJgsOdQt8kYcvn936EQsCzt3u3o5P9QJcuxb7l0GU7VZEoCn/WwNBg/AnT2VFnG5eVdonrEMb5N06XorfmbZWn1uMO0zMDG7/QiRl101e/3Wh/I7v+dO1R3cBM62CTmFDZ2W3bFwxXtivdXQ== 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=QT09RLtLe6uk553LyCcGOEGhrDijKtZA4UGHLd1b11c=; b=eoeAaZysotmmvNO6yW9uDU3WIeqGxLyEGTd198KaQ4fcnZi4dtSTMWv7ujtXoTITkMaF6rwjNW40ndXqL86H+sHFuFgo9bGiv/WMrrKMOkqiw5aebSrHLnOvzaXvW7aSKul3lZ3KktUAioEFo8QeUw0Im7X+1EcaLBAo8KePT2GyeJqhMDB2VKMddd1ntyihTDckp5eQ0QreeWJ46b0JvbeRrakyZki58MTOFjZ9nTwu5+Fd2BFtRujcJf1ESPN/K6fEWUWCezdg/28yosje02aRQ7TfQrQB8f6E1PscwTQg7aN61U9YCg4XblnNQTzU6UhRhWizysejB4+jrMzAKA== 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=QT09RLtLe6uk553LyCcGOEGhrDijKtZA4UGHLd1b11c=; b=Rlj8DC7u0PrH6vIB9bIv3K/s1PZrKOUf+I50xxDbb/GSreT8xdwwkBncFnn/rr2IBmeAECUI6QGSmQAxMVtGvsrtBs18xz0MWTRBwVdUK1uaUqM7Lu/mODU0jtSSOBLroPM5K9JTJxRmBjdHhf/rOP+XfiCEe9vcABRNS3HS0A8n7p/ge+no2+Msk+LhdgxtYg9yIIgX6QsXTnl7xveplwoiHVMnAwlFKDNo+VWyR0qzwyK1QV8xCwQRuqq8B8DfPWwb3/yTLQo1SOw/p17ZttB57H34gbez9QfutylihzwAQCX5akU5tpK+wUR6zVjYOGNqIrn1BPlIc9g4Y3aJsg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5701.eurprd03.prod.outlook.com (2603:10a6:20b:f6::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4823.19; Thu, 23 Dec 2021 09:13:56 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%5]) with mapi id 15.20.4823.019; Thu, 23 Dec 2021 09:13:56 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Dec 2021 10:13:27 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [q2JPvGURL9kXLuf2oErKtnItsfyJZ7U0] X-ClientProxiedBy: AM4P190CA0016.EURP190.PROD.OUTLOOK.COM (2603:10a6:200:56::26) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211223091340.1450013-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9c71dfbc-3d40-4b8e-644e-08d9c5f48bd6 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiR3EehW4kxQzdNcP2D/mG1Jgemi0kJD6pC796KZObfVC7RFLwQFf0b/qzpzyNORJaZI/ZcyXYUnKT9/Fa5GHSIGqPAfqS7LZ8ZqCQYuPc2k3gyeCjba/WXk/wg3KlkqZ3b1V2IkGYuhgIim4NNfNFv3GSYZ7ohgyjv2LzUvjO6ox0IqvACLN3jIVAt8iGvOVFwnb0ewGbDIPKneOGjfdZw9T/CDwoW7QeUi9DU6mSSqivuZITkxtlfVBF9JFZxCb1U4mHJMV9nnoGbaQtnFo3GjER7Fj0OAx9IjK/y2RUe+B9DAQ59Adu3C7WCrSAFCIqrTpkC5U1JOqYacMTkX0MNhduhGIEQ4DcBM81jsKHnMI2vT9R3/JbPp1tnBkwPL5X2HbyiaE2Qr4B6788XgyOOMac3WqdpHy5QFYvoB4gVOrWymZ1s1cjtM8gucyI0RSXghhm4P/WPtLY21CPDPB0TCs8Qv37jeUmcoMCTjzRzh02OEmhqOSTPBn3Cc7UIQMo/9F1JlqVoZCO7FGuskvBV5GXL0ztZ9yIA+PhkfhcpF2Np/YlKjJ4k5y8767VXraEi+ouJCzVZkQ/HB/QnUNiBep+XGFD4pebk28Q9ixjvv6EXYgqjIzWjSt4bGE+kpWe833vNGAPFlXq6XwRRiMz23Az0elCa2+FfyqXMYq49jKKZqHLE8HBb5Erh1cnLWA2BPi/9uyp3MVQCTCdJkeJVEgnV4vpr+4wsZJX1ewaioC9MYzdxuZWtU2sRLyhJ0cf0= X-MS-TrafficTypeDiagnostic: AM6PR03MB5701:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: z6n24ABzla/FjQGNRCjyw/fhLoNYHukqCICHSpGcnS5msaPRiEv4rl0S1XqueQWox1izmap9oetBvMoc8z8+zITZIMh5gj2IGgrYlHXcBSx+Hen5jynIeUvtyr5yoVozLXcqgKbBTRkeBxl440Avw0LTffhIU0tLHq667uMq/mM2P/jmhyEJYB3C9IQS86/x9JESfNAoxE9riLUGi6Uo3C4VEcu25wEDcQVVv0+Pq5KDp3L0VpHjm1L25MPCu0zThXVvbNuiw0Z0vCxr97t+W3Go/0JYWBAy+Feaud9KMUAnY5gTZS3s50NJphAnguxCyw/p+UNepR9CVuxlhvOe3lXaruWJ0pt8rG0F7nlv3fl5yy5SrjjhVzwdrmWYNlu0FmZCdLjW8vv4MvdT69uv653pcylyUU0mvS4LFMFVsJYkmPNZ4SXIFW9lDuBinwYTgzYiJx095IvFtkv/1jfpHflXNpAuCIk851tUv2+552AJVmPbbntDYX8OZfBQ6iFz4fWiDpxHsHqi6S1kAbVFBBTPY20uUg0nsFVftmizaivzxP2VibkELUs8q6jZ/3c9dsUPXLOAmzCM5dVp4Lbwmg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: FT4b1F7GMoK0q8SFR45pPOnEDaBFYjhUDO64d9n2acrgI9DWwYFVT6gpC7u4qBP9QhG75u2TTuPzlivhi5kId3g6L6jrCHM/NJrxaDexu6NMT1G9HzNjrVVRnL0M2DAwPfDpos3t7kMdJQf4Y5nrUXOSZAiH0xHz7IJ/oK10aY711wLeY+eHOD0fyB+J8mcf4F3LGwHDsSx9Rkyb9FO4iTj47v8+o2tibbESMWSjOWbvminFoTXG8qJQR9MslNNGNQfjFIwVIZAopMuGFEyQwsZim91AkoMOZvO22VkqmlDTtb+AvZXHWruZ6pRKj5QS4pYq0tmWNmE2Zq1T2Ch9JpIgng1iNYu0ppcHHairrKhK2gXjMH4DXaY/c6g6VBqs8i7/1izl4K2raCRgkArekHYV2Ek5O+rjgbYheGJYy/8yWebNnAuDl1SEi5idJSWJ6TemcVJusfOOftJ6dUyqbupjL2yzmHZazC5gjdXgkYDrTsotmvio78iaVdQp0g5oz8ZttZRsG7ybZkieETeX8Pxy5/uEUH/z72qXLls/nk7HnWPz1tPq2HK5ebfnw8tPz7RbfZJeGXrImD0oKtQo3+SX3FTXyV1O7FNABAeg+T3aWwyi+aivJTzJYTAjQtOSxOx2uxcyFV0UAYQVgaVEBZ5J//PKSt2V/ITy7A2POrnBwbmVg+eQlNk5bIB7RynHKkFxbLd0sbq3xPvnrpKHYUGWpwVrYmfNq90UbF5+SIDe2Vl2spkBjfCgVWe8HJbNxi6rJSIIzLUDb6MfG4bqSWygtrMy5OA4y0Y7AVNtkK6xVDYJ41a5ayMW3NfLEDPqn8cgOpkijCM7XMqopdLWXBNm1X8WgArqrzDi1kye2m5eyxiAwUJhNuKbDtzM+/e5DQh1P0JSTUWFUBK7AJvliYhDZwh3ul6NbYAAo41eC8AY2AH2ZMBJj3XDhZG3dkTwnlPwuentGe9nYNDLHFzUmA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9c71dfbc-3d40-4b8e-644e-08d9c5f48bd6 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Dec 2021 09:13:56.0285 (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: AM6PR03MB5701 Subject: [FFmpeg-devel] [PATCH 17/30] avcodec/mpeg12enc: Simplify check for A53 closed captions 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: G/N7prcgnxDj The a53_cc option is only useful and meaningful for MPEG-2, yet it was accidentally added for all mpegvideo-based encoders. This means that it is possible for a53_cc to be set for other encoders as well. This commit changes this and reroutes a53_cc to the dummy field in MpegEncContext for all codecs for which it is not supported. This allows to avoid a check for the current codec in mpeg12enc.c. Also add a compile-time check for whether the MPEG-2 encoder is available while at it. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg12enc.c | 2 +- libavcodec/mpegvideo.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index 2fb2232f3c..abb0a4b29f 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -551,7 +551,7 @@ void ff_mpeg1_encode_picture_header(MpegEncContext *s, int picture_number) } } - if (s->codec_id == AV_CODEC_ID_MPEG2VIDEO && s->a53_cc) { + if (CONFIG_MPEG2VIDEO_ENCODER && s->a53_cc) { side_data = av_frame_get_side_data(s->current_picture_ptr->f, AV_FRAME_DATA_A53_CC); if (side_data) { diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index d810f900f2..900b8b1403 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -662,7 +662,7 @@ FF_MPV_OPT_CMP_FUNC, \ #define FF_MPV_DEPRECATED_MPEG_QUANT_OPT \ { "mpeg_quant", "Deprecated, does nothing", FF_MPV_OFFSET(mpeg_quant), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, 0, FF_MPV_OPT_FLAGS | AV_OPT_FLAG_DEPRECATED }, #define FF_MPV_DEPRECATED_A53_CC_OPT \ - { "a53cc", "Deprecated, does nothing", FF_MPV_OFFSET(a53_cc), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, FF_MPV_OPT_FLAGS | AV_OPT_FLAG_DEPRECATED }, + { "a53cc", "Deprecated, does nothing", FF_MPV_OFFSET(dummy), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, FF_MPV_OPT_FLAGS | AV_OPT_FLAG_DEPRECATED }, #define FF_MPV_DEPRECATED_MATRIX_OPT \ { "force_duplicated_matrix", "Deprecated, does nothing", FF_MPV_OFFSET(dummy), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, FF_MPV_OPT_FLAGS | AV_OPT_FLAG_DEPRECATED }, #define FF_MPV_DEPRECATED_BFRAME_OPTS \