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

 - filter for loudness analysis following EBU R128

 - Opus encoder using libopus

 - ffprobe -select_streams option

+- Pinnacle TARGA CineWave YUV16 decoder

 version 1.0:

@@ -622,6 +622,8 @@ following image formats are supported:

     @tab fourcc: VP60,VP61,VP62

 @item VP8                    @tab  E  @tab  X

     @tab fourcc: VP80, encoding supported through external library libvpx

+@item Pinnacle TARGA CineWave YUV16 @tab     @tab  X

+    @tab fourcc: Y216

 @item Prores                 @tab     @tab  X

     @tab fourcc: apch,apcn,apcs,apco

 @item Q-team QPEG            @tab     @tab  X

@@ -402,6 +402,7 @@ OBJS-$(CONFIG_SVQ3_DECODER)            += svq3.o svq13.o h263.o h264.o        \

                                           h264_cavlc.o h264_cabac.o cabac.o

 OBJS-$(CONFIG_TARGA_DECODER)           += targa.o

 OBJS-$(CONFIG_TARGA_ENCODER)           += targaenc.o rle.o

+OBJS-$(CONFIG_TARGA_Y216_DECODER)      += targa_y216dec.o

 OBJS-$(CONFIG_THEORA_DECODER)          += xiph.o

 OBJS-$(CONFIG_THP_DECODER)             += mjpegdec.o mjpeg.o

 OBJS-$(CONFIG_TIERTEXSEQVIDEO_DECODER) += tiertexseqv.o

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

     REGISTER_ENCDEC  (SVQ1, svq1);

     REGISTER_DECODER (SVQ3, svq3);

     REGISTER_ENCDEC  (TARGA, targa);

+    REGISTER_DECODER (TARGA_Y216, targa_y216);

     REGISTER_DECODER (THEORA, theora);

     REGISTER_DECODER (THP, thp);

     REGISTER_DECODER (TIERTEXSEQVIDEO, tiertexseqvideo);

@@ -275,6 +275,7 @@ enum AVCodecID {

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

     AV_CODEC_ID_AVUI       = MKBETAG('A','V','U','I'),

     AV_CODEC_ID_AYUV       = MKBETAG('A','Y','U','V'),

+    AV_CODEC_ID_TARGA_Y216 = MKBETAG('T','2','1','6'),

     AV_CODEC_ID_V308       = MKBETAG('V','3','0','8'),

     AV_CODEC_ID_V408       = MKBETAG('V','4','0','8'),

     AV_CODEC_ID_YUV4       = MKBETAG('Y','U','V','4'),

@@ -1260,6 +1260,13 @@ static const AVCodecDescriptor codec_descriptors[] = {

         .props     = AV_CODEC_PROP_INTRA_ONLY,

     },

     {

+        .id        = AV_CODEC_ID_TARGA_Y216,

+        .type      = AVMEDIA_TYPE_VIDEO,

+        .name      = "targa_y216",

+        .long_name = NULL_IF_CONFIG_SMALL("Pinnacle TARGA CineWave YUV16"),

+        .props     = AV_CODEC_PROP_INTRA_ONLY,

+    },

+    {

         .id        = AV_CODEC_ID_V308,

         .type      = AVMEDIA_TYPE_VIDEO,

         .name      = "v308",

new file mode 100644

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

+/*

+ * Pinnacle TARGA CineWave YUV16 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 y216_decode_init(AVCodecContext *avctx)

+{

+    avctx->pix_fmt             = PIX_FMT_YUV422P16;

+    avctx->bits_per_raw_sample = 14;

+

+    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 y216_decode_frame(AVCodecContext *avctx, void *data,

+                             int *data_size, AVPacket *avpkt)

+{

+    AVFrame *pic = avctx->coded_frame;

+    const uint16_t *src = (uint16_t *)avpkt->data;

+    uint16_t *y, *u, *v, aligned_width = FFALIGN(avctx->width, 4);

+    int i, j;

+

+    if (pic->data[0])

+        avctx->release_buffer(avctx, pic);

+

+    if (avpkt->size < 4 * avctx->height * aligned_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 = (uint16_t *)pic->data[0];

+    u = (uint16_t *)pic->data[1];

+    v = (uint16_t *)pic->data[2];

+

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

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

+            u[    j    ] = src[4 * j    ] << 2 | src[4 * j    ] >> 14;

+            y[2 * j    ] = src[4 * j + 1] << 2 | src[4 * j + 1] >> 14;

+            v[    j    ] = src[4 * j + 2] << 2 | src[4 * j + 2] >> 14;

+            y[2 * j + 1] = src[4 * j + 3] << 2 | src[4 * j + 3] >> 14;

+        }

+

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

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

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

+        src += aligned_width << 1;

+    }

+

+    *data_size = sizeof(AVFrame);

+    *(AVFrame *)data = *pic;

+

+    return avpkt->size;

+}

+

+static av_cold int y216_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_targa_y216_decoder = {

+    .name         = "targa_y216",

+    .type         = AVMEDIA_TYPE_VIDEO,

+    .id           = AV_CODEC_ID_TARGA_Y216,

+    .init         = y216_decode_init,

+    .decode       = y216_decode_frame,

+    .close        = y216_decode_close,

+    .capabilities = CODEC_CAP_DR1,

+    .long_name    = NULL_IF_CONFIG_SMALL("Pinnacle TARGA CineWave YUV16"),

+};

@@ -29,7 +29,7 @@

 #include "libavutil/avutil.h"

 #define LIBAVCODEC_VERSION_MAJOR 54

-#define LIBAVCODEC_VERSION_MINOR 63

+#define LIBAVCODEC_VERSION_MINOR 64

 #define LIBAVCODEC_VERSION_MICRO 100

 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \

@@ -104,6 +104,7 @@ const AVCodecTag ff_codec_movvideo_tags[] = {

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

     { AV_CODEC_ID_Y41P,   MKTAG('Y', '4', '1', 'P') }, /* UNCOMPRESSED 12BIT 4:1:1 */

     { AV_CODEC_ID_YUV4,   MKTAG('y', 'u', 'v', '4') }, /* libquicktime packed yuv420p */

+    { AV_CODEC_ID_TARGA_Y216, MKTAG('Y', '2', '1', '6') },

     { AV_CODEC_ID_MJPEG,  MKTAG('j', 'p', 'e', 'g') }, /* PhotoJPEG */

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