From patchwork Tue Oct 8 22:50:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 52158 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:8b47:0:b0:48e:c0f8:d0de with SMTP id x7csp712658vql; Tue, 8 Oct 2024 22:26:11 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUN7SGedneiueH38Ftqs9re+LAey3OSfDxegExFLHIdHmW/+5hsA2bE/HVzIhvbiRj2gJoh7RJdl4G7CGNEbCrt@gmail.com X-Google-Smtp-Source: AGHT+IEonDpzRoEqubcXdA91HtD5pMSwTcr5ZOW1IEHTnJLW6UU0wZ9BirZPGffWqYq9Zw/BGybq X-Received: by 2002:a2e:5152:0:b0:2fa:c0df:3d7b with SMTP id 38308e7fff4ca-2fb1873da33mr4830551fa.22.1728451571692; Tue, 08 Oct 2024 22:26:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1728451571; cv=none; d=google.com; s=arc-20240605; b=YaBf2Ap5SXFyR/bHPyI4C7YtBfAQoqAlHjPLgBqfbVTqX+iwfwN1M7JgvyM9zYQSZK VbCtSfnrOs0R/LvVPD/0PJbo/Hm6d68qLw7lTbod+vVn0vP8vipONX4/k9eT7NxXwThm +ALOyq7rSodsTQfsxb/zps4uBv5JMBSzfmNYKtxW9+PaOHHWGFR1DRiaDhGuBJqiJnfD d/uJ4JTIipen079qYrozGB0M0xhTmyp04zLdMg05UfVnntYXx9ukWbCuH13ETDVHt7Fh Bg1o5sihM8DoAre2qSE49l0keFu4PXOQFm0sfLZ/ZVy4/CamEhE8uC3SDbKP+B1n0v6O Q9Lw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=u2uztlkxKVYKTKJAkvTrIP0ZZG+MjkcmIeSkfa7QBV0=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=gGbbu+vloIrw7nTBgegjRW3nrMUW738UCgFi3fwl/1yWwdnDXlIMQVg+DyTgz8iVkh GlXjQslzbqZdTxGE/62jOkD6S9bbnZgkj/9PNfTFVUxLSxjW+YFaax/xCsrOOqIQRaWb GRwc+NLBWEABpNk+DetEkT/FjL5/eltwg6bj9H0oGQTI2K6xTWJUSA5N3qoSBSFOTbWG +fRaJhq92RM2KPqVNvwSbx7eakvFY48UVp/+gotEO1QFfKuRHILgOIz5FFBPq9z/R6F8 aWuK6umD8b+GK4IM/3rCfi9u/un34EZLWa8lzZjgHpuxrI9xME0KFmvTmHT3PIZ9rhre 4GuQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=dbWYPSMh; 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; dara=fail header.i=@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 38308e7fff4ca-2faf9b228dbsi28270381fa.317.2024.10.08.22.26.10; Tue, 08 Oct 2024 22:26:11 -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=20230601 header.b=dbWYPSMh; 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; dara=fail header.i=@gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4A22968DE51; Wed, 9 Oct 2024 01:51:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E64E568DD6C for ; Wed, 9 Oct 2024 01:51:07 +0300 (EEST) Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-20bb39d97d1so53776115ad.2 for ; Tue, 08 Oct 2024 15:51:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728427866; x=1729032666; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=QJaeMw8YKttRjrHD2b5Z8k+4WIrf6//VTt0xYpyVyRU=; b=dbWYPSMhmZaw4kEs5HfupzCPXYn4HgE4QoEtt/bAn8UWnhg83zMzH2s7h38KHYPK0J fLtISVyleq7V581+yUpfI48SDzOOE3uNc94uICVRDc2Wcgy+uGQ7gNCiIyqlr6F6PQtj LlQ8PJIGOCQlmZ0+tyX9tBJEjrdNImmj/VdYekb/h6FwH5SC7pJmpNJCqVPsqnnOkwzR ZbSlsjgCvoN8U0CvTwT/+50rBuL+wMIobqSf/9DEN2G7iq0KfglQQV5xLV/A94fbktTr g/YoNOPYh2Zv/iQ3N84qoQ3iVUIR5lT/4N4N4tLI6omjF/25WePMjqiUg06exEiwuwWO ceCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728427866; x=1729032666; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QJaeMw8YKttRjrHD2b5Z8k+4WIrf6//VTt0xYpyVyRU=; b=ZK0cFIEi9/PYb0vQkj8wffN9Cb+BQrQaEXCEgNwZ7y6oSfqjeqrncfr47PZq9MzaLy vDq22b5B6tcH2WJ5kugzArVPuIL9K2UHOmHgyffhlqXxyXoAGxDFk8HmtTGuHIsvCmM8 UZ5MTaK9Q6LhxO6WT5HEb3OqjOYpKl4CURHXvJGwH76WlFXsMnXo31Tdhvu+plP5NYA/ slZmRxC/AMhlgR0TjZe2H7Rr8/iltDWKjkwI6J1cyz0YKTCHxW5E7kke+oX6EZFeuJ89 wnWuF34Ijc9rpJGOQCbkgiaoeZLZTBqAe16zaK92mTtUyYBGcKVHK8QRiRhpEv366B+i nfuA== X-Gm-Message-State: AOJu0Yxg4dL6m8NsDQf9x3u0iKI8mTGoelmUrTv7iFHY4nZ/FxIyqZ5q NpPLkArUMMQIaYc6clah0bf5fn7HVFuVBd8VzRHdcsbYD6yzDGRwbNtTww== X-Received: by 2002:a17:903:2344:b0:20b:6f04:486f with SMTP id d9443c01a7336-20c6375f64emr6621165ad.18.1728427865685; Tue, 08 Oct 2024 15:51:05 -0700 (PDT) Received: from localhost.localdomain ([181.92.233.116]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20c138afaa0sm60373855ad.4.2024.10.08.15.51.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Oct 2024 15:51:05 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Oct 2024 19:50:26 -0300 Message-ID: <20241008225027.12209-21-jamrial@gmail.com> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241008225027.12209-1-jamrial@gmail.com> References: <20241008225027.12209-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 21/21] avcodec: deprecate v410 de/encoder 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: RTlAa4A5IuR6 The V30X pixel format was recently added, so this lavc workaround is no longer needed. Signed-off-by: James Almer --- libavcodec/allcodecs.c | 2 +- libavcodec/codec_desc.c | 2 ++ libavcodec/codec_id.h | 2 ++ libavcodec/v410dec.c | 2 ++ libavcodec/v410enc.c | 2 ++ libavformat/isom_tags.c | 2 +- libavformat/movenc.c | 2 +- libavformat/riff.c | 2 +- 8 files changed, 12 insertions(+), 4 deletions(-) diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 19f7d63c16..d69e70a29b 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -350,9 +350,9 @@ extern const FFCodec ff_v308_encoder; extern const FFCodec ff_v308_decoder; extern const FFCodec ff_v408_encoder; extern const FFCodec ff_v408_decoder; -#endif extern const FFCodec ff_v410_encoder; extern const FFCodec ff_v410_decoder; +#endif extern const FFCodec ff_vb_decoder; extern const FFCodec ff_vbn_encoder; extern const FFCodec ff_vbn_decoder; diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 0e9cd669d2..2c03a466d6 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1146,6 +1146,7 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("Dxtory"), .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, }, +#if FF_API_V408_CODECID { .id = AV_CODEC_ID_V410, .type = AVMEDIA_TYPE_VIDEO, @@ -1153,6 +1154,7 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:4:4 10-bit"), .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, }, +#endif { .id = AV_CODEC_ID_XWD, .type = AVMEDIA_TYPE_VIDEO, diff --git a/libavcodec/codec_id.h b/libavcodec/codec_id.h index 3608c4b856..787313ffaf 100644 --- a/libavcodec/codec_id.h +++ b/libavcodec/codec_id.h @@ -206,7 +206,9 @@ enum AVCodecID { AV_CODEC_ID_BMV_VIDEO, AV_CODEC_ID_VBLE, AV_CODEC_ID_DXTORY, +#if FF_API_V408_CODECID AV_CODEC_ID_V410, +#endif AV_CODEC_ID_XWD, AV_CODEC_ID_CDXL, AV_CODEC_ID_XBM, diff --git a/libavcodec/v410dec.c b/libavcodec/v410dec.c index 04be830ad2..d3747c18e0 100644 --- a/libavcodec/v410dec.c +++ b/libavcodec/v410dec.c @@ -46,6 +46,8 @@ static av_cold int v410_decode_init(AVCodecContext *avctx) } } + av_log(avctx, AV_LOG_WARNING, "This decoder is deprecated and will be removed.\n"); + return 0; } diff --git a/libavcodec/v410enc.c b/libavcodec/v410enc.c index 89ee3a7278..78362ce453 100644 --- a/libavcodec/v410enc.c +++ b/libavcodec/v410enc.c @@ -37,6 +37,8 @@ static av_cold int v410_encode_init(AVCodecContext *avctx) avctx->bits_per_coded_sample = 32; avctx->bit_rate = ff_guess_coded_bitrate(avctx); + av_log(avctx, AV_LOG_WARNING, "This encoder is deprecated and will be removed.\n"); + return 0; } diff --git a/libavformat/isom_tags.c b/libavformat/isom_tags.c index e999aa7fef..a476efb8f1 100644 --- a/libavformat/isom_tags.c +++ b/libavformat/isom_tags.c @@ -66,8 +66,8 @@ const AVCodecTag ff_codec_movvideo_tags[] = { #if FF_API_V408_CODECID { AV_CODEC_ID_V308, MKTAG('v', '3', '0', '8') }, /* uncompressed 8-bit 4:4:4 */ { AV_CODEC_ID_V408, MKTAG('v', '4', '0', '8') }, /* uncompressed 8-bit 4:4:4:4 */ -#endif { AV_CODEC_ID_V410, MKTAG('v', '4', '1', '0') }, /* uncompressed 10-bit 4:4:4 */ +#endif { AV_CODEC_ID_Y41P, MKTAG('Y', '4', '1', 'P') }, /* uncompressed 12-bit 4:1:1 */ { AV_CODEC_ID_YUV4, MKTAG('y', 'u', 'v', '4') }, /* libquicktime packed yuv420p */ { AV_CODEC_ID_TARGA_Y216, MKTAG('Y', '2', '1', '6') }, diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 8f47e85490..0291710762 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -2618,8 +2618,8 @@ static int mov_write_video_tag(AVFormatContext *s, AVIOContext *pb, MOVMuxContex #if FF_API_V408_CODECID || track->par->codec_id == AV_CODEC_ID_V308 || track->par->codec_id == AV_CODEC_ID_V408 -#endif || track->par->codec_id == AV_CODEC_ID_V410 +#endif || track->par->codec_id == AV_CODEC_ID_V210); avio_wb32(pb, 0); /* size */ diff --git a/libavformat/riff.c b/libavformat/riff.c index 0f5682313e..88c4d6cbe9 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -308,8 +308,8 @@ const AVCodecTag ff_codec_bmp_tags[] = { #if FF_API_V408_CODECID { AV_CODEC_ID_V308, MKTAG('v', '3', '0', '8') }, { AV_CODEC_ID_V408, MKTAG('v', '4', '0', '8') }, -#endif { AV_CODEC_ID_V410, MKTAG('v', '4', '1', '0') }, +#endif { AV_CODEC_ID_YUV4, MKTAG('y', 'u', 'v', '4') }, { AV_CODEC_ID_INDEO3, MKTAG('I', 'V', '3', '1') }, { AV_CODEC_ID_INDEO3, MKTAG('I', 'V', '3', '2') },