virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

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

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2011-11-14 17:24:59 +01:00
parent 75c0ddc9c2
commit ecf5e70548
1 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
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; ///< This array first holds the lengths of vlc symbols and then their value. uint8_t *val; ///< This array first holds the lengths of vlc symbols and then their value.
@@ -82,9 +84,8 @@ static void vble_restore_plane(VBLEContext *ctx, GetBitContext *gb, int plane,
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++) {
@@ -93,21 +94,15 @@ static void vble_restore_plane(VBLEContext *ctx, GetBitContext *gb, int plane,
int v = (1 << val[j]) + get_bits(gb, val[j]) - 1; int v = (1 << val[j]) + get_bits(gb, val[j]) - 1;
val[j] = (v >> 1) ^ -(v & 1); val[j] = (v >> 1) ^ -(v & 1);
} }
dst[j] = val[j]; }
if (i) {
/* Top line and left column are not predicted */ left = 0;
if (!j) left_top = dst[-stride];
continue; ctx->dsp.add_hfyu_median_prediction(dst, dst-stride, val, width, &left, &left_top);
} else {
if (!i) { dst[0] = val[0];
dst[j] += dst[j - 1]; for (j = 1; j < width; j++)
continue; 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;
@@ -195,6 +190,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;