frsh: Export information about the last RTP contract and VRES

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

diff --git a/libavcodec/loco.c b/libavcodec/loco.c
index 6f90c1ef146082fc06eaa5ca9f235b1c4f3a3052..4fd64f4bdafd480ef8fac910c0da88718f6d013e 100644 (file)
--- a/libavcodec/loco.c
+++ b/libavcodec/loco.c
@@ -2,31 +2,32 @@
  * LOCO codec
  * Copyright (c) 2005 Konstantin Shishkov
  *
- * 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 loco.c
+ * @file libavcodec/loco.c
  * LOCO codec.
  */
- 
+
 #include "avcodec.h"
-#include "common.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "golomb.h"
+#include "mathops.h"
 
 enum LOCO_MODE {LOCO_UNKN=0, LOCO_CYUY2=-1, LOCO_CRGB=-2, LOCO_CRGBA=-3, LOCO_CYV12=-4,
  LOCO_YUY2=1, LOCO_UYVY=2, LOCO_RGB=3, LOCO_RGBA=4, LOCO_YV12=5};
@@ -49,12 +50,12 @@ static int loco_get_rice_param(RICEContext *r)
 {
     int cnt = 0;
     int val = r->count;
-    
+
     while(r->sum > val && cnt < 9) {
         val <<= 1;
         cnt++;
     }
-    
+
     return cnt;
 }
 
@@ -62,7 +63,7 @@ static inline void loco_update_rice_param(RICEContext *r, int val)
 {
     r->sum += val;
     r->count++;
-    
+
     if(r->count == 16) {
         r->sum >>= 1;
         r->count >>= 1;
@@ -99,7 +100,7 @@ static inline int loco_get_rice(RICEContext *r)
             r->run2 = 0;
         }
     }
-    
+
     return v;
 }
 
@@ -107,30 +108,30 @@ static inline int loco_get_rice(RICEContext *r)
 static inline int loco_predict(uint8_t* data, int stride, int step)
 {
     int a, b, c;
-    
+
     a = data[-stride];
     b = data[-step];
     c = data[-stride - step];
-    
+
     return mid_pred(a, a + b - c, b);
 }
 
 static int loco_decode_plane(LOCOContext *l, uint8_t *data, int width, int height,
-                             int stride, uint8_t *buf, int buf_size, int step)
+                             int stride, const uint8_t *buf, int buf_size, int step)
 {
     RICEContext rc;
     int val;
     int i, j;
-    
+
     init_get_bits(&rc.gb, buf, buf_size*8);
     rc.save = 0;
     rc.run = 0;
     rc.run2 = 0;
-    rc.lossy = l->lossy; 
-    
+    rc.lossy = l->lossy;
+
     rc.sum = 8;
     rc.count = 1;
-    
+
     /* restore top left pixel */
     val = loco_get_rice(&rc);
     data[0] = 128 + val;
@@ -151,14 +152,16 @@ static int loco_decode_plane(LOCOContext *l, uint8_t *data, int width, int heigh
         }
         data += stride;
     }
-    
-    return ((get_bits_count(&rc.gb) + 7) >> 3);
+
+    return (get_bits_count(&rc.gb) + 7) >> 3;
 }
 
-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;
     LOCOContext * const l = avctx->priv_data;
     AVFrame * const p= (AVFrame*)&l->pic;
     int decoded;
@@ -221,11 +224,11 @@ static int decode_frame(AVCodecContext *avctx,
 
     *data_size = sizeof(AVFrame);
     *(AVFrame*)data = l->pic;
-    
+
     return buf_size;
 }
 
-static int decode_init(AVCodecContext *avctx){
+static av_cold int decode_init(AVCodecContext *avctx){
     LOCOContext * const l = avctx->priv_data;
     int version;
 
@@ -235,20 +238,20 @@ static int decode_init(AVCodecContext *avctx){
                avctx->extradata_size);
         return -1;
     }
-    version = LE_32(avctx->extradata);
+    version = AV_RL32(avctx->extradata);
     switch(version) {
     case 1:
         l->lossy = 0;
         break;
     case 2:
-        l->lossy = LE_32(avctx->extradata + 8);
+        l->lossy = AV_RL32(avctx->extradata + 8);
         break;
     default:
-        l->lossy = LE_32(avctx->extradata + 8);
+        l->lossy = AV_RL32(avctx->extradata + 8);
         av_log(avctx, AV_LOG_INFO, "This is LOCO codec version %i, please upload file for study\n", version);
     }
-    
-    l->mode = LE_32(avctx->extradata + 4);
+
+    l->mode = AV_RL32(avctx->extradata + 4);
     switch(l->mode) {
     case LOCO_CYUY2: case LOCO_YUY2: case LOCO_UYVY:
         avctx->pix_fmt = PIX_FMT_YUV422P;
@@ -260,7 +263,7 @@ static int decode_init(AVCodecContext *avctx){
         avctx->pix_fmt = PIX_FMT_YUV420P;
         break;
     case LOCO_CRGBA: case LOCO_RGBA:
-        avctx->pix_fmt = PIX_FMT_RGBA32;
+        avctx->pix_fmt = PIX_FMT_RGB32;
         break;
     default:
         av_log(avctx, AV_LOG_INFO, "Unknown colorspace, index = %i\n", l->mode);
@@ -282,4 +285,5 @@ AVCodec loco_decoder = {
     NULL,
     decode_frame,
     CODEC_CAP_DR1,
+    .long_name = NULL_IF_CONFIG_SMALL("LOCO"),
 };