@@ -17,6 +17,7 @@ version next:

 - y41p Brooktree Uncompressed 4:1:1 12-bit encoder and decoder

 - ffprobe -show_error option

 - Avid 1:1 10-bit RGB Packer decoder

+- v308 Quicktime Uncompressed 4:4:4 encoder and decoder

 version 0.9:

@@ -609,6 +609,7 @@ following image formats are supported:

     @tab Codec used in DOS CD-ROM FlashBack game.

 @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 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

@@ -416,6 +416,8 @@ OBJS-$(CONFIG_ULTI_DECODER)            += ulti.o

 OBJS-$(CONFIG_UTVIDEO_DECODER)         += utvideo.o

 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_V410_DECODER)            += v410dec.o

 OBJS-$(CONFIG_V410_ENCODER)            += v410enc.o

 OBJS-$(CONFIG_V210X_DECODER)           += v210x.o

@@ -217,6 +217,7 @@ void avcodec_register_all(void)

     REGISTER_DECODER (UTVIDEO, utvideo);

     REGISTER_ENCDEC  (V210,  v210);

     REGISTER_DECODER (V210X, v210x);

+    REGISTER_ENCDEC  (V308, v308);

     REGISTER_ENCDEC  (V410, v410);

     REGISTER_DECODER (VB, vb);

     REGISTER_DECODER (VBLE, vble);

@@ -261,6 +261,7 @@ enum CodecID {

     CODEC_ID_AVRP       = MKBETAG('A','V','R','P'),

     CODEC_ID_G2M        = MKBETAG( 0 ,'G','2','M'),

+    CODEC_ID_V308       = MKBETAG('V','3','0','8'),

     /* various PCM "codecs" */

     CODEC_ID_FIRST_AUDIO = 0x10000,     ///< A dummy id pointing at the start of audio codecs

new file mode 100644

@@ -0,0 +1,108 @@

+/*

+ * v308 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 v308_decode_init(AVCodecContext *avctx)

+{

+    avctx->pix_fmt = PIX_FMT_YUV444P;

+

+    if (avctx->width & 1)

+        av_log(avctx, AV_LOG_WARNING, "v308 requires width to be even.\n");

+

+    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 v308_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 < 3 * 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 = FF_I_TYPE;

+

+    y = pic->data[0];

+    u = pic->data[1];

+    v = pic->data[2];

+

+    for (i = 0; i < avctx->height; i++) {

+        for (j = 0; j < avctx->width; j++) {

+            v[j] = *src++;

+            y[j] = *src++;

+            u[j] = *src++;

+        }

+

+        y += 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 v308_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_v308_decoder = {

+    .name         = "v308",

+    .type         = AVMEDIA_TYPE_VIDEO,

+    .id           = CODEC_ID_V308,

+    .init         = v308_decode_init,

+    .decode       = v308_decode_frame,

+    .close        = v308_decode_close,

+    .capabilities = CODEC_CAP_DR1,

+    .long_name    = NULL_IF_CONFIG_SMALL("Uncompressed packed 4:4:4"),

+};

new file mode 100644

@@ -0,0 +1,96 @@

+/*

+ * v308 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 "libavutil/intreadwrite.h"

+#include "avcodec.h"

+

+static av_cold int v308_encode_init(AVCodecContext *avctx)

+{

+    if (avctx->width & 1) {

+        av_log(avctx, AV_LOG_ERROR, "v308 requires width to be even.\n");

+        return AVERROR_INVALIDDATA;

+    }

+

+    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 v308_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 < avctx->width * avctx->height * 3) {

+        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; i++) {

+        for (j = 0; j < avctx->width; j++) {

+            *dst++ = v[j];

+            *dst++ = y[j];

+            *dst++ = u[j];

+            output_size += 3;

+        }

+        y += pic->linesize[0];

+        u += pic->linesize[1];

+        v += pic->linesize[2];

+    }

+

+    return output_size;

+}

+

+static av_cold int v308_encode_close(AVCodecContext *avctx)

+{

+    av_freep(&avctx->coded_frame);

+

+    return 0;

+}

+

+AVCodec ff_v308_encoder = {

+    .name         = "v308",

+    .type         = AVMEDIA_TYPE_VIDEO,

+    .id           = CODEC_ID_V308,

+    .init         = v308_encode_init,

+    .encode       = v308_encode_frame,

+    .close        = v308_encode_close,

+    .pix_fmts     = (const enum PixelFormat[]){ PIX_FMT_YUV444P, PIX_FMT_NONE },

+    .long_name    = NULL_IF_CONFIG_SMALL("Uncompressed packed 4:4:4"),

+};

@@ -21,7 +21,7 @@

 #define AVCODEC_VERSION_H

 #define LIBAVCODEC_VERSION_MAJOR 53

-#define LIBAVCODEC_VERSION_MINOR 51

+#define LIBAVCODEC_VERSION_MINOR 52

 #define LIBAVCODEC_VERSION_MICRO 100

 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \

@@ -91,6 +91,7 @@ const AVCodecTag codec_movvideo_tags[] = {

     { CODEC_ID_R210,   MKTAG('r', '2', '1', '0') }, /* UNCOMPRESSED 10BIT RGB */

     { CODEC_ID_AVRP,   MKTAG('A', 'V', 'r', 'p') }, /* Avid 1:1 10-bit RGB Packer */

     { CODEC_ID_V210,   MKTAG('v', '2', '1', '0') }, /* UNCOMPRESSED 10BIT 4:2:2 */

+    { 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 */

@@ -199,6 +199,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {

     { CODEC_ID_R10K,         MKTAG('R', '1', '0', 'k') },

     { 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_V410,         MKTAG('v', '4', '1', '0') },

     { CODEC_ID_INDEO3,       MKTAG('I', 'V', '3', '1') },

     { CODEC_ID_INDEO3,       MKTAG('I', 'V', '3', '2') },