RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

vble: use dsp.add_hfyu_median_prediction() this allows asm optimizations to be used. 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
This commit is contained in:
Michael Niedermayer 2011-11-30 17:28:51 -05:00 committed by Ronald S. Bultje
parent 317ea97bff
commit adfdcf87b1
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
libavcodec/vble.c
View File

@ -27,10 +27,12 @@
#define ALT_BITSTREAM_READER_LE #define ALT_BITSTREAM_READER_LE
#include "avcodec.h" #include "avcodec.h"
#include "dsputil.h"
#include "get_bits.h" #include "get_bits.h"
typedef struct { typedef struct {
AVCodecContext *avctx; AVCodecContext *avctx;
DSPContext dsp;
int size; int size;
uint8_t *val; /* First holds the lengths of vlc symbols and then their values */ 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; AVFrame *pic = ctx->avctx->coded_frame;
uint8_t *dst = pic->data[plane]; uint8_t *dst = pic->data[plane];
uint8_t *val = ctx->val + offset; uint8_t *val = ctx->val + offset;
uint8_t a, b, c;
int stride = pic->linesize[plane]; int stride = pic->linesize[plane];
int i, j; int i, j, left, left_top;
for (i = 0; i < height; i++) { for (i = 0; i < height; i++) {
for (j = 0; j < width; j++) { for (j = 0; j < width; j++)
dst[j] = (val[j] >> 1) ^ -(val[j] & 1); val[j] = (val[j] >> 1) ^ -(val[j] & 1);
/* Top line and left column are not predicted */ if (i) {
if (!j) left = 0;
continue; left_top = dst[-stride];
ctx->dsp.add_hfyu_median_prediction(dst, dst-stride, val,
if (!i) { width, &left, &left_top);
dst[j] += dst[j - 1]; } else {
continue; dst[0] = val[0];
} for (j = 1; j < width; j++)
dst[j] = val[j] + dst[j - 1];
a = dst[j - 1];
b = dst[j - stride];
c = a + b - dst[j - 1 - stride];
dst[j] += mid_pred(a, b, c);
} }
dst += stride; dst += stride;
val += width; val += width;
@ -194,6 +191,7 @@ static av_cold int vble_decode_init(AVCodecContext *avctx)
/* Stash for later use */ /* Stash for later use */
ctx->avctx = avctx; ctx->avctx = avctx;
dsputil_init(&ctx->dsp, avctx);
avctx->pix_fmt = PIX_FMT_YUV420P; avctx->pix_fmt = PIX_FMT_YUV420P;
avctx->bits_per_raw_sample = 8; avctx->bits_per_raw_sample = 8;