From patchwork Mon Oct 7 12:29:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 52115 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:bc50:0:b0:48e:c0f8:d0de with SMTP id m16csp32669vqy; Mon, 7 Oct 2024 15:36:16 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUjpxch8A8vJ076GAPCvdg4nUEonh61Jl8yl6yFiZg3IT0QiGtiCeVtnt6xZ40gQerZiyuD2qmrkB4TQiXRtqgF@gmail.com X-Google-Smtp-Source: AGHT+IERthw3F+XKljdpSa4cLbWqk/70UE9NH+hHdoogBu9B5qtJC3Zf4kpxeB81VT+Yhr3AMny+ X-Received: by 2002:a17:907:9410:b0:a99:745b:82aa with SMTP id a640c23a62f3a-a99745b84c6mr18139966b.54.1728340576346; Mon, 07 Oct 2024 15:36:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1728340576; cv=none; d=google.com; s=arc-20240605; b=kd/iTnWpU86djLl1zr1xRdX/pUNue+AkKOVYFp/IAXcR+qsE9Kxwlaa3B8P94SbxLc I66ykI/znS/PCFbP/KA9IeHOkSsLpTptGRZnXE8ptQT1LbjJ24pOHo4RbVCddeFiu1Pi 3dy+UQUcZ7KZulYs8qwWxC7XImana/iUubxc7CQeTGv1z82MBea6DNTTLauFT0njA+R6 lLgCSGBFDWPpiOIBkK1dRhKGuGTN1ttYJ6tV8PPAIObKluyIAOQC6ejofY2RfZ68XqH7 cSo78g6FSgkgXk0goh+oEHcWVpBG6KbI492J9ZO1VKfWUZeE7sYxAPOrM1gbtKBMhZ0C dEpA== 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=8gHMnjL/Nwgou6K+Ac19g31NmogxLLH/kTY5ACPd4Wg=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=O1Yf+nujdvYRKExl9EckptgHx+eiP6U05qWUMapAV2KWTibsZFg7IsvKaXMJgkDT+T VjCDX5JloWWjZP2mYVpENPP1l5gaM6V/hnco11/COGSd02/NpSeuVzPYw16AklVDXz7J xAqJhLnZ5Pa3bek33Uxq3Ksx13XhBPq0l7AJ59ir9R2/CsdRzBvybmLQo780O6UnOAtn EPOmGkyes0QFHErBk49q1UKxvl1Hbde2bcjVZFvzdZ0cJujvy0Sjy+AdAMEVUaFQhzKl bj/9VAQEyVTaqg1T9lMk4VegnSNI0Ela4YPHL5yYI9X8NHC9FusvcoUHRgDQc/QKO4mF DLqA==; 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=QMZ02hFQ; 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 a640c23a62f3a-a992e7759a3si504761366b.319.2024.10.07.15.36.05; Mon, 07 Oct 2024 15:36:16 -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=QMZ02hFQ; 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 7F69668DCAD; Mon, 7 Oct 2024 15:30:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C843668DC74 for ; Mon, 7 Oct 2024 15:30:43 +0300 (EEST) Received: by mail-pg1-f173.google.com with SMTP id 41be03b00d2f7-7e6cbf6cd1dso2822476a12.3 for ; Mon, 07 Oct 2024 05:30:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728304242; x=1728909042; 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=GgWjlWA4CTAmij73ZCjIQe9TSqV/kUvhjJSV7jybclI=; b=QMZ02hFQG3byKscKgIwyzJzlxNULebek/3b+wH44z82x6PtLgSKOy+tZLlQIuzmxUu Xi6LE5XffV0BF8u9fyQtykVpPBqv1xQpUPamWnZ69K0kAzozlAlEehpGFuNoTuZfeNSY wS6YEs+rCTKqrukDns+KHwP/rD57NTbFcijp6YaWfnqDYwRvt6FvMrl/5zyDMaCdmzeR jpAf4NxDoeLACKDrrGqRFH613v66/FpJI1VAvqut2sW+/ddMLLc3nPF5on2d+U2uN8iI KvjJ5SyiG+9/z5NVuF2dqOgIWQudoC4d2aIoAy57wyoTnz5hCjQdULau+p/oNLc5XpKV Ug4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728304242; x=1728909042; 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=GgWjlWA4CTAmij73ZCjIQe9TSqV/kUvhjJSV7jybclI=; b=Pk26GOF3V4ZEGjWqKmkRBgyve4cYSgJne+N34WC6FKyWhtPe09Xa3ZIyDXpiEdMYhx nF1fSMQz6B2aNRIMrwRc9n/Bzo7nllryYn90dcR25IifC/oG/+ciEYiEqYuRd7tg789M PgDziNxjRFGT9dcjITQ4PVhGDzg9HcKlnC33kELmLuPSwYheaquSG7IAf/iATs/YEiBf 4zMR2iuRf1Kfx2f+kqCN6+jlqwCqXtEdKZ4Qbt8slMvBty5R1CSXVI8uHy51W7213uGN n58da+ioFANHWmrGO5kuPtIv1osZyqQNt6+TUdsC6SdV+XsbVEX7fiB9/2OJzkCTg2n4 1eaw== X-Gm-Message-State: AOJu0YyOqEaERVOQNW60QkRLcaWVdUkgMfgEoVJOUHwYGp7lNlGYZctq bYVtI+xZEIZ4D/unDn//lK0X66tmQNYyVf5LvyL8M6OB7Xzg+Md1SqdbGg== X-Received: by 2002:a05:6a21:3414:b0:1d2:e888:3982 with SMTP id adf61e73a8af0-1d6dfa36971mr14996739637.19.1728304241420; Mon, 07 Oct 2024 05:30:41 -0700 (PDT) Received: from localhost.localdomain ([181.92.233.116]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71df0cbd8ecsm4267869b3a.25.2024.10.07.05.30.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2024 05:30:40 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Oct 2024 09:29:54 -0300 Message-ID: <20241007122955.309-19-jamrial@gmail.com> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241007122955.309-1-jamrial@gmail.com> References: <20241007122955.309-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 19/20] 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: Zjr549e3bd1d 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 ++ 8 files changed, 15 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 1605a669d3..d2f8f74e01 100644 --- a/libavformat/isom_tags.c +++ b/libavformat/isom_tags.c @@ -63,7 +63,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 b1f6b29f8b..f1312b3022 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -2615,7 +2615,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_VYU444) || (track->par->codec_id == AV_CODEC_ID_RAWVIDEO && track->par->format == AV_PIX_FMT_UYVA) || 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);