diff options
| -rw-r--r-- | libavcodec/vble.c | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/libavcodec/vble.c b/libavcodec/vble.c index b510b6c..a13bcf8 100644 --- a/libavcodec/vble.c +++ b/libavcodec/vble.c @@ -27,10 +27,12 @@ #define ALT_BITSTREAM_READER_LE #include "avcodec.h" +#include "dsputil.h" #include "get_bits.h" typedef struct { AVCodecContext *avctx; + DSPContext dsp; int size; uint8_t *val; /* First holds the lengths of vlc symbols and then their values */ @@ -86,27 +88,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; @@ -194,6 +191,7 @@ static av_cold int vble_decode_init(AVCodecContext *avctx) /* Stash for later use */ ctx->avctx = avctx; + dsputil_init(&ctx->dsp, avctx); avctx->pix_fmt = PIX_FMT_YUV420P; avctx->bits_per_raw_sample = 8; |
