From patchwork Tue Apr 6 21:55:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26787 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 7821C44AF20 for ; Wed, 7 Apr 2021 00:56:01 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5B87368A853; Wed, 7 Apr 2021 00:56:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067092.outbound.protection.outlook.com [40.92.67.92]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 913E468A7B6 for ; Wed, 7 Apr 2021 00:55:52 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QZMZngLfiEL36Ptae2jFPNhcyy/Pv/1G36IEfwatpvQLytoLb953W4DvZOk/ap5pnWfipp/znne6EanCumDT/+g5ZGERBT2+OIowmWU7Fg8r8pcPENoZY9JUwmMTEk9sDC23Y4f0nLvh/4FrQxtswR00znlGCdcP3aZ9inXjQPFNJHILOWFA1zyge7Mvsp7eex/0RPQPFb48ywDm0feWEr9F3CNiRCUXZ3PCqhaNNNYkNdsXbDhSVmsawbS37cUBQwtuNV9njYZ6auHkjgL9Olz/i/FpcNmHkoYtG1uyNM8rBFGWj728Yk8uDex4BVAMoFaKM8inaUFoSOe698Rx4A== 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-SenderADCheck; bh=aTO4Ru8lOXy+qf2nDFIGXtFJw9LzGgYhw+DAco7N+9c=; b=P2GqCAAvCy82Yb9WNmvMsrJztQYfDm7VBqE4zSJMskq40SOQ8WrD2VLkqMYdwSq/YfOEsL6uXNrmo73/3m/GUgR4szoSO7AUlvj79EtWcgcxblLuvRqumhuwejsFUaMgSq1016vRxFC5x7YiCJsPJwUcxUFqaypeBuyE0eB70motVDnx2YXQm7ZFziaABeawuvNZIGHj55hH5GWYjv/2BDRarqKk3AgM/PJCFbCiDJBKVDclVsZehbIxRgWQBfISRHYfS71pEbzn60s7Jh91lj9Uoiu+sAKf5nqCkO4U3LeRAFwS/881e5VgyX9FOM2ODtYbvzkO8R/m7VX+Y2QJXQ== 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=aTO4Ru8lOXy+qf2nDFIGXtFJw9LzGgYhw+DAco7N+9c=; b=g803+XJrDsPszVgNt7v++cYEtLy/2mkFexuoVrIewlgPlJuhv+3HhHK8DVgvOoxJMZ9c9wR9Hbi3MVD+qQGDMU5IHRKJ8gztcO/YQw6e3+XH0u604T7jS8e6txYGmJYdSdsg8/39iCQgzoXb0vlgLr+MISwH4xYxRW/Za9A2D2NDW4vXkQA0Z8s62UqMkeuojWaWcMfmhkWfWWFs1IIR6WaMS6bstSpPLsgJtEgJeKmU1CKn8oel/Sq+0EcWmzLov0DJZKYdv6PHLL+63RYseFXxWuPTWy5joyTVvy8l6JiDBlI4ioiA2KvhZ23uwQIGkp9nklC0z48PkuGZdGvbHQ== Received: from AM5EUR02FT037.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1c::47) by AM5EUR02HT216.eop-EUR02.prod.protection.outlook.com (2a01:111:e400:7e1c::378) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.28; Tue, 6 Apr 2021 21:55:51 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:7e1c::46) by AM5EUR02FT037.mail.protection.outlook.com (2a01:111:e400:7e1c::182) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.28 via Frontend Transport; Tue, 6 Apr 2021 21:55:51 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:DE2E80E4045C1DCD51FFC7FC68359BA70DB1ECA1D7856547DEF2C08EDCCB204C; UpperCasedChecksum:7B478A5D4C51A649676611C4FC1931DF86BE00AD549E5E75430D5E9AFC78A886; SizeAsReceived:7601; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::8128:5de5:4e94:9a21]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::8128:5de5:4e94:9a21%3]) with mapi id 15.20.3999.032; Tue, 6 Apr 2021 21:55:51 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 6 Apr 2021 23:55:14 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: References: X-TMN: [rQZaSQlPhbYyhEz6QJyh3a8yKdzHQJQ3] X-ClientProxiedBy: ZR0P278CA0046.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1d::15) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210406215516.832944-8-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.137.96) by ZR0P278CA0046.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1d::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.16 via Frontend Transport; Tue, 6 Apr 2021 21:55:51 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 20b601e7-749b-4b56-05dc-08d8f946be8c X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRct5ooVDkA416xUUNF5iBFhxjKnFATuOGkolnnxcfJcXbxUXOJT0iDofx7WobwFrjQqXsv3oufy5uzvLcom4t+l/H3o2DOC2725I2oZEj/xjYJ85ow+X5fAeH17qicWNgWdQ8I0lzq+LmO2ngvoJn7KU9P3JxX7QCdiWM0Gzg5K1/qwqH/ZzqT6SIMzbir1sNPPg+8267V+1y4nYnmUGRXb5KKGgd09npV3Hulnnls+3mZJHuwvE01IERLysfv2y/HH2phyFVKYgiT2/NCiQlZGe7FRgfPN/Ey5JWH/jD6PBx/OvL5cXx7hvW1syjEtVrQnrGHcGkaiBCtI44cH/Bx2huqNbXnkFLBh/Ybq+XpMoCp7WCckTcD4eUY5D/8tkkQHQb1+VrxeJGWRUIKtB/vFD7YlIgw1K44otiviLGVrguCGrNNYBQuCk4H9x1GLlmBfVS/Gvo8nPErsQgFKmAkBUa+cnOz6unJIZtcmKxee/VsPFfvZfgwa/BctnrNcXMkP7wvb27nWCBrMVe6ypjLRSLklg5m9Kq8BrhW0wzEm46Il9TWBTz0kdCNIloyNtguAvd/vzNiXsvQYA/+JDphtr/sFZO7rLN3glcMfhoV3t09HDiHoiQH8LfbjZXnQ9hsSlEZNMeUwC6/39DXDRamsv6CRSSHtUJUMi4mdKxQBhaVsd4vI/5Cde8gBgeCKeLOHm70NKnpHn6Mq27vt2vxGkzoiwRWVSkFV3hgrND4AEdDHy2i7otYW8+yzOcFZM8= X-MS-TrafficTypeDiagnostic: AM5EUR02HT216: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: n6aENPe6ZAN7agT7syArCJ4iOOfWJTrSUBmzDvtsiHVW2JP08HWeB/wNkvGNKMT9eFCWu73vlDYRO48scqWrFtpoOMbN2PMmYeW18sQ1tnXRnP7tjOWFvF6+Qivs2MDIH7r1HtAupBytH54I52VjSEej7idqy3oX6fHpIj5OAT6Dt2NDrYGpMkTOgy94t/TLAxZCzPpZEFNq8BrFCHHAIML2VHT68++DrsmJOGQEcADppdvEHUg6H6V93U8fDJviSL29IWUmGPmnFWNPBGLjN0ZojcdKVGQ+jbTubh/1fEWn/VL19Y+EyEBRcQker/6ETBBfrry+q34gqnOPtlqROTU0HW/yAPnBf/tukBHH4GR9UY/V4d9G67oqzTW3QiO9UMfZKjrIgNlJxbkouVKSdw== X-MS-Exchange-AntiSpam-MessageData: UY8mm0NiypeaQEq3uXWt9cEgtlubT+y8WgOeNCGfCUjmQyFoiNsDoBNMa4lkSs+Br2DiriMXvS5CsuhzeReoAR3Zb6dyzbwlEyqQLWjMldsv1Jg5b89wZwE9eEGOvdgv76WTtwuHhyN5Kj0JgKWRJw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 20b601e7-749b-4b56-05dc-08d8f946be8c X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Apr 2021 21:55:51.5008 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: AM5EUR02FT037.eop-EUR02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5EUR02HT216 Subject: [FFmpeg-devel] [PATCH 17/19] avcodec/mpegvideo: Deprecate duplicate matrix opt for unsupported codecs X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" Signed-off-by: Andreas Rheinhardt --- libavcodec/mjpegenc.c | 1 + libavcodec/mpeg12enc.c | 2 ++ libavcodec/mpeg4videoenc.c | 1 + libavcodec/mpegvideo.h | 3 ++- libavcodec/mpegvideo_enc.c | 3 +++ 5 files changed, 9 insertions(+), 1 deletion(-) diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c index 86a18ec6a9..792169d6bb 100644 --- a/libavcodec/mjpegenc.c +++ b/libavcodec/mjpegenc.c @@ -593,6 +593,7 @@ FF_MPV_COMMON_OPTS { "huffman", "Huffman table strategy", OFFSET(huffman), AV_OPT_TYPE_INT, { .i64 = HUFFMAN_TABLE_OPTIMAL }, 0, NB_HUFFMAN_TABLE_OPTION - 1, VE, "huffman" }, { "default", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = HUFFMAN_TABLE_DEFAULT }, INT_MIN, INT_MAX, VE, "huffman" }, { "optimal", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = HUFFMAN_TABLE_OPTIMAL }, INT_MIN, INT_MAX, VE, "huffman" }, +{ "force_duplicated_matrix", "Always write luma and chroma matrix for mjpeg, useful for rtp streaming.", OFFSET(force_duplicated_matrix), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, VE }, #if FF_API_MPEGVIDEO_OPTS FF_MPV_DEPRECATED_MPEG_QUANT_OPT FF_MPV_DEPRECATED_A53_CC_OPT diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index 5b8ccf3ce1..0b88408046 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -1155,6 +1155,7 @@ static const AVOption mpeg1_options[] = { #if FF_API_MPEGVIDEO_OPTS FF_MPV_DEPRECATED_MPEG_QUANT_OPT FF_MPV_DEPRECATED_A53_CC_OPT + FF_MPV_DEPRECATED_MATRIX_OPT #endif { NULL }, }; @@ -1187,6 +1188,7 @@ static const AVOption mpeg2_options[] = { #if FF_API_MPEGVIDEO_OPTS { "mpeg_quant", "Deprecated, does nothing", OFFSET(mpeg_quant), AV_OPT_TYPE_INT, {.i64 = 1 }, 0, 1, VE | AV_OPT_FLAG_DEPRECATED }, + FF_MPV_DEPRECATED_MATRIX_OPT #endif FF_MPEG2_PROFILE_OPTS { NULL }, diff --git a/libavcodec/mpeg4videoenc.c b/libavcodec/mpeg4videoenc.c index 384710cf60..f97c506d13 100644 --- a/libavcodec/mpeg4videoenc.c +++ b/libavcodec/mpeg4videoenc.c @@ -1380,6 +1380,7 @@ static const AVOption options[] = { FF_MPV_COMMON_OPTS #if FF_API_MPEGVIDEO_OPTS FF_MPV_DEPRECATED_A53_CC_OPT + FF_MPV_DEPRECATED_MATRIX_OPT #endif FF_MPEG4_PROFILE_OPTS { NULL }, diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 508ae0dfb9..9a6ad75166 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -662,7 +662,6 @@ FF_MPV_OPT_CMP_FUNC, \ { "zero", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FF_ME_ZERO }, 0, 0, FF_MPV_OPT_FLAGS, "motion_est" }, \ { "epzs", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FF_ME_EPZS }, 0, 0, FF_MPV_OPT_FLAGS, "motion_est" }, \ { "xone", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FF_ME_XONE }, 0, 0, FF_MPV_OPT_FLAGS, "motion_est" }, \ -{ "force_duplicated_matrix", "Always write luma and chroma matrix for mjpeg, useful for rtp streaming.", FF_MPV_OFFSET(force_duplicated_matrix), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, FF_MPV_OPT_FLAGS }, \ {"b_strategy", "Strategy to choose between I/P/B-frames", FF_MPV_OFFSET(b_frame_strategy), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, 2, FF_MPV_OPT_FLAGS }, \ {"b_sensitivity", "Adjust sensitivity of b_frame_strategy 1", FF_MPV_OFFSET(b_sensitivity), AV_OPT_TYPE_INT, {.i64 = 40 }, 1, INT_MAX, FF_MPV_OPT_FLAGS }, \ {"brd_scale", "Downscale frames for dynamic B-frame decision", FF_MPV_OFFSET(brd_scale), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, 3, FF_MPV_OPT_FLAGS }, \ @@ -683,6 +682,8 @@ FF_MPV_RC_STRATEGY_OPTS { "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 }, +#define FF_MPV_DEPRECATED_MATRIX_OPT \ + { "force_duplicated_matrix", "Deprecated, does nothing", FF_MPV_OFFSET(force_duplicated_matrix), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, FF_MPV_OPT_FLAGS | AV_OPT_FLAG_DEPRECATED }, #endif extern const AVOption ff_mpv_generic_options[]; diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 03fcfa83dd..2330e4440e 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -89,6 +89,7 @@ const AVOption ff_mpv_generic_options[] = { #if FF_API_MPEGVIDEO_OPTS FF_MPV_DEPRECATED_MPEG_QUANT_OPT FF_MPV_DEPRECATED_A53_CC_OPT + FF_MPV_DEPRECATED_MATRIX_OPT #endif { NULL }, }; @@ -4714,6 +4715,7 @@ static const AVOption h263_options[] = { #if FF_API_MPEGVIDEO_OPTS FF_MPV_DEPRECATED_MPEG_QUANT_OPT FF_MPV_DEPRECATED_A53_CC_OPT + FF_MPV_DEPRECATED_MATRIX_OPT #endif { NULL }, }; @@ -4748,6 +4750,7 @@ static const AVOption h263p_options[] = { #if FF_API_MPEGVIDEO_OPTS FF_MPV_DEPRECATED_MPEG_QUANT_OPT FF_MPV_DEPRECATED_A53_CC_OPT + FF_MPV_DEPRECATED_MATRIX_OPT #endif { NULL }, };