From patchwork Sun Aug 7 17:50:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 37176 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:92a9:b0:8d:7f3b:94fc with SMTP id q41csp1404179pzg; Sun, 7 Aug 2022 10:50:45 -0700 (PDT) X-Google-Smtp-Source: AA6agR6bmp6ATRDDYkeyzTBggRUzh/GZEjeG5y0H8GTKGOGOAHN+MJPnaSzPfN9+hegbhI5N3tVE X-Received: by 2002:a17:907:6089:b0:72f:56db:ccb6 with SMTP id ht9-20020a170907608900b0072f56dbccb6mr11277827ejc.318.1659894645255; Sun, 07 Aug 2022 10:50:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659894645; cv=none; d=google.com; s=arc-20160816; b=ETzkVVbzidBP2V8t3InZfw4mlTlENNJG31otTdFascFt9bPzIMy1SqEOmTivVx3+4K c7VnPXPUm9jctvyBU79vfvnPDc8jeS90fY3VwX7FDqeeak9yMYGRXI3ALgtpx5uameJ5 m4XZaT6pFK56Nie9LkWIWIHOaSyDqITIvFQemOfagTqu7hwYPvHdxMbcpzxbBVeEbj/d ty639vFsPKZtqyYFkYg1vBL004nk72vjw4RwGg/LDu0+LbeugCxHLUX675Lx7j45dJ+L RgUHnmj0GbTwmgr7rIP3P6yF/IfqbqaEPfv+gOvLg2TlPZZ8RPIqDPpMdUdcZKf5espl CZlQ== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=unvzEIZRberk7ovqIjlxNTDdsEO5vuNvbUjFDJq6bMo=; b=z95BKSlwrIvk/BRh3VPkO5Exv6dYF97bdOzFBz6Ywbe/U8PkxMazUJ0WDHo5rBWRDi LINmVAU2drL4j0Ndj3t7VgpKs1Afl0kB0qGAwftCLKjP8QsAM8KFaYHO+cSW4wlOU74U PJcbVY3M1VWiaw3fPO+imu8h2F+QtgFF7Svm5tIWa8qYtW294ZbQNvwwa6e/WJArMuno hftMxw5b6YfUs5flTYRHUc4c+ttgWQNMNu7vfWBtIhBsIiTCAsQ/7No8jP5ylcKJuq3f lYDuOMSVD39imSqPLTkiQDBfz2AI+XQgkK2oXpZjHJnbIKc/018GJSq4pQvplk6lxU45 jEBg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Od3jAbPc; 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 b21-20020a50ccd5000000b0043bc8f2015esi4339733edj.603.2022.08.07.10.50.44; Sun, 07 Aug 2022 10:50:45 -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=20210112 header.b=Od3jAbPc; 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 8F68568B6D6; Sun, 7 Aug 2022 20:50:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vk1-f174.google.com (mail-vk1-f174.google.com [209.85.221.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EFFC268B609 for ; Sun, 7 Aug 2022 20:50:35 +0300 (EEST) Received: by mail-vk1-f174.google.com with SMTP id w129so3447283vkg.10 for ; Sun, 07 Aug 2022 10:50:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc; bh=WNg1JH+DkPHe08qjHzfG2ylNJzIfFLjTfY/cruBe9Vs=; b=Od3jAbPc8t2sTAHw6v21OhgYCEhlUsxFKO9cpsqmLJYoX5sOweRwb4XYYBNaKp0C5W peK0rej47JjSeKy4T80VTJ6T/eRFCPYSOOyVE3mAZVYDpplbN63MgxOq8onj7tCItrza YCOpmveZh75t6t30aB7oUJVJjSz+TKOrQiHfUrrDnDxDKINHSdDzbpPKOnwl73MGWTL8 AU2Jsc7UCIR963wbkBxY30LhIChI3Ct7RDXALC9b3oN+/e1gq1TL8FQkWvuBm7sUnyRQ mNskAfkQOssvPiPkxG6RMkz9UqOHtwGEtM6s0IplCIGzEXxcNkcAGRHU7AACikgEoGQ+ p3Sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc; bh=WNg1JH+DkPHe08qjHzfG2ylNJzIfFLjTfY/cruBe9Vs=; b=zJlwG6xd1YEhLMvGbhq0iH65VCze6NbYl61gOWBrP7rtuoDXnA4OmA0YGZp3he5+DA f80fF7FGpb2K3AQQqiXQJ7yUFRTdIVrVMEUgIiktqaIGA01RID6koRt+LqTs7MYyr+4V BEAQX9JJ66cUOHo0zEqNhTT8tN23g5o40oJooy+vRP8jgwUdfw0QxgslPVMe5b++nlzz e9TuaPOSEpDPMuqtheOlEwhoiD9QK4BF860RikCGlT77FrAFTM8WCpOEPf1BJV0llr3q e9gBbP4KSqxgmyO+bLDRoeUbhxpXtSgt/3yFuHgusVwziD7064rllHlG0/GVLFeujTEG HExQ== X-Gm-Message-State: ACgBeo0523V5oWBtsv2IGsy/SXav1q/FnkvD8qOR/PioojulPmTmEIG4 j+78QUNDk4AsFAtM8HSf0Sd17u5hwI8= X-Received: by 2002:a1f:1244:0:b0:376:2ed1:1211 with SMTP id 65-20020a1f1244000000b003762ed11211mr6623003vks.5.1659894633958; Sun, 07 Aug 2022 10:50:33 -0700 (PDT) Received: from localhost.localdomain ([186.136.131.204]) by smtp.gmail.com with ESMTPSA id v3-20020a1f4803000000b00378acbee999sm4592077vka.40.2022.08.07.10.50.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Aug 2022 10:50:33 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 7 Aug 2022 14:50:18 -0300 Message-Id: <20220807175018.11307-1-jamrial@gmail.com> X-Mailer: git-send-email 2.37.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec: deprecate AYUV codec id, decoder and 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: mjKmRBTe4tSk The vuya pixel format was recently added, so this lavc workaround is no longer needed. Signed-off-by: James Almer --- doc/APIchanges | 4 ++++ libavcodec/allcodecs.c | 2 ++ libavcodec/codec_desc.c | 2 ++ libavcodec/codec_id.h | 4 ++++ libavcodec/v408dec.c | 11 ++++++++++- libavcodec/v408enc.c | 12 +++++++++++- libavcodec/version.h | 2 +- libavcodec/version_major.h | 1 + 8 files changed, 35 insertions(+), 3 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 0bf2b3cd77..08075f4f9c 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -14,6 +14,10 @@ libavutil: 2021-04-27 API changes, most recent first: +2022-08-xx - xxxxxxxxxx - lavc 59.42.101 - codec_id.h + Deprecate AV_CODEC_ID_AYUV and ayuv decoder/encoder. The rawvideo codec + and vuya pixel format combination will be used instead from now on. + 2022-08-03 - xxxxxxxxxx - lavu 57.32.100 - pixfmt.h Add AV_PIX_FMT_VUYA. diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index c94e2d5966..6939a4e25f 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -61,8 +61,10 @@ extern const FFCodec ff_avrn_decoder; extern const FFCodec ff_avs_decoder; extern const FFCodec ff_avui_encoder; extern const FFCodec ff_avui_decoder; +#if FF_API_AYUV_CODECID extern const FFCodec ff_ayuv_encoder; extern const FFCodec ff_ayuv_decoder; +#endif extern const FFCodec ff_bethsoftvid_decoder; extern const FFCodec ff_bfi_decoder; extern const FFCodec ff_bink_decoder; diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index c1a177c22d..06dfe55d0f 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1462,6 +1462,7 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("Avid Meridien Uncompressed"), .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, }, +#if FF_API_AYUV_CODECID { .id = AV_CODEC_ID_AYUV, .type = AVMEDIA_TYPE_VIDEO, @@ -1469,6 +1470,7 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("Uncompressed packed MS 4:4:4:4"), .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, }, +#endif { .id = AV_CODEC_ID_TARGA_Y216, .type = AVMEDIA_TYPE_VIDEO, diff --git a/libavcodec/codec_id.h b/libavcodec/codec_id.h index 386a00a7ef..2247bc0309 100644 --- a/libavcodec/codec_id.h +++ b/libavcodec/codec_id.h @@ -24,6 +24,8 @@ #include "libavutil/avutil.h" #include "libavutil/samplefmt.h" +#include "version_major.h" + /** * @addtogroup lavc_core * @{ @@ -251,7 +253,9 @@ enum AVCodecID { AV_CODEC_ID_AVRP, AV_CODEC_ID_012V, AV_CODEC_ID_AVUI, +#if FF_API_AYUV_CODECID AV_CODEC_ID_AYUV, +#endif AV_CODEC_ID_TARGA_Y216, AV_CODEC_ID_V308, AV_CODEC_ID_V408, diff --git a/libavcodec/v408dec.c b/libavcodec/v408dec.c index 88fa777f22..694ee96b77 100644 --- a/libavcodec/v408dec.c +++ b/libavcodec/v408dec.c @@ -29,6 +29,10 @@ static av_cold int v408_decode_init(AVCodecContext *avctx) { avctx->pix_fmt = AV_PIX_FMT_YUVA444P; +#if FF_API_AYUV_CODECID + if (avctx->codec_id==AV_CODEC_ID_AYUV) + av_log(avctx, AV_LOG_WARNING, "This decoder is deprecated and will be removed.\n"); +#endif return 0; } @@ -57,12 +61,15 @@ static int v408_decode_frame(AVCodecContext *avctx, AVFrame *pic, for (i = 0; i < avctx->height; i++) { for (j = 0; j < avctx->width; j++) { +#if FF_API_AYUV_CODECID if (avctx->codec_id==AV_CODEC_ID_AYUV) { v[j] = *src++; u[j] = *src++; y[j] = *src++; a[j] = *src++; - } else { + } else +#endif + { u[j] = *src++; y[j] = *src++; v[j] = *src++; @@ -81,6 +88,7 @@ static int v408_decode_frame(AVCodecContext *avctx, AVFrame *pic, return avpkt->size; } +#if FF_API_AYUV_CODECID #if CONFIG_AYUV_DECODER const FFCodec ff_ayuv_decoder = { .p.name = "ayuv", @@ -92,6 +100,7 @@ const FFCodec ff_ayuv_decoder = { .p.capabilities = AV_CODEC_CAP_DR1, }; #endif +#endif #if CONFIG_V408_DECODER const FFCodec ff_v408_decoder = { .p.name = "v408", diff --git a/libavcodec/v408enc.c b/libavcodec/v408enc.c index 77d2b026b3..7ab59792e6 100644 --- a/libavcodec/v408enc.c +++ b/libavcodec/v408enc.c @@ -33,6 +33,11 @@ static av_cold int v408_encode_init(AVCodecContext *avctx) avctx->bits_per_coded_sample = 32; avctx->bit_rate = ff_guess_coded_bitrate(avctx); +#if FF_API_AYUV_CODECID + if (avctx->codec_id == AV_CODEC_ID_AYUV) + av_log(avctx, AV_LOG_WARNING, "This encoder is deprecated and will be removed.\n"); +#endif + return 0; } @@ -55,12 +60,15 @@ static int v408_encode_frame(AVCodecContext *avctx, AVPacket *pkt, for (i = 0; i < avctx->height; i++) { for (j = 0; j < avctx->width; j++) { +#if FF_API_AYUV_CODECID if (avctx->codec_id==AV_CODEC_ID_AYUV) { *dst++ = v[j]; *dst++ = u[j]; *dst++ = y[j]; *dst++ = a[j]; - } else { + } else +#endif + { *dst++ = u[j]; *dst++ = y[j]; *dst++ = v[j]; @@ -79,6 +87,7 @@ static int v408_encode_frame(AVCodecContext *avctx, AVPacket *pkt, static const enum AVPixelFormat pix_fmt[] = { AV_PIX_FMT_YUVA444P, AV_PIX_FMT_NONE }; +#if FF_API_AYUV_CODECID #if CONFIG_AYUV_ENCODER const FFCodec ff_ayuv_encoder = { .p.name = "ayuv", @@ -91,6 +100,7 @@ const FFCodec ff_ayuv_encoder = { .p.pix_fmts = pix_fmt, }; #endif +#endif #if CONFIG_V408_ENCODER const FFCodec ff_v408_encoder = { .p.name = "v408", diff --git a/libavcodec/version.h b/libavcodec/version.h index e488eee355..777be76edf 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #include "version_major.h" #define LIBAVCODEC_VERSION_MINOR 42 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ diff --git a/libavcodec/version_major.h b/libavcodec/version_major.h index 1e23ed5e03..1ec815a7bc 100644 --- a/libavcodec/version_major.h +++ b/libavcodec/version_major.h @@ -50,5 +50,6 @@ #define FF_API_SUB_TEXT_FORMAT (LIBAVCODEC_VERSION_MAJOR < 60) #define FF_API_IDCT_NONE (LIBAVCODEC_VERSION_MAJOR < 60) #define FF_API_SVTAV1_OPTS (LIBAVCODEC_VERSION_MAJOR < 60) +#define FF_API_AYUV_CODECID (LIBAVCODEC_VERSION_MAJOR < 60) #endif /* AVCODEC_VERSION_MAJOR_H */