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

 - Indeo 4 decoder

 - SMJPEG demuxer

 - Automatic thread count based on detection number of (available) CPU cores

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

 version 0.9:

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

     @tab Used in some games from Bethesda Softworks.

 @item Bink Video             @tab     @tab  X

 @item Bitmap Brothers JV video  @tab   @tab X

+@item y41p Brooktree uncompressed 4:1:1 12-bit     @tab  X  @tab  X

 @item Brute Force & Ignorance   @tab   @tab X

     @tab Used in the game Flash Traffic: City of Angels.

 @item C93 video              @tab     @tab  X

@@ -467,6 +467,8 @@ OBJS-$(CONFIG_XBIN_DECODER)            += bintext.o cga_data.o

 OBJS-$(CONFIG_XL_DECODER)              += xl.o

 OBJS-$(CONFIG_XSUB_DECODER)            += xsubdec.o

 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_ZLIB_DECODER)            += lcldec.o

 OBJS-$(CONFIG_ZLIB_ENCODER)            += lclenc.o

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

     REGISTER_DECODER (XAN_WC3, xan_wc3);

     REGISTER_DECODER (XAN_WC4, xan_wc4);

     REGISTER_DECODER (XL, xl);

+    REGISTER_ENCDEC  (Y41P, y41p);

     REGISTER_DECODER (YOP, yop);

     REGISTER_ENCDEC  (ZLIB, zlib);

     REGISTER_ENCDEC  (ZMBV, zmbv);

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

     CODEC_ID_VBLE,

     CODEC_ID_DXTORY,

     CODEC_ID_V410,

+    CODEC_ID_Y41P       = MKBETAG('Y','4','1','P'),

     CODEC_ID_UTVIDEO = 0x800,

     CODEC_ID_ESCAPE130  = MKBETAG('E','1','3','0'),

@@ -21,8 +21,8 @@

 #define AVCODEC_VERSION_H

 #define LIBAVCODEC_VERSION_MAJOR 53

-#define LIBAVCODEC_VERSION_MINOR 49

-#define LIBAVCODEC_VERSION_MICRO 102

+#define LIBAVCODEC_VERSION_MINOR 50

+#define LIBAVCODEC_VERSION_MICRO 100

 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \

                                                LIBAVCODEC_VERSION_MINOR, \

new file mode 100644

@@ -0,0 +1,116 @@

+/*

+ * y41p decoder

+ *

+ * Copyright (c) 2012 Paul B Mahol

+ *

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

+{

+    avctx->pix_fmt             = PIX_FMT_YUV411P;

+    avctx->bits_per_raw_sample = 12;

+

+    if (avctx->width & 7) {

+        av_log(avctx, AV_LOG_WARNING, "y41p requires width to be divisible by 8.\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 y41p_decode_frame(AVCodecContext *avctx, void *data,

+                             int *data_size, AVPacket *avpkt)

+{

+    AVFrame *pic = avctx->coded_frame;

+    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 < 1.5 * 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;

+

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

+        y = &pic->data[0][i * pic->linesize[0]];

+        u = &pic->data[1][i * pic->linesize[1]];

+        v = &pic->data[2][i * pic->linesize[2]];

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

+            *(u++) = *src++;

+            *(y++) = *src++;

+            *(v++) = *src++;

+            *(y++) = *src++;

+

+            *(u++) = *src++;

+            *(y++) = *src++;

+            *(v++) = *src++;

+            *(y++) = *src++;

+

+            *(y++) = *src++;

+            *(y++) = *src++;

+            *(y++) = *src++;

+            *(y++) = *src++;

+        }

+    }

+

+    *data_size = sizeof(AVFrame);

+    *(AVFrame *)data = *pic;

+

+    return avpkt->size;

+}

+

+static av_cold int y41p_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_y41p_decoder = {

+    .name         = "y41p",

+    .type         = AVMEDIA_TYPE_VIDEO,

+    .id           = CODEC_ID_Y41P,

+    .init         = y41p_decode_init,

+    .decode       = y41p_decode_frame,

+    .close        = y41p_decode_close,

+    .capabilities = CODEC_CAP_DR1,

+    .long_name    = NULL_IF_CONFIG_SMALL("Uncompressed YUV 4:1:1 12-bit"),

+};

new file mode 100644

@@ -0,0 +1,101 @@

+/*

+ * y41p encoder

+ *

+ * Copyright (c) 2012 Paul B Mahol

+ *

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

+{

+    if (avctx->width & 7) {

+        av_log(avctx, AV_LOG_ERROR, "y41p requires width to be divisible by 8.\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 y41p_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;

+

+    if (buf_size < avctx->width * avctx->height * 1.5) {

+        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;

+

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

+        y = &pic->data[0][i * pic->linesize[0]];

+        u = &pic->data[1][i * pic->linesize[1]];

+        v = &pic->data[2][i * pic->linesize[2]];

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

+            *(dst++) = *(u++);

+            *(dst++) = *(y++);

+            *(dst++) = *(v++);

+            *(dst++) = *(y++);

+

+            *(dst++) = *(u++);

+            *(dst++) = *(y++);

+            *(dst++) = *(v++);

+            *(dst++) = *(y++);

+

+            *(dst++) = *(y++);

+            *(dst++) = *(y++);

+            *(dst++) = *(y++);

+            *(dst++) = *(y++);

+        }

+    }

+

+    return avctx->width * avctx->height * 1.5;

+}

+

+static av_cold int y41p_encode_close(AVCodecContext *avctx)

+{

+    av_freep(&avctx->coded_frame);

+

+    return 0;

+}

+

+AVCodec ff_y41p_encoder = {

+    .name         = "y41p",

+    .type         = AVMEDIA_TYPE_VIDEO,

+    .id           = CODEC_ID_Y41P,

+    .init         = y41p_encode_init,

+    .encode       = y41p_encode_frame,

+    .close        = y41p_encode_close,

+    .pix_fmts     = (const enum PixelFormat[]) { PIX_FMT_YUV411P,

+                                                 PIX_FMT_NONE },

+    .long_name    = NULL_IF_CONFIG_SMALL("Uncompressed YUV 4:1:1 12-bit"),

+};

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

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

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

     { 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_MJPEG,  MKTAG('j', 'p', 'e', 'g') }, /* PhotoJPEG */

     { CODEC_ID_MJPEG,  MKTAG('m', 'j', 'p', 'a') }, /* Motion-JPEG (format A) */

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

     { CODEC_ID_VBLE,         MKTAG('V', 'B', 'L', 'E') },

     { CODEC_ID_ESCAPE130,    MKTAG('E', '1', '3', '0') },

     { CODEC_ID_DXTORY,       MKTAG('x', 't', 'o', 'r') },

+    { CODEC_ID_Y41P,         MKTAG('Y', '4', '1', 'P') },

     { CODEC_ID_NONE,         0 }

 };