From patchwork Tue Apr 20 14:08:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 27191 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp1509695iob; Tue, 20 Apr 2021 07:08:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwVX/n52j8W15xcso1MwA4lBhJ3AA1i9cRdhUQA3mz3GsHCcVN1pllu34nAnlPY1QvIT8lq X-Received: by 2002:a05:6402:b66:: with SMTP id cb6mr32319009edb.248.1618927710054; Tue, 20 Apr 2021 07:08:30 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d9si12997425edy.174.2021.04.20.07.08.29; Tue, 20 Apr 2021 07:08:30 -0700 (PDT) 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=rk5INmIU; 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 622F16897BF; Tue, 20 Apr 2021 17:08:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR06-AM7-obe.outbound.protection.outlook.com (mail-am7eur06olkn2082.outbound.protection.outlook.com [40.92.16.82]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DE3B26805D1 for ; Tue, 20 Apr 2021 17:08:18 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=T4sX++oHLMPFLe0sYblXl1y/BBHOSXzRqR8BfufPsfVCjbkdvETirOo7NPiL3WgmhcZotRBD1rA85oATC7xgRvgleH5lIU1agAINnRNPbT1tfTLbF8FcYFSAJ3AUcuuKacPEh0z0oCWe+NANlUfSA4Tmbaan3yOWa2MB5mYWDt4O0pzBoQuIhSTH6MzeVXDEmThp+zLMMl+bPx0rWLHXv6X9VLhcJwDoKGFJkHo1WkRTKQ4COlZHjPDMrXLOw0jWPrsYyulj5XSt3o+uL9tyRHf64ZtQyUtKDf8s4GsAQBu6IPBX6xfM1Bd1HT6SUjaICytRE1MzdN4bEsfzO7ImGw== 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=txWMJkDPAJkxxRkQMR0i0iSXRNcHNXYWCESr8T/Q9vQ=; b=oOlmQ3vJTRTxjFIBdk4kfKzw82ocMa+sY7BqEmYqytnTwvKD3hg7jZbuTvXla33JzrXyXIJZRq4T2TeTN0ExRQ9IispH3h7kiSKFF3Lqxny83VBkkQ6AjVyZUC4Pa8cDy3OqmEWQkV2UQSLfP5e9Dmhtoy3WWhfED0JfU6q7vItbjcBlnZhkBOiONvjIe5HjDF47Z9irwKrScOx2nNsUA7rqmFBT7qVkLC/GyqZHam9jcenvNiD0t1NfroZW3Yoma1FUbQwXYPdEWWgEUVSC2q0Nwzfq0PPWo77S+IEIlvFLVoGMMBFqYqAJuPj09l4zXMTPY3cRGa0Z4oPl4tKAzg== 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=txWMJkDPAJkxxRkQMR0i0iSXRNcHNXYWCESr8T/Q9vQ=; b=rk5INmIUNh3CKN3Tw1SBHf7g+C0L4cimjH/00RHS7cVZFs+1rZ6NR+wJhhebqxg8r7EBBLGk2K2F418CNbdAQCXCm1G/SakPquYa4mu2aokX6Wl9eIhkuj7GcOa1HWvkgKQytDLjR2Fe9+vv1fkIro6RRG1o4lSLx4cotuXuDss6QrW77u4e/SgLQeLZh0YjYJx8jq7sb89QAGDvFQUk23kvBXGKpWFmXgjsOtjtL0fEYGvBw5ybYKmBpMRuqpa6/hN7iWOeJINdhdqjrmYnU05NL/5TJJChEaUqOGFvFD/pdWzglcgFdLmmFMg/Xvrrv63gYhRzuM7hWf7jkokPFQ== Received: from VI1EUR06FT034.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc37::4d) by VI1EUR06HT205.eop-eur06.prod.protection.outlook.com (2a01:111:e400:fc37::384) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.16; Tue, 20 Apr 2021 14:08:17 +0000 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com (2a01:111:e400:fc37::4b) by VI1EUR06FT034.mail.protection.outlook.com (2a01:111:e400:fc37::148) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.16 via Frontend Transport; Tue, 20 Apr 2021 14:08:17 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:820B90E1EA8F1FF5E243BEB18F0F63C771949CE65C640897CDD3CBAE387BF381; UpperCasedChecksum:B4C5D4053575FBC0FE705ED9A85ECE1B257C0CCB17DAC5009D3C96E5CAD902E9; SizeAsReceived:7532; Count:48 Received: from HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7]) by HE1PR0301MB2154.eurprd03.prod.outlook.com ([fe80::45bb:c44f:2b75:23b7%5]) with mapi id 15.20.4042.024; Tue, 20 Apr 2021 14:08:17 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 20 Apr 2021 16:08:08 +0200 Message-ID: X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210419141024.8174-29-jamrial@gmail.com> References: <20210419141024.8174-29-jamrial@gmail.com> X-TMN: [hsgZ68vmkxjfk1oPVDZs3mPxfdOq9kq19c1qzhy8s2A=] X-ClientProxiedBy: ZR0P278CA0149.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::11) To HE1PR0301MB2154.eurprd03.prod.outlook.com (2603:10a6:3:2a::22) X-Microsoft-Original-Message-ID: <20210420140808.1616600-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.193.169.173) by ZR0P278CA0149.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.20 via Frontend Transport; Tue, 20 Apr 2021 14:08:15 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 48 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: f0a52c7e-f8b0-4da7-3308-08d90405bdd4 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiSaJ/Gj/W3pBm4L34lmZkwXYAjIz77ZkIcxAty0RL5PQPkdA8gz+EHaMuTgtTiKQe3UCb+AtVSt7jNkx9Nb9NzC/CGMR17Lj6UhmZjgaS6sCInoMAUwAWfh32KfjvZYKAQfyBs9ni5Fv3J3TaViGOCXJxX8h+tOeerSmJ+z7quJC4fJvg+kXjh1ZLOx0JUuZROy6NWMfoXUTm+YK2Is8JIYJ+JGyJsbUqdUSSxjGw7fPDGNO+9NwsBV7hCPXRMVh3SKjc55ZZMSiaUJjQWzl2Hw2CE8EC+Q4RO2cJ3bIy7PjgrkaG2+VQnHclS2aQT7yE/rmWuNehcmRq09Qf0ofergUjV6lE25jgL39dwoLI/CCydxBYB29dJ1Bdv8IOU/NJJNA80I1l4hrK4MKylADa9Th88T2Cql0Us4u9PbGyxLDDlEQDArfB8AimRXuhupQe/FSWW80iN4NBmUjuHUBbYqMHZ8dj3BuASUwJVYkW/XxpekNrnz1tLR1Ay82KQEICBmoirl8jdNKclRO+QIzbGxtowBM+CiZJo0fzIb5mhP+wUk8OLlHQEBiR6zdWUHqdLtAtuRgZW4mIFsIEdcVs4dKMAs9xBcUAlUprTHeWOrmf/wP2X5aP2vCd7iz00YH8IXkHM3Uq89E6/xa+QQrcCRh7hy9+bpumZA4LFakBxq+6iMVNKQOBKBEhVpRZiXNtux4YxL2q4A8db6kwv6XGpmAmBY9qUKfDnxSl4uc6LKA2QVlsOnL6kPpMLKGu0KRlw= X-MS-TrafficTypeDiagnostic: VI1EUR06HT205: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sH2iYySy7qH2utO4ITo8Aw/kcmBXYMfCg4Mt6B6C0XYsUHUTzheclgPRgbj9WeqKpCAogRFGeQepzFfp+iflUZadmjN5ka3fuo0ZzgwzGKGok6sPrQPjr58EQG+uy6Re+xg68PdYijVsvdUstcCdpPU01mpPMa7Q/d+mbb3Wa6kelfzFMG15IYnJA+6XncnF25QIC8YI7/Ne6DGfXqevAqIVGOALYzzVvGdnGv+V8aeQVTuoId+Yk2oJLyh0CXCfMkhXrHSQI3IYgizj/c6mwFkjnOmLVNgADo+NMmZUlm5xHYU6Wov9q/ysKkvS8ltbzWwCrzO4m3mtEoiXCcZQVN9U1ne/DYzYqFEBltSoYdWMDv40JULinlem0mvYJqd9SADozlZkIZ1oAoMZqEITXA== X-MS-Exchange-AntiSpam-MessageData: UFkqNZQMvVWK2fCRJUrwL2Cuwi8CjakTsKiZJNomlRfOA9tYDBSfYKsfb8KJNXqO56op7VrOnfV250wnbUEFa+un4tBkqMEro4Q40wbagO0QDVYVLMssdDiN+sWXuODtGlcoCetqJXTezmmYJDehbQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f0a52c7e-f8b0-4da7-3308-08d90405bdd4 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2021 14:08:17.4595 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: VI1EUR06FT034.eop-eur06.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: VI1EUR06HT205 Subject: [FFmpeg-devel] [PATCH v2 28/90] avcodec: Remove deprecated old aliases for NVENC encoders 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: Gq80qJ8PtRGe Deprecated in 888a5c794778a2f2aad22e9b4a3952dff92b11fa. Signed-off-by: Andreas Rheinhardt --- Now also removing the configure and Makefile entries for the removed encoders. configure | 3 -- libavcodec/Makefile | 3 -- libavcodec/allcodecs.c | 6 ---- libavcodec/nvenc_h264.c | 69 ----------------------------------------- libavcodec/nvenc_hevc.c | 37 ---------------------- libavcodec/version.h | 3 -- 6 files changed, 121 deletions(-) diff --git a/configure b/configure index cc1013fb1d..9cc9fa7816 100755 --- a/configure +++ b/configure @@ -3064,7 +3064,6 @@ overlay_cuda_filter_deps_any="cuda_nvcc cuda_llvm" amf_deps_any="libdl LoadLibrary" nvenc_deps="ffnvcodec" nvenc_deps_any="libdl LoadLibrary" -nvenc_encoder_deps="nvenc" aac_mf_encoder_deps="mediafoundation" ac3_mf_encoder_deps="mediafoundation" @@ -3132,8 +3131,6 @@ mpeg4_omx_encoder_deps="omx" mpeg4_v4l2m2m_decoder_deps="v4l2_m2m mpeg4_v4l2_m2m" mpeg4_v4l2m2m_encoder_deps="v4l2_m2m mpeg4_v4l2_m2m" msmpeg4_crystalhd_decoder_select="crystalhd" -nvenc_h264_encoder_select="h264_nvenc_encoder" -nvenc_hevc_encoder_select="hevc_nvenc_encoder" vc1_crystalhd_decoder_select="crystalhd" vc1_cuvid_decoder_deps="cuvid" vc1_mmal_decoder_deps="mmal" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 31b220025b..2539839528 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -373,8 +373,6 @@ OBJS-$(CONFIG_H264_MEDIACODEC_DECODER) += mediacodecdec.o OBJS-$(CONFIG_H264_MF_ENCODER) += mfenc.o mf_utils.o OBJS-$(CONFIG_H264_MMAL_DECODER) += mmaldec.o OBJS-$(CONFIG_H264_NVENC_ENCODER) += nvenc_h264.o -OBJS-$(CONFIG_NVENC_ENCODER) += nvenc_h264.o -OBJS-$(CONFIG_NVENC_H264_ENCODER) += nvenc_h264.o OBJS-$(CONFIG_H264_OMX_ENCODER) += omx.o OBJS-$(CONFIG_H264_QSV_DECODER) += qsvdec.o OBJS-$(CONFIG_H264_QSV_ENCODER) += qsvenc_h264.o @@ -395,7 +393,6 @@ OBJS-$(CONFIG_HEVC_CUVID_DECODER) += cuviddec.o OBJS-$(CONFIG_HEVC_MEDIACODEC_DECODER) += mediacodecdec.o OBJS-$(CONFIG_HEVC_MF_ENCODER) += mfenc.o mf_utils.o OBJS-$(CONFIG_HEVC_NVENC_ENCODER) += nvenc_hevc.o -OBJS-$(CONFIG_NVENC_HEVC_ENCODER) += nvenc_hevc.o OBJS-$(CONFIG_HEVC_QSV_DECODER) += qsvdec.o OBJS-$(CONFIG_HEVC_QSV_ENCODER) += qsvenc_hevc.o hevc_ps_enc.o \ hevc_data.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 3194232500..cf6fe2055b 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -27,7 +27,6 @@ #include "config.h" #include "libavutil/thread.h" #include "avcodec.h" -#include "version.h" extern AVCodec ff_a64multi_encoder; extern AVCodec ff_a64multi5_encoder; @@ -796,11 +795,6 @@ extern AVCodec ff_h264_qsv_encoder; extern AVCodec ff_h264_v4l2m2m_encoder; extern AVCodec ff_h264_vaapi_encoder; extern AVCodec ff_h264_videotoolbox_encoder; -#if FF_API_NVENC_OLD_NAME -extern AVCodec ff_nvenc_encoder; -extern AVCodec ff_nvenc_h264_encoder; -extern AVCodec ff_nvenc_hevc_encoder; -#endif extern AVCodec ff_hevc_amf_encoder; extern AVCodec ff_hevc_cuvid_decoder; extern AVCodec ff_hevc_mediacodec_decoder; diff --git a/libavcodec/nvenc_h264.c b/libavcodec/nvenc_h264.c index 4c2585876e..ea7390cbf1 100644 --- a/libavcodec/nvenc_h264.c +++ b/libavcodec/nvenc_h264.c @@ -198,75 +198,6 @@ static const AVCodecDefault defaults[] = { { NULL }, }; -#if FF_API_NVENC_OLD_NAME - -static av_cold int nvenc_old_init(AVCodecContext *avctx) -{ - av_log(avctx, AV_LOG_WARNING, "This encoder is deprecated, use 'h264_nvenc' instead\n"); - return ff_nvenc_encode_init(avctx); -} - -#if CONFIG_NVENC_ENCODER -static const AVClass nvenc_class = { - .class_name = "nvenc", - .item_name = av_default_item_name, - .option = options, - .version = LIBAVUTIL_VERSION_INT, -}; - -AVCodec ff_nvenc_encoder = { - .name = "nvenc", - .long_name = NULL_IF_CONFIG_SMALL("NVIDIA NVENC H.264 encoder"), - .type = AVMEDIA_TYPE_VIDEO, - .id = AV_CODEC_ID_H264, - .init = nvenc_old_init, - .receive_packet = ff_nvenc_receive_packet, - .close = ff_nvenc_encode_close, - .flush = ff_nvenc_encode_flush, - .priv_data_size = sizeof(NvencContext), - .priv_class = &nvenc_class, - .defaults = defaults, - .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HARDWARE | - AV_CODEC_CAP_ENCODER_FLUSH, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, - .pix_fmts = ff_nvenc_pix_fmts, - .wrapper_name = "nvenc", - .hw_configs = ff_nvenc_hw_configs, -}; -#endif - -/* Add an alias for nvenc_h264 */ -#if CONFIG_NVENC_H264_ENCODER -static const AVClass nvenc_h264_class = { - .class_name = "nvenc_h264", - .item_name = av_default_item_name, - .option = options, - .version = LIBAVUTIL_VERSION_INT, -}; - -AVCodec ff_nvenc_h264_encoder = { - .name = "nvenc_h264", - .long_name = NULL_IF_CONFIG_SMALL("NVIDIA NVENC H.264 encoder"), - .type = AVMEDIA_TYPE_VIDEO, - .id = AV_CODEC_ID_H264, - .init = nvenc_old_init, - .receive_packet = ff_nvenc_receive_packet, - .close = ff_nvenc_encode_close, - .flush = ff_nvenc_encode_flush, - .priv_data_size = sizeof(NvencContext), - .priv_class = &nvenc_h264_class, - .defaults = defaults, - .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HARDWARE | - AV_CODEC_CAP_ENCODER_FLUSH, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, - .pix_fmts = ff_nvenc_pix_fmts, - .wrapper_name = "nvenc", - .hw_configs = ff_nvenc_hw_configs, -}; -#endif - -#endif - static const AVClass h264_nvenc_class = { .class_name = "h264_nvenc", .item_name = av_default_item_name, diff --git a/libavcodec/nvenc_hevc.c b/libavcodec/nvenc_hevc.c index 441e7871d2..1aacec5f9c 100644 --- a/libavcodec/nvenc_hevc.c +++ b/libavcodec/nvenc_hevc.c @@ -179,43 +179,6 @@ static const AVCodecDefault defaults[] = { { NULL }, }; -#if FF_API_NVENC_OLD_NAME - -static av_cold int nvenc_old_init(AVCodecContext *avctx) -{ - av_log(avctx, AV_LOG_WARNING, "This encoder is deprecated, use 'hevc_nvenc' instead\n"); - return ff_nvenc_encode_init(avctx); -} - -static const AVClass nvenc_hevc_class = { - .class_name = "nvenc_hevc", - .item_name = av_default_item_name, - .option = options, - .version = LIBAVUTIL_VERSION_INT, -}; - -AVCodec ff_nvenc_hevc_encoder = { - .name = "nvenc_hevc", - .long_name = NULL_IF_CONFIG_SMALL("NVIDIA NVENC hevc encoder"), - .type = AVMEDIA_TYPE_VIDEO, - .id = AV_CODEC_ID_HEVC, - .init = nvenc_old_init, - .receive_packet = ff_nvenc_receive_packet, - .close = ff_nvenc_encode_close, - .flush = ff_nvenc_encode_flush, - .priv_data_size = sizeof(NvencContext), - .priv_class = &nvenc_hevc_class, - .defaults = defaults, - .pix_fmts = ff_nvenc_pix_fmts, - .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HARDWARE | - AV_CODEC_CAP_ENCODER_FLUSH, - .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, - .wrapper_name = "nvenc", - .hw_configs = ff_nvenc_hw_configs, -}; - -#endif - static const AVClass hevc_nvenc_class = { .class_name = "hevc_nvenc", .item_name = av_default_item_name, diff --git a/libavcodec/version.h b/libavcodec/version.h index 147bcb08a4..6e4a665b07 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -54,9 +54,6 @@ #ifndef FF_API_CODED_FRAME #define FF_API_CODED_FRAME (LIBAVCODEC_VERSION_MAJOR < 59) #endif -#ifndef FF_API_NVENC_OLD_NAME -#define FF_API_NVENC_OLD_NAME (LIBAVCODEC_VERSION_MAJOR < 59) -#endif #ifndef FF_API_STRUCT_VAAPI_CONTEXT #define FF_API_STRUCT_VAAPI_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 59) #endif