[FFmpeg-devel] [PATCH 2/2] vble: use add_hfyu_median_prediction()
Michael Niedermayer
michaelni at gmx.at
Mon Nov 14 03:24:08 CET 2011
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
---
libavcodec/vble.c | 30 +++++++++++-------------------
1 files changed, 11 insertions(+), 19 deletions(-)
diff --git a/libavcodec/vble.c b/libavcodec/vble.c
index 70d8942..fe212fc 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; ///< This array first holds the lengths of vlc symbols and then their value.
@@ -91,30 +93,19 @@ 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;
-
- for (i = 0; i < height; i++) {
- for (j = 0; j < width; j++) {
- dst[j] = val[j];
-
- /* Top line and left column are not predicted */
- if (!j)
- continue;
+ int i;
- if (!i) {
- dst[j] += dst[j - 1];
- continue;
- }
+ dst[0] = val[0];
+ for (i = 1; i < width; i++)
+ dst[i] = dst[i - 1] + val[i];
- a = dst[j - 1];
- b = dst[j - stride];
- c = a + b - dst[j - 1 - stride];
- dst[j] += mid_pred(a, b, c);
- }
+ for (i = 1; i < height; i++) {
+ int left = 0;
+ int left_top = dst[0];
dst += stride;
val += width;
+ ctx->dsp.add_hfyu_median_prediction(dst, dst-stride, val, width, &left, &left_top);
}
}
@@ -199,6 +190,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;
--
1.7.4.1
More information about the ffmpeg-devel
mailing list