diff options
| -rw-r--r-- | Changelog | 1 | ||||
| -rw-r--r-- | doc/general.texi | 3 | ||||
| -rw-r--r-- | libavcodec/Makefile | 4 | ||||
| -rw-r--r-- | libavcodec/allcodecs.c | 2 | ||||
| -rw-r--r-- | libavcodec/avcodec.h | 2 | ||||
| -rw-r--r-- | libavcodec/v408dec.c | 127 | ||||
| -rw-r--r-- | libavcodec/v408enc.c | 112 | ||||
| -rw-r--r-- | libavcodec/version.h | 4 | ||||
| -rw-r--r-- | libavformat/isom.c | 1 | ||||
| -rw-r--r-- | libavformat/riff.c | 2 |
10 files changed, 256 insertions, 2 deletions
@@ -2,6 +2,7 @@ Entries are sorted chronologically from oldest to youngest within each release, releases are sorted from youngest to oldest. version next: +- v408 Quicktime amd Microsoft AYUV Uncompressed 4:4:4:4 encoder and decoder version 0.10: - Fixes: CVE-2011-3929, CVE-2011-3934, CVE-2011-3935, CVE-2011-3936, diff --git a/doc/general.texi b/doc/general.texi index dbf8775b71..669c2287f7 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -444,6 +444,8 @@ following image formats are supported: @tab fourcc: AVrp @item AVS (Audio Video Standard) video @tab @tab X @tab Video encoding used by the Creature Shock game. +@item AYUV @tab X @tab X + @tab Microsoft uncompressed packed 4:4:4:4 @item Beam Software VB @tab @tab X @item Bethesda VID video @tab @tab X @tab Used in some games from Bethesda Softworks. @@ -613,6 +615,7 @@ following image formats are supported: @item Ut Video @tab @tab X @item v210 QuickTime uncompressed 4:2:2 10-bit @tab X @tab X @item v308 QuickTime uncompressed 4:4:4 @tab X @tab X +@item v408 QuickTime uncompressed 4:4:4:4 @tab X @tab X @item v410 QuickTime uncompressed 4:4:4 10-bit @tab X @tab X @item VBLE Lossless Codec @tab @tab X @item VMware Screen Codec / VMware Video @tab @tab X diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 2173855e5b..7a8ceb6114 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -95,6 +95,8 @@ OBJS-$(CONFIG_AURA2_DECODER) += aura.o OBJS-$(CONFIG_AVRP_DECODER) += r210dec.o OBJS-$(CONFIG_AVRP_ENCODER) += r210enc.o OBJS-$(CONFIG_AVS_DECODER) += avs.o +OBJS-$(CONFIG_AYUV_DECODER) += v408dec.o +OBJS-$(CONFIG_AYUV_ENCODER) += v408enc.o OBJS-$(CONFIG_BETHSOFTVID_DECODER) += bethsoftvideo.o OBJS-$(CONFIG_BFI_DECODER) += bfi.o OBJS-$(CONFIG_BINK_DECODER) += bink.o binkdsp.o @@ -422,6 +424,8 @@ OBJS-$(CONFIG_V210_DECODER) += v210dec.o OBJS-$(CONFIG_V210_ENCODER) += v210enc.o OBJS-$(CONFIG_V308_DECODER) += v308dec.o OBJS-$(CONFIG_V308_ENCODER) += v308enc.o +OBJS-$(CONFIG_V408_DECODER) += v408dec.o +OBJS-$(CONFIG_V408_ENCODER) += v408enc.o OBJS-$(CONFIG_V410_DECODER) += v410dec.o OBJS-$(CONFIG_V410_ENCODER) += v410enc.o OBJS-$(CONFIG_V210X_DECODER) += v210x.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 06b872ce52..d18b3f03c7 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -81,6 +81,7 @@ void avcodec_register_all(void) REGISTER_DECODER (AURA2, aura2); REGISTER_ENCDEC (AVRP, avrp); REGISTER_DECODER (AVS, avs); + REGISTER_ENCDEC (AYUV, ayuv); REGISTER_DECODER (BETHSOFTVID, bethsoftvid); REGISTER_DECODER (BFI, bfi); REGISTER_DECODER (BINK, bink); @@ -218,6 +219,7 @@ void avcodec_register_all(void) REGISTER_ENCDEC (V210, v210); REGISTER_DECODER (V210X, v210x); REGISTER_ENCDEC (V308, v308); + REGISTER_ENCDEC (V408, v408); REGISTER_ENCDEC (V410, v410); REGISTER_DECODER (VB, vb); REGISTER_DECODER (VBLE, vble); diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 8db04109cd..ee3833b0c8 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -251,7 +251,9 @@ enum CodecID { CODEC_ID_AVRP = MKBETAG('A','V','R','P'), CODEC_ID_G2M = MKBETAG( 0 ,'G','2','M'), + CODEC_ID_AYUV = MKBETAG('A','Y','U','V'), CODEC_ID_V308 = MKBETAG('V','3','0','8'), + CODEC_ID_V408 = MKBETAG('V','4','0','8'), CODEC_ID_YUV4 = MKBETAG('Y','U','V','4'), /* various PCM "codecs" */ diff --git a/libavcodec/v408dec.c b/libavcodec/v408dec.c new file mode 100644 index 0000000000..be15aa1ae9 --- /dev/null +++ b/libavcodec/v408dec.c @@ -0,0 +1,127 @@ +/* + * v408 decoder + * Copyright (c) 2012 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 v408_decode_init(AVCodecContext *avctx) +{ + avctx->pix_fmt = PIX_FMT_YUVA444P; + + 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 v408_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, *a; + int i, j; + + if (pic->data[0]) + avctx->release_buffer(avctx, pic); + + if (avpkt->size < 4 * avctx->height * avctx->width) { + 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 = AV_PICTURE_TYPE_I; + + y = pic->data[0]; + u = pic->data[1]; + v = pic->data[2]; + a = pic->data[3]; + + for (i = 0; i < avctx->height; i++) { + for (j = 0; j < avctx->width; j++) { + if (avctx->codec_id==CODEC_ID_AYUV) { + v[j] = *src++; + u[j] = *src++; + y[j] = *src++; + a[j] = *src++; + } else { + u[j] = *src++; + y[j] = *src++; + v[j] = *src++; + a[j] = *src++; + } + } + + y += pic->linesize[0]; + u += pic->linesize[1]; + v += pic->linesize[2]; + a += pic->linesize[3]; + } + + *data_size = sizeof(AVFrame); + *(AVFrame *)data = *pic; + + return avpkt->size; +} + +static av_cold int v408_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_ayuv_decoder = { + .name = "ayuv", + .type = AVMEDIA_TYPE_VIDEO, + .id = CODEC_ID_AYUV, + .init = v408_decode_init, + .decode = v408_decode_frame, + .close = v408_decode_close, + .capabilities = CODEC_CAP_DR1, + .long_name = NULL_IF_CONFIG_SMALL("Uncompressed packed MS 4:4:4:4"), +}; + +AVCodec ff_v408_decoder = { + .name = "v408", + .type = AVMEDIA_TYPE_VIDEO, + .id = CODEC_ID_V408, + .init = v408_decode_init, + .decode = v408_decode_frame, + .close = v408_decode_close, + .capabilities = CODEC_CAP_DR1, + .long_name = NULL_IF_CONFIG_SMALL("Uncompressed packed QT 4:4:4:4"), +}; + diff --git a/libavcodec/v408enc.c b/libavcodec/v408enc.c new file mode 100644 index 0000000000..bbc24ef786 --- /dev/null +++ b/libavcodec/v408enc.c @@ -0,0 +1,112 @@ +/* + * v408 encoder + * + * Copyright (c) 2012 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 "libavutil/intreadwrite.h" +#include "avcodec.h" + +static av_cold int v408_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 v408_encode_frame(AVCodecContext *avctx, uint8_t *buf, + int buf_size, void *data) +{ + AVFrame *pic = data; + uint8_t *dst = buf; + uint8_t *y, *u, *v, *a; + int i, j; + int output_size = 0; + + if (buf_size < avctx->width * avctx->height * 4) { + 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 = AV_PICTURE_TYPE_I; + + y = pic->data[0]; + u = pic->data[1]; + v = pic->data[2]; + a = pic->data[3]; + + for (i = 0; i < avctx->height; i++) { + for (j = 0; j < avctx->width; j++) { + if (avctx->codec_id==CODEC_ID_AYUV) { + *dst++ = v[j]; + *dst++ = u[j]; + *dst++ = y[j]; + *dst++ = a[j]; + } else { + *dst++ = u[j]; + *dst++ = y[j]; + *dst++ = v[j]; + *dst++ = a[j]; + } + output_size += 4; + } + y += pic->linesize[0]; + u += pic->linesize[1]; + v += pic->linesize[2]; + a += pic->linesize[3]; + } + + return output_size; +} + +static av_cold int v408_encode_close(AVCodecContext *avctx) +{ + av_freep(&avctx->coded_frame); + + return 0; +} + +AVCodec ff_ayuv_encoder = { + .name = "ayuv", + .type = AVMEDIA_TYPE_VIDEO, + .id = CODEC_ID_AYUV, + .init = v408_encode_init, + .encode = v408_encode_frame, + .close = v408_encode_close, + .pix_fmts = (const enum PixelFormat[]){ PIX_FMT_YUVA444P, PIX_FMT_NONE }, + .long_name = NULL_IF_CONFIG_SMALL("Uncompressed packed MS 4:4:4:4"), +}; + +AVCodec ff_v408_encoder = { + .name = "v408", + .type = AVMEDIA_TYPE_VIDEO, + .id = CODEC_ID_V408, + .init = v408_encode_init, + .encode = v408_encode_frame, + .close = v408_encode_close, + .pix_fmts = (const enum PixelFormat[]){ PIX_FMT_YUVA444P, PIX_FMT_NONE }, + .long_name = NULL_IF_CONFIG_SMALL("Uncompressed packed QT 4:4:4:4"), +}; diff --git a/libavcodec/version.h b/libavcodec/version.h index ac28707635..db72466927 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -21,8 +21,8 @@ #define AVCODEC_VERSION_H #define LIBAVCODEC_VERSION_MAJOR 54 -#define LIBAVCODEC_VERSION_MINOR 0 -#define LIBAVCODEC_VERSION_MICRO 102 +#define LIBAVCODEC_VERSION_MINOR 1 +#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ diff --git a/libavformat/isom.c b/libavformat/isom.c index 1228d56d3a..699cd0e217 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -93,6 +93,7 @@ const AVCodecTag codec_movvideo_tags[] = { { CODEC_ID_AVRP, MKTAG('S', 'U', 'D', 'S') }, /* Avid DS Uncompressed */ { CODEC_ID_V210, MKTAG('v', '2', '1', '0') }, /* UNCOMPRESSED 10BIT 4:2:2 */ { CODEC_ID_V308, MKTAG('v', '3', '0', '8') }, /* UNCOMPRESSED 8BIT 4:4:4 */ + { CODEC_ID_V408, MKTAG('v', '4', '0', '8') }, /* UNCOMPRESSED 8BIT 4: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 */ diff --git a/libavformat/riff.c b/libavformat/riff.c index 4efd1ad756..c77d0225f7 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -202,6 +202,8 @@ const AVCodecTag ff_codec_bmp_tags[] = { { CODEC_ID_R210, MKTAG('r', '2', '1', '0') }, { CODEC_ID_V210, MKTAG('v', '2', '1', '0') }, { CODEC_ID_V308, MKTAG('v', '3', '0', '8') }, + { CODEC_ID_V408, MKTAG('v', '4', '0', '8') }, + { CODEC_ID_AYUV, MKTAG('A', 'Y', 'U', 'V') }, { CODEC_ID_V410, MKTAG('v', '4', '1', '0') }, { CODEC_ID_YUV4, MKTAG('y', 'u', 'v', '4') }, { CODEC_ID_INDEO3, MKTAG('I', 'V', '3', '1') }, |