lavc: move SANE_NB_CHANNELS to internal.h and use it in the PCM decoders

[ffmpeg] / libavcodec / vble.c

diff --git a/libavcodec/vble.c b/libavcodec/vble.c
index b510b6c313a9ea90a1aa731bddc758c2fbb3ac9e..d112e273b44426e0f380025bef8cdd59b0d75ad2 100644 (file)
--- a/libavcodec/vble.c
+++ b/libavcodec/vble.c
@@ -24,13 +24,16 @@
  * VBLE Decoder
  */
 
-#define ALT_BITSTREAM_READER_LE
+#define BITSTREAM_READER_LE
 
 #include "avcodec.h"
+#include "dsputil.h"
 #include "get_bits.h"
+#include "mathops.h"
 
 typedef struct {
     AVCodecContext *avctx;
+    DSPContext dsp;
 
     int            size;
     uint8_t        *val; /* First holds the lengths of vlc symbols and then their values */
@@ -42,7 +45,7 @@ static uint8_t vble_read_reverse_unary(GetBitContext *gb)
     uint8_t val = show_bits(gb, 8);
 
     if (val) {
-        val = 7 - av_log2_16bit(av_reverse[val]);
+        val = 7 - av_log2_16bit(ff_reverse[val]);
         skip_bits(gb, val + 1);
         return val;
     } else {
@@ -86,27 +89,22 @@ static void vble_restore_plane(VBLEContext *ctx, int plane, int offset,
     AVFrame *pic = ctx->avctx->coded_frame;
     uint8_t *dst = pic->data[plane];
     uint8_t *val = ctx->val + offset;
-    uint8_t a, b, c;
     int stride = pic->linesize[plane];
-    int i, j;
+    int i, j, left, left_top;
 
     for (i = 0; i < height; i++) {
-        for (j = 0; j < width; j++) {
-            dst[j] = (val[j] >> 1) ^ -(val[j] & 1);
-
-            /* Top line and left column are not predicted */
-            if (!j)
-                continue;
-
-            if (!i) {
-                dst[j] += dst[j - 1];
-                continue;
-            }
-
-            a = dst[j - 1];
-            b = dst[j - stride];
-            c = a + b - dst[j - 1 - stride];
-            dst[j] += mid_pred(a, b, c);
+        for (j = 0; j < width; j++)
+            val[j] = (val[j] >> 1) ^ -(val[j] & 1);
+
+        if (i) {
+            left = 0;
+            left_top = dst[-stride];
+            ctx->dsp.add_hfyu_median_prediction(dst, dst-stride, val,
+                                                width, &left, &left_top);
+        } else {
+            dst[0] = val[0];
+            for (j = 1; j < width; j++)
+                dst[j] = val[j] + dst[j - 1];
         }
         dst += stride;
         val += width;
@@ -138,7 +136,7 @@ static int vble_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
 
     /* Set flags */
     pic->key_frame = 1;
-    pic->pict_type = FF_I_TYPE;
+    pic->pict_type = AV_PICTURE_TYPE_I;
 
     /* Version should always be 1 */
     version = AV_RL32(src);
@@ -194,8 +192,9 @@ static av_cold int vble_decode_init(AVCodecContext *avctx)
 
     /* Stash for later use */
     ctx->avctx = avctx;
+    ff_dsputil_init(&ctx->dsp, avctx);
 
-    avctx->pix_fmt = PIX_FMT_YUV420P;
+    avctx->pix_fmt = AV_PIX_FMT_YUV420P;
     avctx->bits_per_raw_sample = 8;
     avctx->coded_frame = avcodec_alloc_frame();
 
@@ -221,7 +220,7 @@ static av_cold int vble_decode_init(AVCodecContext *avctx)
 AVCodec ff_vble_decoder = {
     .name           = "vble",
     .type           = AVMEDIA_TYPE_VIDEO,
-    .id             = CODEC_ID_VBLE,
+    .id             = AV_CODEC_ID_VBLE,
     .priv_data_size = sizeof(VBLEContext),
     .init           = vble_decode_init,
     .close          = vble_decode_close,