From patchwork Tue Oct 8 22:50:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 52153 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:8b47:0:b0:48e:c0f8:d0de with SMTP id x7csp652351vql; Tue, 8 Oct 2024 18:56:17 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXgmPYA8YrT1YIP35gLtodCHGEbmkFTmbQff1MMdB/sELruaavP82LjGXkrKxBD88PrA2PFwXEaTz11DcK3syjT@gmail.com X-Google-Smtp-Source: AGHT+IEDWOphI1+e1o45KigqU/9WsyOFxGUMIc8mcCXBSQjubqR+aCW6LYZ+wsi3/Y/X2jgTyoxY X-Received: by 2002:a05:6512:a8e:b0:535:6cbf:51a3 with SMTP id 2adb3069b0e04-539c48e75eemr382657e87.25.1728438977198; Tue, 08 Oct 2024 18:56:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1728438977; cv=none; d=google.com; s=arc-20240605; b=aYdJspu1iUy5vcC5oFTnU2JBiTl5qI+SvN4XhFOkyTOraq2lidFf5SYC3ADmolrk7J PBMUf9T0ZkVKP0MuR0XUCkaAR2gKoNm9PlE0kAt0GOE1Oha142SpQp0cBsW5pjbXbel9 +aUwJuHpE8Ox3QuYHrLKfPU7DZsfyFZaBN48rvJSGvgm0RbA8RqwsvtOikn7wVg40F2p is8CIrxrpo/mp58u3iSyd6SLoJ8JGd+jDcnJ5IIZLgTrjVhZhoSPRWoU/Ugk17Q1cdBx vTg99XMv8HKFYwIKix51xtS1xAdAXUvACQPLWb1/KUBhGZCE+iildwgqDVQM9qkhrwk+ haQQ== 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=f+RHDgDfcZ+iBKh2LqJ4bJlTKlFKKjfWBbhPXK7a8/A=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=AVnDExnv6c238l0ohbzPJfLZWjcuSaez17g7/xO3+XrQNOSZ3MVRADROk7wUSF6vQy hbK+dk4QfqayFWpzimXFxgaR7ye4CgVz9SFZgHP/uMPua+Na6D0g5PqiYs5WB8/c0ruA mnlwuuUJ79E2T7FeGDjeZOugwmBtaSuMHgjKEjdk+9qj/g6erZDbcdLd0Br9QtIDRFfI 6JhxXfwuvoNwUZ+VRSk//C7EDJLXZEjKrGLN37ihG7HEiKbcJ77AY8j8nNaIz4QCvgUC eTrXlGSPBimyTnkJsYndDkvHECpuWYw4bBOPsc3qOaNaL5aoCmdiREcQna3dflyzWTz4 kugw==; 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=MxdmZ9UE; 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 2adb3069b0e04-539b0028c21si3100368e87.598.2024.10.08.18.56.16; Tue, 08 Oct 2024 18:56:17 -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=MxdmZ9UE; 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 0BF4E68DE35; Wed, 9 Oct 2024 01:51:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2189D68DE17 for ; Wed, 9 Oct 2024 01:51:05 +0300 (EEST) Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-20b64584fd4so59970615ad.1 for ; Tue, 08 Oct 2024 15:51:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728427863; x=1729032663; 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=gwDdomCTloCkgZmgai0gxy2gxL05FLAg5wQGBEFKIV0=; b=MxdmZ9UEMmPT2JjrfIKQgS2b/+BcvQIj5qdGSD/sthFRpRZWrE9VHhQ4za3/1oglEI 8KbJV/MgRK4ix6segJj5KYEpKMDID8oPrEE1NrT9CZG7aHl3FuPcyOEgV4vhB8n9q5HY jKHCgxCEBOd6eJz7A61Q/7DJSbhfp5BLT5KZQjNA4oAz0tEmesa6BeYVH3f5ekJAJTdK PNnoXSxI+5jCrUWrC5UMfyz8R32PkVHgSFKQxP73UBqykbZhy6yaHB7Tcvnxa5rTEnUD 8q8+jo2D8hIa4TA3RMYg2i/c2PfA+Liqly33ppDlUjWJ+VR16EqdkANu+Dlv9ZoAYV5P +tAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728427863; x=1729032663; 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=gwDdomCTloCkgZmgai0gxy2gxL05FLAg5wQGBEFKIV0=; b=hNhXeXVXw8Rx+IRohxei51WdLzdGZdUOyrWpvIQmC0gYYtO/+936O2FCds4Nkbm1fK zCQkncVdIV/SGIl639uNCfvnuw731wQlSIMHsA+V7e4lblCpC94GuURwsxOMZudt7bTc lGTzlTnvMkns5mxlu77eQHJxSy6oe7r2XNBgMIJN/wqNJFiGYS45DlUMjSsRioBqkLIy RbSrZiOzuyVSYOUaJFyC0fPb5YYzS7A2EU2xKLtrHS3ae+GKtuLoLMciFc4/Y5VHM/fV nx7WVEWEHdcH16RzvttlqbObCILO59q3j+JB2BDunQ6kENFRn4+8KHCqfgByblnpKGex SsSg== X-Gm-Message-State: AOJu0YwT1tFB8ZNXYrG2w7gADMksEJsej3++QYbj9OORHz+AUBLsKGoh gQY0Gk+icFjQqB7uK4bln//AaXIBPV4WKj8D0Qc93f/qaTSdEj7W3520Bg== X-Received: by 2002:a17:903:32cc:b0:20b:7e30:b2eb with SMTP id d9443c01a7336-20c638043e3mr8345835ad.58.1728427862800; Tue, 08 Oct 2024 15:51:02 -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.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Oct 2024 15:51:02 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Oct 2024 19:50:24 -0300 Message-ID: <20241008225027.12209-19-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 19/21] avcodec: deprecate v408 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: TdAXYnHFj2Q2 The uyva 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/v408dec.c | 2 ++ libavcodec/v408enc.c | 2 ++ libavcodec/version_major.h | 1 + libavformat/isom_tags.c | 2 ++ libavformat/movenc.c | 2 ++ libavformat/riff.c | 2 ++ 9 files changed, 17 insertions(+) diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index aa0fc47647..356a78f6e0 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -347,8 +347,10 @@ extern const FFCodec ff_v210_decoder; extern const FFCodec ff_v210x_decoder; extern const FFCodec ff_v308_encoder; extern const FFCodec ff_v308_decoder; +#if FF_API_V408_CODECID 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; extern const FFCodec ff_vb_decoder; diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 03dea5751a..6018052215 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1484,6 +1484,7 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("Uncompressed packed 4:4:4"), .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, }, +#if FF_API_V408_CODECID { .id = AV_CODEC_ID_V408, .type = AVMEDIA_TYPE_VIDEO, @@ -1491,6 +1492,7 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("Uncompressed packed QT 4:4:4:4"), .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, }, +#endif { .id = AV_CODEC_ID_YUV4, .type = AVMEDIA_TYPE_VIDEO, diff --git a/libavcodec/codec_id.h b/libavcodec/codec_id.h index 0a8d3bed1e..0ab0f6761f 100644 --- a/libavcodec/codec_id.h +++ b/libavcodec/codec_id.h @@ -255,7 +255,9 @@ enum AVCodecID { AV_CODEC_ID_AVUI, AV_CODEC_ID_TARGA_Y216, AV_CODEC_ID_V308, +#if FF_API_V408_CODECID AV_CODEC_ID_V408, +#endif AV_CODEC_ID_YUV4, AV_CODEC_ID_AVRN, AV_CODEC_ID_CPIA, diff --git a/libavcodec/v408dec.c b/libavcodec/v408dec.c index 2433c6de14..4bce5c7b67 100644 --- a/libavcodec/v408dec.c +++ b/libavcodec/v408dec.c @@ -27,6 +27,8 @@ static av_cold int v408_decode_init(AVCodecContext *avctx) { avctx->pix_fmt = AV_PIX_FMT_YUVA444P; + av_log(avctx, AV_LOG_WARNING, "This decoder is deprecated and will be removed.\n"); + return 0; } diff --git a/libavcodec/v408enc.c b/libavcodec/v408enc.c index c173f650ef..bf264de463 100644 --- a/libavcodec/v408enc.c +++ b/libavcodec/v408enc.c @@ -30,6 +30,8 @@ static av_cold int v408_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/libavcodec/version_major.h b/libavcodec/version_major.h index 63df40e9dd..37f243f868 100644 --- a/libavcodec/version_major.h +++ b/libavcodec/version_major.h @@ -48,5 +48,6 @@ #define FF_API_BUFFER_MIN_SIZE (LIBAVCODEC_VERSION_MAJOR < 62) #define FF_API_VDPAU_ALLOC_GET_SET (LIBAVCODEC_VERSION_MAJOR < 62) #define FF_API_QUALITY_FACTOR (LIBAVCODEC_VERSION_MAJOR < 62) +#define FF_API_V408_CODECID (LIBAVCODEC_VERSION_MAJOR < 62) #endif /* AVCODEC_VERSION_MAJOR_H */ diff --git a/libavformat/isom_tags.c b/libavformat/isom_tags.c index 5b3b859d37..d1b6b52db4 100644 --- a/libavformat/isom_tags.c +++ b/libavformat/isom_tags.c @@ -64,7 +64,9 @@ const AVCodecTag ff_codec_movvideo_tags[] = { { AV_CODEC_ID_V210, MKTAG('v', '2', '1', '0') }, /* uncompressed 10-bit 4:2:2 */ { AV_CODEC_ID_V210, MKTAG('b', 'x', 'y', '2') }, /* BOXX 10-bit 4:2:2 */ { AV_CODEC_ID_V308, MKTAG('v', '3', '0', '8') }, /* uncompressed 8-bit 4:4:4 */ +#if FF_API_V408_CODECID { 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 */ { 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 */ diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 24b2385d94..ea5221c87b 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -2616,7 +2616,9 @@ static int mov_write_video_tag(AVFormatContext *s, AVIOContext *pb, MOVMuxContex || (track->par->codec_id == AV_CODEC_ID_RAWVIDEO && track->par->format == AV_PIX_FMT_UYVA) || (track->par->codec_id == AV_CODEC_ID_RAWVIDEO && track->par->format == AV_PIX_FMT_V30X) || track->par->codec_id == AV_CODEC_ID_V308 +#if FF_API_V408_CODECID || track->par->codec_id == AV_CODEC_ID_V408 +#endif || track->par->codec_id == AV_CODEC_ID_V410 || track->par->codec_id == AV_CODEC_ID_V210); diff --git a/libavformat/riff.c b/libavformat/riff.c index 7f3291a392..c1e48810b6 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -306,7 +306,9 @@ const AVCodecTag ff_codec_bmp_tags[] = { { AV_CODEC_ID_V210, MKTAG('v', '2', '1', '0') }, { AV_CODEC_ID_V210, MKTAG('C', '2', '1', '0') }, { AV_CODEC_ID_V308, MKTAG('v', '3', '0', '8') }, +#if FF_API_V408_CODECID { AV_CODEC_ID_V408, MKTAG('v', '4', '0', '8') }, +#endif { AV_CODEC_ID_V410, MKTAG('v', '4', '1', '0') }, { AV_CODEC_ID_YUV4, MKTAG('y', 'u', 'v', '4') }, { AV_CODEC_ID_INDEO3, MKTAG('I', 'V', '3', '1') },