From: James Almer <jamrial@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCH] avcodec: deprecate AYUV codec id, decoder and encoder
Date: Sun, 7 Aug 2022 14:50:18 -0300
Message-ID: <20220807175018.11307-1-jamrial@gmail.com> (raw)
The vuya pixel format was recently added, so this lavc workaround is no longer
needed.
Signed-off-by: James Almer <jamrial@gmail.com>
---
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 */
--
2.37.1
_______________________________________________
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".
next reply other threads:[~2022-08-07 17:50 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-07 17:50 James Almer [this message]
2022-08-07 19:25 ` Philip Langdale
2022-08-08 7:48 ` Paul B Mahol
2022-08-08 12:33 ` James Almer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220807175018.11307-1-jamrial@gmail.com \
--to=jamrial@gmail.com \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git