From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 3D90148D42 for ; Thu, 25 Jan 2024 13:45:14 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2DCC668D0E4; Thu, 25 Jan 2024 15:44:45 +0200 (EET) Received: from mail-pg1-f181.google.com (mail-pg1-f181.google.com [209.85.215.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0AAE968D0CE for ; Thu, 25 Jan 2024 15:44:37 +0200 (EET) Received: by mail-pg1-f181.google.com with SMTP id 41be03b00d2f7-5cdf76cde78so3804265a12.1 for ; Thu, 25 Jan 2024 05:44:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706190275; x=1706795075; 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=dBQj4uIuqQ6uvy0abttb6cyFnsydbV+wV6h55JLx/2Q=; b=NcY6nUXjwZu7XvyTjcmi/vQ6mXDYILRWEYAImNAQFTuVpI0cVMZ+URj2wS23mgrxcw Riq5QCmIH/YKseCfXr8tGQ8ppmVwFkSxGVAzsIbDcgd+qbZ1EtvgX2IFdyjXE9QaCzMP HO5n4FD3AlLn4WSG+VUDQU6n20fcKWPjgzV7/vbaoHPBR/r7dAQjeY7CfWmv2EtQq7Sr gPKOH97MSmVm52Df9TmYVhuqGb/tDCOKvyL2TIGR2TEfuuPH0BTLxGr9rnhpx3LRTwph 7DPeM3F8wF8getr/ADIJTSwCCix4uO0M7AcVfwuKohY/VlIPW0oVQIRDbjEQPWK5HNtK JN7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706190275; x=1706795075; 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=dBQj4uIuqQ6uvy0abttb6cyFnsydbV+wV6h55JLx/2Q=; b=XGoLYXzKOFMB1qmZ+x5cIlmSsRuHJFdvqi1ooO9Faew586jWeejSmcnsC+IrCV83/F cfrWJ/AneWqW/NUq2gZxuAqJDkYVyeNVIEdy6Ut+plRQBkKTCF1DIRBfz88LX54IUaIh hpD7PtUBJcrFJmHWWvtNtbuAKwhL9jDE1rahcTSZn00abfN3g0KgGVtQHTbIXICqSFrv +fs8XsfQDzjRJCAP0yqprpN7sApWQ/+o6KvDlSQ8Y0V+WKV/vdMHUN4sgmPuLCceJyEh Bkr5l37cncP9Qe5dfBCZGPlecjwnXsgqfbQoj6rsSwVyWN3bEvAohvJKv4sjgkaffdtn NblA== X-Gm-Message-State: AOJu0YxtH5Kd0jhnKoCRHTpXoFNH+i8ckpnmShy/GvMK52QXocL2s4S0 9FgcMgcB4vZkVoourupriciGPbU6lxjpDxy4opgQ62v/4xcd7JEDCc0vMh1S X-Google-Smtp-Source: AGHT+IEwqoD7qUUsbBR/vXGjW45guFk3cd64nWGWFOecVXxKySvpeakK72AW+qaOlwEhfLQXtEwYqQ== X-Received: by 2002:a05:6a20:28a2:b0:19c:4ada:1a97 with SMTP id q34-20020a056a2028a200b0019c4ada1a97mr672808pzf.94.1706190274728; Thu, 25 Jan 2024 05:44:34 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id k17-20020a170902f29100b001d707a14316sm11785146plc.75.2024.01.25.05.44.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jan 2024 05:44:34 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 25 Jan 2024 10:43:26 -0300 Message-ID: <20240125134425.374-4-jamrial@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240125134425.374-1-jamrial@gmail.com> References: <20240125134425.374-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 03/24] avcodec: remove deprecated FF_API_AYUV_CODECID 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Signed-off-by: James Almer --- libavcodec/allcodecs.c | 4 ---- libavcodec/codec_desc.c | 9 --------- libavcodec/codec_id.h | 3 --- libavcodec/v408dec.c | 35 ++++------------------------------- libavcodec/v408enc.c | 37 ++++--------------------------------- libavcodec/version_major.h | 1 - 6 files changed, 8 insertions(+), 81 deletions(-) diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index ef8c3a6d7d..45d5998943 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -61,10 +61,6 @@ 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 033344304c..3bab86db62 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1470,15 +1470,6 @@ 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, - .name = "ayuv", - .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 d96e49430e..c8dc21da74 100644 --- a/libavcodec/codec_id.h +++ b/libavcodec/codec_id.h @@ -253,9 +253,6 @@ 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 191c050fb2..4d8bccd650 100644 --- a/libavcodec/v408dec.c +++ b/libavcodec/v408dec.c @@ -29,10 +29,6 @@ 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; } @@ -61,20 +57,10 @@ 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 -#endif - { - u[j] = *src++; - y[j] = *src++; - v[j] = *src++; - a[j] = *src++; - } + u[j] = *src++; + y[j] = *src++; + v[j] = *src++; + a[j] = *src++; } y += pic->linesize[0]; @@ -88,19 +74,6 @@ 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", - CODEC_LONG_NAME("Uncompressed packed MS 4:4:4:4"), - .p.type = AVMEDIA_TYPE_VIDEO, - .p.id = AV_CODEC_ID_AYUV, - .init = v408_decode_init, - FF_CODEC_DECODE_CB(v408_decode_frame), - .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 1faac7cc36..c1bf0f6158 100644 --- a/libavcodec/v408enc.c +++ b/libavcodec/v408enc.c @@ -33,11 +33,6 @@ 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; } @@ -60,20 +55,10 @@ 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 -#endif - { - *dst++ = u[j]; - *dst++ = y[j]; - *dst++ = v[j]; - *dst++ = a[j]; - } + *dst++ = u[j]; + *dst++ = y[j]; + *dst++ = v[j]; + *dst++ = a[j]; } y += pic->linesize[0]; u += pic->linesize[1]; @@ -87,20 +72,6 @@ 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", - CODEC_LONG_NAME("Uncompressed packed MS 4:4:4:4"), - .p.type = AVMEDIA_TYPE_VIDEO, - .p.id = AV_CODEC_ID_AYUV, - .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE, - .init = v408_encode_init, - FF_CODEC_ENCODE_CB(v408_encode_frame), - .p.pix_fmts = pix_fmt, -}; -#endif -#endif #if CONFIG_V408_ENCODER const FFCodec ff_v408_encoder = { .p.name = "v408", diff --git a/libavcodec/version_major.h b/libavcodec/version_major.h index 03fe1e2a83..199a1a2714 100644 --- a/libavcodec/version_major.h +++ b/libavcodec/version_major.h @@ -38,7 +38,6 @@ */ #define FF_API_INIT_PACKET (LIBAVCODEC_VERSION_MAJOR < 61) -#define FF_API_AYUV_CODECID (LIBAVCODEC_VERSION_MAJOR < 61) #define FF_API_VT_OUTPUT_CALLBACK (LIBAVCODEC_VERSION_MAJOR < 61) #define FF_API_AVCODEC_CHROMA_POS (LIBAVCODEC_VERSION_MAJOR < 61) #define FF_API_VT_HWACCEL_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 61) -- 2.43.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".