Stowage/ffmpeg
2
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-08 06:09:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

avcodec: deprecate v408 de/encoder

Browse source 
The uyva pixel format was recently added, so this lavc workaround is no longer
needed.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2024-10-06 20:46:57 -03:00
parent c5cf98d77e
commit e2427a4223
9 changed files with 17 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libavcodec/allcodecs.c
View file

@ -347,8 +347,10 @@ extern const FFCodec ff_v210_decoder;
extern const FFCodec ff_v210x_decoder; extern const FFCodec ff_v210x_decoder;
extern const FFCodec ff_v308_encoder; extern const FFCodec ff_v308_encoder;
extern const FFCodec ff_v308_decoder; extern const FFCodec ff_v308_decoder;
#if FF_API_V408_CODECID
extern const FFCodec ff_v408_encoder; extern const FFCodec ff_v408_encoder;
extern const FFCodec ff_v408_decoder; extern const FFCodec ff_v408_decoder;
#endif
extern const FFCodec ff_v410_encoder; extern const FFCodec ff_v410_encoder;
extern const FFCodec ff_v410_decoder; extern const FFCodec ff_v410_decoder;
extern const FFCodec ff_vb_decoder; extern const FFCodec ff_vb_decoder;

2
libavcodec/codec_desc.c
View file

@ -1484,6 +1484,7 @@ static const AVCodecDescriptor codec_descriptors[] = {
.long_name = NULL_IF_CONFIG_SMALL("Uncompressed packed 4:4:4"), .long_name = NULL_IF_CONFIG_SMALL("Uncompressed packed 4:4:4"),
.props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS,
}, },
#if FF_API_V408_CODECID
{ {
.id = AV_CODEC_ID_V408, .id = AV_CODEC_ID_V408,
.type = AVMEDIA_TYPE_VIDEO, .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"), .long_name = NULL_IF_CONFIG_SMALL("Uncompressed packed QT 4:4:4:4"),
.props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS,
}, },
#endif
{ {
.id = AV_CODEC_ID_YUV4, .id = AV_CODEC_ID_YUV4,
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,

2
libavcodec/codec_id.h
View file

@ -255,7 +255,9 @@ enum AVCodecID {
AV_CODEC_ID_AVUI, AV_CODEC_ID_AVUI,
AV_CODEC_ID_TARGA_Y216, AV_CODEC_ID_TARGA_Y216,
AV_CODEC_ID_V308, AV_CODEC_ID_V308,
#if FF_API_V408_CODECID
AV_CODEC_ID_V408, AV_CODEC_ID_V408,
#endif
AV_CODEC_ID_YUV4, AV_CODEC_ID_YUV4,
AV_CODEC_ID_AVRN, AV_CODEC_ID_AVRN,
AV_CODEC_ID_CPIA, AV_CODEC_ID_CPIA,

2
libavcodec/v408dec.c
View file

@ -27,6 +27,8 @@ static av_cold int v408_decode_init(AVCodecContext *avctx)
{ {
avctx->pix_fmt = AV_PIX_FMT_YUVA444P; avctx->pix_fmt = AV_PIX_FMT_YUVA444P;
av_log(avctx, AV_LOG_WARNING, "This decoder is deprecated and will be removed.\n");
return 0; return 0;
} }

2
libavcodec/v408enc.c
View file

@ -30,6 +30,8 @@ static av_cold int v408_encode_init(AVCodecContext *avctx)
avctx->bits_per_coded_sample = 32; avctx->bits_per_coded_sample = 32;
avctx->bit_rate = ff_guess_coded_bitrate(avctx); 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; return 0;
} }

1
libavcodec/version_major.h
View file

@ -48,5 +48,6 @@
#define FF_API_BUFFER_MIN_SIZE (LIBAVCODEC_VERSION_MAJOR < 62) #define FF_API_BUFFER_MIN_SIZE (LIBAVCODEC_VERSION_MAJOR < 62)
#define FF_API_VDPAU_ALLOC_GET_SET (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_QUALITY_FACTOR (LIBAVCODEC_VERSION_MAJOR < 62)
#define FF_API_V408_CODECID (LIBAVCODEC_VERSION_MAJOR < 62)
#endif /* AVCODEC_VERSION_MAJOR_H */ #endif /* AVCODEC_VERSION_MAJOR_H */

2
libavformat/isom_tags.c
View file

@ -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('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_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 */ { 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 */ { 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_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_Y41P, MKTAG('Y', '4', '1', 'P') }, /* uncompressed 12-bit 4:1:1 */
{ AV_CODEC_ID_YUV4, MKTAG('y', 'u', 'v', '4') }, /* libquicktime packed yuv420p */ { AV_CODEC_ID_YUV4, MKTAG('y', 'u', 'v', '4') }, /* libquicktime packed yuv420p */

2
libavformat/movenc.c
View file

@ -2619,7 +2619,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_UYVA)
|| (track->par->codec_id == AV_CODEC_ID_RAWVIDEO && track->par->format == AV_PIX_FMT_V30X) || (track->par->codec_id == AV_CODEC_ID_RAWVIDEO && track->par->format == AV_PIX_FMT_V30X)
|| track->par->codec_id == AV_CODEC_ID_V308 || track->par->codec_id == AV_CODEC_ID_V308
#if FF_API_V408_CODECID
|| track->par->codec_id == AV_CODEC_ID_V408 || track->par->codec_id == AV_CODEC_ID_V408
#endif
|| track->par->codec_id == AV_CODEC_ID_V410 || track->par->codec_id == AV_CODEC_ID_V410
|| track->par->codec_id == AV_CODEC_ID_V210); || track->par->codec_id == AV_CODEC_ID_V210);

2
libavformat/riff.c
View file

@ -306,7 +306,9 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_V210, MKTAG('v', '2', '1', '0') }, { AV_CODEC_ID_V210, MKTAG('v', '2', '1', '0') },
{ AV_CODEC_ID_V210, MKTAG('C', '2', '1', '0') }, { AV_CODEC_ID_V210, MKTAG('C', '2', '1', '0') },
{ AV_CODEC_ID_V308, MKTAG('v', '3', '0', '8') }, { AV_CODEC_ID_V308, MKTAG('v', '3', '0', '8') },
#if FF_API_V408_CODECID
{ AV_CODEC_ID_V408, MKTAG('v', '4', '0', '8') }, { AV_CODEC_ID_V408, MKTAG('v', '4', '0', '8') },
#endif
{ AV_CODEC_ID_V410, MKTAG('v', '4', '1', '0') }, { AV_CODEC_ID_V410, MKTAG('v', '4', '1', '0') },
{ AV_CODEC_ID_YUV4, MKTAG('y', 'u', 'v', '4') }, { AV_CODEC_ID_YUV4, MKTAG('y', 'u', 'v', '4') },
{ AV_CODEC_ID_INDEO3, MKTAG('I', 'V', '3', '1') }, { AV_CODEC_ID_INDEO3, MKTAG('I', 'V', '3', '1') },