From patchwork Mon Apr 19 14:09:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 27021 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp557587iob; Mon, 19 Apr 2021 07:13:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyjybuw37Jc761nJwjppq+Y99Xny/ezVdNFvQQG7TqW56kn3G14ex0xwdMCS9S6PZiztov9 X-Received: by 2002:aa7:cd52:: with SMTP id v18mr25702909edw.97.1618841635829; Mon, 19 Apr 2021 07:13:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618841635; cv=none; d=google.com; s=arc-20160816; b=tfv9iTMa/VFAxAf3ilfGjvM3yOMlUYsDxPYNotoHxEpSTW9sn4tjDDTKOqPIIABgsP snYfP0qf8hrNXoVLwDwsa8HX7uIT8upiZWrIiytf/KVjYMH4y44KI1GTowJZw+6USHb5 JenyQ+FofqZDcjXQHBnr234JaNqTad0IibuM2zw/p/Ox7fiS5GlZkmhkd0vzoB07a42l jHtTlFWvHt+BfMo0ZpRThNhGiOXOPIm1WEXIwtFR8d8XPdbGNojuol0dCkf4yt8VZKuy 1rq5ZXkRU4aC9ChJ0jD6B0K1il3do1S5JMDz2AzDTz6ZnifuAHMPvQJn/rq12DxrWo7C um0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=Y0BaRYn/ubF32p30dUcFuNGML4avSteEEZCGKwTSaAU=; b=EnjG0087Ghrs/y6C5PBe46tx/z++LknSpTtLxgGdjC2eoysRYK9Pk2O5jW7y7EnbHf lqnKpU7HcYWEbyDomH9U8A/GzrVcWa0YWpVh2vM+AJ1FiVj1ak/RM5p01bN0o276HdTv fX8OS0Vo2xpOUCup5q4w5GcV9FCh8+LUjE2qy0GUvtGKCZvUFzscoPjA7L3FWmENKY/I ZXQ6UCxAcoDLIFMJHTiiPgJJLcr4kxYW+K21PVYB/4cGR81bali5wu93En8tchBWw3Di MUNMutLm0GSTq6xzM3vib3z8tMjOx4IJX69Wnv8mrdhxGC1xvzpJDkCERl8DDJWy7CiN YP4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=LmXjv1K4; 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=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v5si2226200edq.440.2021.04.19.07.13.55; Mon, 19 Apr 2021 07:13:55 -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=@gmail.com header.s=20161025 header.b=LmXjv1K4; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9B564680CF1; Mon, 19 Apr 2021 17:11:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f178.google.com (mail-qk1-f178.google.com [209.85.222.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 02E6E680CE8 for ; Mon, 19 Apr 2021 17:11:36 +0300 (EEST) Received: by mail-qk1-f178.google.com with SMTP id s5so27071503qkj.5 for ; Mon, 19 Apr 2021 07:11:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=IrEQkA6VJMpnxCYKH4OlCE9RQvcSJaq3682is8XYqWw=; b=LmXjv1K4z5UTrCdSbq+oVQSDKhVc7/EL4DKXeYRHdGiwRoa6wP8Y3iiP4+eHB6gkDT h46VVrd2yFReUcw/CuuRfGXikDwpT07E7aOnOkx4w/5oP817e3f16D5sGQqWL+zyoV1L GuMY5G+UxIxbLljsMQLuiXI0VvTuANoEcNe6lHu7J1nrCPQVxqSd5SV9PL8/gN2u74GA kMuFKK9nMhRrYMX/489kLnwC8W/i28vLLcaBXVZy0YDjwScffyLo1aKCd+BN1panDLYM MG8MPLwn7WuclUUm2pQxrxcvIFPHVH//cBQL/Oc/YChE66DABFeM5FEx9jOf7FCtFEPE w1aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IrEQkA6VJMpnxCYKH4OlCE9RQvcSJaq3682is8XYqWw=; b=hCrNPRj8azJIcneOLfZJ54q9KP+8Ci7Wyqv0vS4x8CTxseSBfZTePlXuOTtdIQQI/c ZKAscxIKmLPQ10KlgSBBCBdzTDIuGIyp43vv6HQ8r0kHXP1G0PHIIuUyMJSTasyRsVWS xp4TkRsHuD1myBgdUw/mBvolnx/ngJHaabC0I+SzUwjadp1Lrg/Zg253Hi1SN9zOzqnL bbnmct/erjQF7JItwkm066ucLMFEIRSBG55/xZNPch5u9lyxh8rZTgrCXyuCHom4RBM5 gyenu5mX6nO1xS4C+j8R5a/9cLN21W6HrNYJRHtsGZRY0CxA8MPUMUeYBydBbmevJia3 WYMw== X-Gm-Message-State: AOAM533x2fvKzNPCUhs3L5jXWjmclDiIK/UH1KqmRmJxGNpCHLeDO1vw UfgIFwCpUVlrxtLmvM6iGu/PT6zljNM= X-Received: by 2002:a37:492:: with SMTP id 140mr4233532qke.161.1618841495589; Mon, 19 Apr 2021 07:11:35 -0700 (PDT) Received: from localhost.localdomain ([191.83.209.133]) by smtp.gmail.com with ESMTPSA id f7sm2049494qtv.53.2021.04.19.07.11.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 07:11:35 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Apr 2021 11:09:25 -0300 Message-Id: <20210419141024.8174-29-jamrial@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210419141024.8174-1-jamrial@gmail.com> References: <20210419141024.8174-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 28/87] 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 8njpDPvTnC3J From: Andreas Rheinhardt Deprecated in 888a5c794778a2f2aad22e9b4a3952dff92b11fa. Signed-off-by: Andreas Rheinhardt --- libavcodec/allcodecs.c | 6 ---- libavcodec/nvenc_h264.c | 69 ----------------------------------------- libavcodec/nvenc_hevc.c | 37 ---------------------- libavcodec/version.h | 3 -- 4 files changed, 115 deletions(-) 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