ATI VCR1 decoder

Originally committed as revision 2076 to svn://svn.ffmpeg.org/ffmpeg/trunk

5 files changed, 212 insertions, 1 deletions

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 7c791155d3..894c53aca5 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -17,7 +17,7 @@ OBJS= common.o utils.o mem.o allcodecs.o \
       mpeg12.o mpegaudiodec.o pcm.o simple_idct.o \
       ratecontrol.o adpcm.o eval.o dv.o error_resilience.o \
       fft.o mdct.o mace.o huffyuv.o cyuv.o opts.o raw.o h264.o golomb.o \
-      vp3.o asv1.o 4xm.o cabac.o ffv1.o ra144.o ra288.o
+      vp3.o asv1.o 4xm.o cabac.o ffv1.o ra144.o ra288.o vcr1.o
 
 ifeq ($(AMR_NB),yes)
 ifeq ($(AMR_NB_FIXED),yes)
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index 728e5c3626..43320e6980 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -110,6 +110,7 @@ void avcodec_register_all(void)
     register_avcodec(&h264_decoder);
     register_avcodec(&vp3_decoder);
     register_avcodec(&asv1_decoder);
+    register_avcodec(&vcr1_decoder);
     register_avcodec(&fourxm_decoder);
 #ifdef CONFIG_AC3
     register_avcodec(&ac3_decoder);
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index f2e5a1c13f..2b875e0fa0 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -60,6 +60,7 @@ enum CodecID {
     CODEC_ID_ASV1,
     CODEC_ID_FFV1,
     CODEC_ID_4XM,
+    CODEC_ID_VCR1,
 
     /* various pcm "codecs" */
     CODEC_ID_PCM_S16LE,
@@ -1257,6 +1258,7 @@ extern AVCodec wmv2_encoder;
 extern AVCodec huffyuv_encoder;
 extern AVCodec h264_encoder;
 extern AVCodec asv1_encoder;
+extern AVCodec vcr1_encoder;
 extern AVCodec ffv1_encoder;
 
 extern AVCodec h263_decoder;
@@ -1293,6 +1295,7 @@ extern AVCodec amr_nb_encoder;
 extern AVCodec aac_decoder;
 extern AVCodec mpeg4aac_decoder;
 extern AVCodec asv1_decoder;
+extern AVCodec vcr1_decoder;
 extern AVCodec ffv1_decoder;
 extern AVCodec fourxm_decoder;
 extern AVCodec ra_144_decoder;
diff --git a/libavcodec/vcr1.c b/libavcodec/vcr1.c
new file mode 100644
index 0000000000..b89260eaa3
--- /dev/null
+++ b/libavcodec/vcr1.c
@@ -0,0 +1,206 @@
+/*
+ * ATI VCR1 codec
+ * Copyright (c) 2003 Michael Niedermayer
+ *
+ * This library 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 of the License, or (at your option) any later version.
+ *
+ * This library 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 this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+ 
+/**
+ * @file vcr1.c
+ * ati vcr1 codec.
+ */
+ 
+#include "avcodec.h"
+#include "mpegvideo.h"
+
+//#undef NDEBUG
+//#include <assert.h>
+
+typedef struct VCR1Context{
+    AVCodecContext *avctx;
+    AVFrame picture;
+    int delta[16];
+    int offset[4];
+} VCR1Context;
+
+static int decode_frame(AVCodecContext *avctx, 
+                        void *data, int *data_size,
+                        uint8_t *buf, int buf_size)
+{
+    VCR1Context * const a = avctx->priv_data;
+    AVFrame *picture = data;
+    AVFrame * const p= (AVFrame*)&a->picture;
+    uint8_t *bytestream= buf;
+    int i, x, y;
+
+    *data_size = 0;
+
+    /* special case for last picture */
+    if (buf_size == 0) {
+        return 0;
+    }
+
+    if(p->data[0])
+        avctx->release_buffer(avctx, p);
+
+    p->reference= 0;
+    if(avctx->get_buffer(avctx, p) < 0){
+        fprintf(stderr, "get_buffer() failed\n");
+        return -1;
+    }
+    p->pict_type= I_TYPE;
+    p->key_frame= 1;
+
+    for(i=0; i<16; i++){
+        a->delta[i]= *(bytestream++);
+        bytestream++;
+    }
+    
+    for(y=0; y<avctx->height; y++){
+        int offset;
+        uint8_t *luma= &a->picture.data[0][ y*a->picture.linesize[0] ];
+
+        if((y&3) == 0){
+            uint8_t *cb= &a->picture.data[1][ (y>>2)*a->picture.linesize[1] ];
+            uint8_t *cr= &a->picture.data[2][ (y>>2)*a->picture.linesize[2] ];
+
+            for(i=0; i<4; i++)
+                a->offset[i]= *(bytestream++);
+
+            offset= a->offset[0];
+            for(x=0; x<avctx->width; x+=4){
+                luma[0]=( offset += a->delta[ bytestream[2]&0xF ]);
+                luma[1]=( offset += a->delta[ bytestream[2]>>4  ]);
+                luma[2]=( offset += a->delta[ bytestream[0]&0xF ]);
+                luma[3]=( offset += a->delta[ bytestream[0]>>4  ]);
+                luma += 4;
+                
+                *(cb++) = bytestream[1];
+                *(cr++) = bytestream[3];
+                
+                bytestream+= 4;
+            }
+        }else{
+            offset= a->offset[y&3];
+
+            for(x=0; x<avctx->width; x+=8){
+                luma[0]=( offset += a->delta[ bytestream[2]&0xF ]);
+                luma[1]=( offset += a->delta[ bytestream[2]>>4  ]);
+                luma[2]=( offset += a->delta[ bytestream[3]&0xF ]);
+                luma[3]=( offset += a->delta[ bytestream[3]>>4  ]);
+                luma[4]=( offset += a->delta[ bytestream[0]&0xF ]);
+                luma[5]=( offset += a->delta[ bytestream[0]>>4  ]);
+                luma[6]=( offset += a->delta[ bytestream[1]&0xF ]);
+                luma[7]=( offset += a->delta[ bytestream[1]>>4  ]);
+                luma += 8;
+                bytestream+= 4;
+            }
+        }
+    }
+
+    *picture= *(AVFrame*)&a->picture;
+    *data_size = sizeof(AVPicture);
+
+    emms_c();
+    
+    return buf_size;
+}
+
+#if 0
+static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){
+    VCR1Context * const a = avctx->priv_data;
+    AVFrame *pict = data;
+    AVFrame * const p= (AVFrame*)&a->picture;
+    int size;
+    int mb_x, mb_y;
+
+    *p = *pict;
+    p->pict_type= I_TYPE;
+    p->key_frame= 1;
+
+    emms_c();
+    
+    align_put_bits(&a->pb);
+    while(get_bit_count(&a->pb)&31)
+        put_bits(&a->pb, 8, 0);
+    
+    size= get_bit_count(&a->pb)/32;
+    
+    return size*4;
+}
+#endif
+
+static void common_init(AVCodecContext *avctx){
+    VCR1Context * const a = avctx->priv_data;
+
+    avctx->coded_frame= (AVFrame*)&a->picture;
+    a->avctx= avctx;
+}
+
+static int decode_init(AVCodecContext *avctx){
+    VCR1Context * const a = avctx->priv_data;
+    AVFrame *p= (AVFrame*)&a->picture;
+    int i;
+ 
+    common_init(avctx);
+    
+    avctx->pix_fmt= PIX_FMT_YUV410P;
+
+    return 0;
+}
+
+static int encode_init(AVCodecContext *avctx){
+    VCR1Context * const a = avctx->priv_data;
+    int i;
+ 
+    common_init(avctx);
+    
+    return 0;
+}
+
+static int decode_end(AVCodecContext *avctx){
+    VCR1Context * const a = avctx->priv_data;
+
+    avcodec_default_free_buffers(avctx);
+
+    return 0;
+}
+
+AVCodec vcr1_decoder = {
+    "vcr1",
+    CODEC_TYPE_VIDEO,
+    CODEC_ID_VCR1,
+    sizeof(VCR1Context),
+    decode_init,
+    NULL,
+    decode_end,
+    decode_frame,
+    CODEC_CAP_DR1,
+};
+#if 0
+#ifdef CONFIG_ENCODERS
+
+AVCodec vcr1_encoder = {
+    "vcr1",
+    CODEC_TYPE_VIDEO,
+    CODEC_ID_VCR1,
+    sizeof(VCR1Context),
+    encode_init,
+    encode_frame,
+    //encode_end,
+};
+
+#endif //CONFIG_ENCODERS
+#endif
diff --git a/libavformat/avienc.c b/libavformat/avienc.c
index 550672b3a1..7afb52b65b 100644
--- a/libavformat/avienc.c
+++ b/libavformat/avienc.c
@@ -167,6 +167,7 @@ const CodecTag codec_bmp_tags[] = {
     { CODEC_ID_INDEO3, MKTAG('I', 'V', '3', '2') },
     { CODEC_ID_VP3, MKTAG('V', 'P', '3', '1') },
     { CODEC_ID_ASV1, MKTAG('A', 'S', 'V', '1') },
+    { CODEC_ID_VCR1, MKTAG('V', 'C', 'R', '1') },
     { CODEC_ID_FFV1, MKTAG('F', 'F', 'V', '1') },
     { 0, 0 },
 };