diff --git a/Changelog b/Changelog index 571ddacd22..70c9054f92 100644 --- a/Changelog +++ b/Changelog @@ -18,6 +18,7 @@ version next: - ffprobe -show_error option - Avid 1:1 10-bit RGB Packer decoder - v308 Quicktime Uncompressed 4:4:4 encoder and decoder +- yuv4 libquicktime packed 4:2:0 encoder and decoder version 0.9: diff --git a/doc/general.texi b/doc/general.texi index 018bebd9e8..1a9e6cbe0b 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -628,6 +628,8 @@ following image formats are supported: @item WMV7 @tab X @tab X @item YAMAHA SMAF @tab X @tab X @item Psygnosis YOP Video @tab @tab X +@item yuv4 @tab X @tab X + @tab libquicktime uncompressed packed 4:2:0 @item ZLIB @tab X @tab X @tab part of LCL, encoder experimental @item Zip Motion Blocks Video @tab X @tab X diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 7bf16880f9..0060433c6c 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -473,6 +473,8 @@ OBJS-$(CONFIG_XSUB_ENCODER) += xsubenc.o OBJS-$(CONFIG_Y41P_DECODER) += y41pdec.o OBJS-$(CONFIG_Y41P_ENCODER) += y41penc.o OBJS-$(CONFIG_YOP_DECODER) += yop.o +OBJS-$(CONFIG_YUV4_DECODER) += yuv4dec.o +OBJS-$(CONFIG_YUV4_ENCODER) += yuv4enc.o OBJS-$(CONFIG_ZLIB_DECODER) += lcldec.o OBJS-$(CONFIG_ZLIB_ENCODER) += lclenc.o OBJS-$(CONFIG_ZMBV_DECODER) += zmbv.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index aafb7201c1..a15d56262e 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -247,6 +247,7 @@ void avcodec_register_all(void) REGISTER_DECODER (XL, xl); REGISTER_ENCDEC (Y41P, y41p); REGISTER_DECODER (YOP, yop); + REGISTER_ENCDEC (YUV4, yuv4); REGISTER_ENCDEC (ZLIB, zlib); REGISTER_ENCDEC (ZMBV, zmbv); diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index e37cb0df67..2b7ac65c13 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -262,6 +262,7 @@ enum CodecID { CODEC_ID_G2M = MKBETAG( 0 ,'G','2','M'), CODEC_ID_V308 = MKBETAG('V','3','0','8'), + CODEC_ID_YUV4 = MKBETAG('Y','U','V','4'), /* various PCM "codecs" */ CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs diff --git a/libavcodec/version.h b/libavcodec/version.h index 30e05898ef..12d9082802 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -21,7 +21,7 @@ #define AVCODEC_VERSION_H #define LIBAVCODEC_VERSION_MAJOR 53 -#define LIBAVCODEC_VERSION_MINOR 52 +#define LIBAVCODEC_VERSION_MINOR 53 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ diff --git a/libavcodec/yuv4dec.c b/libavcodec/yuv4dec.c new file mode 100644 index 0000000000..206accbf0d --- /dev/null +++ b/libavcodec/yuv4dec.c @@ -0,0 +1,109 @@ +/* + * libquicktime yuv4 decoder + * + * Copyright (c) 2011 Carl Eugen Hoyos + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "avcodec.h" + +static av_cold int yuv4_decode_init(AVCodecContext *avctx) +{ + avctx->pix_fmt = PIX_FMT_YUV420P; + + avctx->coded_frame = avcodec_alloc_frame(); + + if (!avctx->coded_frame) { + av_log(avctx, AV_LOG_ERROR, "Could not allocate frame.\n"); + return AVERROR(ENOMEM); + } + + return 0; +} + +static int yuv4_decode_frame(AVCodecContext *avctx, void *data, + int *data_size, AVPacket *avpkt) +{ + AVFrame *pic = avctx->coded_frame; + const uint8_t *src = avpkt->data; + uint8_t *y, *u, *v; + int i, j; + + if (pic->data[0]) + avctx->release_buffer(avctx, pic); + + if (avpkt->size < 6 * (avctx->width + 1 >> 1) * (avctx->height + 1 >> 1)) { + av_log(avctx, AV_LOG_ERROR, "Insufficient input data.\n"); + return AVERROR(EINVAL); + } + + pic->reference = 0; + + if (avctx->get_buffer(avctx, pic) < 0) { + av_log(avctx, AV_LOG_ERROR, "Could not allocate buffer.\n"); + return AVERROR(ENOMEM); + } + + pic->key_frame = 1; + pic->pict_type = FF_I_TYPE; + + y = pic->data[0]; + u = pic->data[1]; + v = pic->data[2]; + + for (i = 0; i < (avctx->height + 1) >> 1; i++) { + for (j = 0; j < (avctx->width + 1) >> 1; j++) { + u[j] = *src++ ^ 0x80; + v[j] = *src++ ^ 0x80; + y[ 2 * j ] = *src++; + y[ 2 * j + 1] = *src++; + y[pic->linesize[0] + 2 * j ] = *src++; + y[pic->linesize[0] + 2 * j + 1] = *src++; + } + + y += 2 * pic->linesize[0]; + u += pic->linesize[1]; + v += pic->linesize[2]; + } + + *data_size = sizeof(AVFrame); + *(AVFrame *)data = *pic; + + return avpkt->size; +} + +static av_cold int yuv4_decode_close(AVCodecContext *avctx) +{ + if (avctx->coded_frame->data[0]) + avctx->release_buffer(avctx, avctx->coded_frame); + + av_freep(&avctx->coded_frame); + + return 0; +} + +AVCodec ff_yuv4_decoder = { + .name = "yuv4", + .type = AVMEDIA_TYPE_VIDEO, + .id = CODEC_ID_YUV4, + .init = yuv4_decode_init, + .decode = yuv4_decode_frame, + .close = yuv4_decode_close, + .capabilities = CODEC_CAP_DR1, + .long_name = NULL_IF_CONFIG_SMALL("Uncompressed packed 4:2:0"), +}; diff --git a/libavcodec/yuv4enc.c b/libavcodec/yuv4enc.c new file mode 100644 index 0000000000..f15b7e82de --- /dev/null +++ b/libavcodec/yuv4enc.c @@ -0,0 +1,93 @@ +/* + * libquicktime yuv4 encoder + * + * Copyright (c) 2011 Carl Eugen Hoyos + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "avcodec.h" + +static av_cold int yuv4_encode_init(AVCodecContext *avctx) +{ + avctx->coded_frame = avcodec_alloc_frame(); + + if (!avctx->coded_frame) { + av_log(avctx, AV_LOG_ERROR, "Could not allocate frame.\n"); + return AVERROR(ENOMEM); + } + + return 0; +} + +static int yuv4_encode_frame(AVCodecContext *avctx, uint8_t *buf, + int buf_size, void *data) +{ + AVFrame *pic = data; + uint8_t *dst = buf; + uint8_t *y, *u, *v; + int i, j; + int output_size = 0; + + if (buf_size < 6 * (avctx->width + 1 >> 1) * (avctx->height + 1 >> 1)) { + av_log(avctx, AV_LOG_ERROR, "Out buffer is too small.\n"); + return AVERROR(ENOMEM); + } + + avctx->coded_frame->reference = 0; + avctx->coded_frame->key_frame = 1; + avctx->coded_frame->pict_type = FF_I_TYPE; + + y = pic->data[0]; + u = pic->data[1]; + v = pic->data[2]; + + for (i = 0; i < avctx->height + 1 >> 1; i++) { + for (j = 0; j < avctx->width + 1 >> 1; j++) { + *dst++ = u[j] ^ 0x80; + *dst++ = v[j] ^ 0x80; + *dst++ = y[ 2 * j ]; + *dst++ = y[ 2 * j + 1]; + *dst++ = y[pic->linesize[0] + 2 * j ]; + *dst++ = y[pic->linesize[0] + 2 * j + 1]; + output_size += 6; + } + y += 2 * pic->linesize[0]; + u += pic->linesize[1]; + v += pic->linesize[2]; + } + + return output_size; +} + +static av_cold int yuv4_encode_close(AVCodecContext *avctx) +{ + av_freep(&avctx->coded_frame); + + return 0; +} + +AVCodec ff_yuv4_encoder = { + .name = "yuv4", + .type = AVMEDIA_TYPE_VIDEO, + .id = CODEC_ID_YUV4, + .init = yuv4_encode_init, + .encode = yuv4_encode_frame, + .close = yuv4_encode_close, + .pix_fmts = (const enum PixelFormat[]){ PIX_FMT_YUV420P, PIX_FMT_NONE }, + .long_name = NULL_IF_CONFIG_SMALL("Uncompressed packed 4:2:0"), +}; diff --git a/libavformat/isom.c b/libavformat/isom.c index 1e7b79c288..8f898343d6 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -94,6 +94,7 @@ const AVCodecTag codec_movvideo_tags[] = { { CODEC_ID_V308, MKTAG('v', '3', '0', '8') }, /* UNCOMPRESSED 4:4:4 */ { CODEC_ID_V410, MKTAG('v', '4', '1', '0') }, /* UNCOMPRESSED 10BIT 4:4:4 */ { CODEC_ID_Y41P, MKTAG('Y', '4', '1', 'P') }, /* UNCOMPRESSED 12BIT 4:1:1 */ + { CODEC_ID_YUV4, MKTAG('y', 'u', 'v', '4') }, /* libquicktime packed yuv420p */ { CODEC_ID_MJPEG, MKTAG('j', 'p', 'e', 'g') }, /* PhotoJPEG */ { CODEC_ID_MJPEG, MKTAG('m', 'j', 'p', 'a') }, /* Motion-JPEG (format A) */ diff --git a/libavformat/riff.c b/libavformat/riff.c index aa86462636..cd2c9a0f0c 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -201,6 +201,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { { CODEC_ID_V210, MKTAG('v', '2', '1', '0') }, { CODEC_ID_V308, MKTAG('v', '3', '0', '8') }, { CODEC_ID_V410, MKTAG('v', '4', '1', '0') }, + { CODEC_ID_YUV4, MKTAG('y', 'u', 'v', '4') }, { CODEC_ID_INDEO3, MKTAG('I', 'V', '3', '1') }, { CODEC_ID_INDEO3, MKTAG('I', 'V', '3', '2') }, { CODEC_ID_INDEO4, MKTAG('I', 'V', '4', '1') },