frsh: Export information about the last RTP contract and VRES

[frescor/ffmpeg.git] / libavcodec / vcr1.c

diff --git a/libavcodec/vcr1.c b/libavcodec/vcr1.c
index 442ad9136716ab4f1426ad13d2cda80af3f4ded3..6218c7c63483ea32b40ec1c9914574acf8569af7 100644 (file)
--- a/libavcodec/vcr1.c
+++ b/libavcodec/vcr1.c
@@ -2,32 +2,38 @@
  * ATI VCR1 codec
  * Copyright (c) 2003 Michael Niedermayer
  *
- * This library is free software; you can redistribute it and/or
+ * 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 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful,
+ * 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 this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
- 
+
 /**
- * @file vcr1.c
+ * @file libavcodec/vcr1.c
  * ati vcr1 codec.
  */
- 
+
 #include "avcodec.h"
-#include "mpegvideo.h"
+#include "dsputil.h"
 
 //#undef NDEBUG
 //#include <assert.h>
 
+/* Disable the encoder. */
+#undef CONFIG_VCR1_ENCODER
+#define CONFIG_VCR1_ENCODER 0
+
 typedef struct VCR1Context{
     AVCodecContext *avctx;
     AVFrame picture;
@@ -35,14 +41,16 @@ typedef struct VCR1Context{
     int offset[4];
 } VCR1Context;
 
-static int decode_frame(AVCodecContext *avctx, 
+static int decode_frame(AVCodecContext *avctx,
                         void *data, int *data_size,
-                        uint8_t *buf, int buf_size)
+                        AVPacket *avpkt)
 {
+    const uint8_t *buf = avpkt->data;
+    int buf_size = avpkt->size;
     VCR1Context * const a = avctx->priv_data;
     AVFrame *picture = data;
     AVFrame * const p= (AVFrame*)&a->picture;
-    uint8_t *bytestream= buf;
+    const uint8_t *bytestream= buf;
     int i, x, y;
 
     if(p->data[0])
@@ -53,14 +61,14 @@ static int decode_frame(AVCodecContext *avctx,
         av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
         return -1;
     }
-    p->pict_type= I_TYPE;
+    p->pict_type= FF_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] ];
@@ -79,10 +87,10 @@ static int decode_frame(AVCodecContext *avctx,
                 luma[2]=( offset += a->delta[ bytestream[0]&0xF ]);
                 luma[3]=( offset += a->delta[ bytestream[0]>>4  ]);
                 luma += 4;
-                
+
                 *(cb++) = bytestream[3];
                 *(cr++) = bytestream[1];
-                
+
                 bytestream+= 4;
             }
         }else{
@@ -107,55 +115,54 @@ static int decode_frame(AVCodecContext *avctx,
     *data_size = sizeof(AVPicture);
 
     emms_c();
-    
+
     return buf_size;
 }
 
-#if 0
+#if CONFIG_VCR1_ENCODER
 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->pict_type= FF_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){
+static av_cold 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){
- 
+static av_cold int decode_init(AVCodecContext *avctx){
+
     common_init(avctx);
-    
+
     avctx->pix_fmt= PIX_FMT_YUV410P;
 
     return 0;
 }
 
-#if 0
-static int encode_init(AVCodecContext *avctx){
- 
+#if CONFIG_VCR1_ENCODER
+static av_cold int encode_init(AVCodecContext *avctx){
+
     common_init(avctx);
-    
+
     return 0;
 }
 #endif
@@ -170,10 +177,10 @@ AVCodec vcr1_decoder = {
     NULL,
     decode_frame,
     CODEC_CAP_DR1,
+    .long_name = NULL_IF_CONFIG_SMALL("ATI VCR1"),
 };
-#if 0
-#ifdef CONFIG_ENCODERS
 
+#if CONFIG_VCR1_ENCODER
 AVCodec vcr1_encoder = {
     "vcr1",
     CODEC_TYPE_VIDEO,
@@ -182,7 +189,6 @@ AVCodec vcr1_encoder = {
     encode_init,
     encode_frame,
     //encode_end,
+    .long_name = NULL_IF_CONFIG_SMALL("ATI VCR1"),
 };
-
-#endif //CONFIG_ENCODERS
 #endif