virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

Move add_hfyu_median_prediction_int16() to losslessviddsp

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-01-20 22:21:24 +01:00
parent 883570e6b7
commit 13c33c8e1f
3 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavcodec/huffyuvdec.c
View File

@ -698,25 +698,7 @@ static void add_median_prediction(HYuvContext *s, uint8_t *dst, const uint8_t *s
if (s->bps <= 8) { if (s->bps <= 8) {
s->dsp.add_hfyu_median_prediction(dst, src, diff, w, left, left_top); s->dsp.add_hfyu_median_prediction(dst, src, diff, w, left, left_top);
} else { } else {
//FIXME optimize s->llviddsp.add_hfyu_median_prediction_int16((uint16_t *)dst, (const uint16_t *)src, (const uint16_t *)diff, s->n-1, w, left, left_top);
unsigned mask = s->n-1;
int i;
uint16_t l, lt;
const uint16_t *src16 = (const uint16_t *)src;
const uint16_t *diff16 = (const uint16_t *)diff;
uint16_t *dst16 = ( uint16_t *)dst;
l = *left;
lt = *left_top;
for(i=0; i<w; i++){
l = (mid_pred(l, src16[i], (l + src16[i] - lt) & mask) + diff16[i]) & mask;
lt = src16[i];
dst16[i] = l;
}
*left = l;
*left_top = lt;
} }
} }
static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,

19
libavcodec/lossless_videodsp.c
View File

@ -19,6 +19,7 @@
*/ */
#include "avcodec.h" #include "avcodec.h"
#include "lossless_videodsp.h" #include "lossless_videodsp.h"
#include "libavcodec/mathops.h"
static void add_int16_c(uint16_t *dst, const uint16_t *src, unsigned mask, int w){ static void add_int16_c(uint16_t *dst, const uint16_t *src, unsigned mask, int w){
long i; long i;
@ -59,6 +60,23 @@ static void diff_int16_c(uint16_t *dst, const uint16_t *src1, const uint16_t *sr
dst[i] = (src1[i] - src2[i]) & mask; dst[i] = (src1[i] - src2[i]) & mask;
} }
static void add_hfyu_median_prediction_int16_c(uint16_t *dst, const uint16_t *src, const uint16_t *diff, unsigned mask, int w, int *left, int *left_top){
int i;
uint16_t l, lt;
l = *left;
lt = *left_top;
for(i=0; i<w; i++){
l = (mid_pred(l, src[i], (l + src[i] - lt) & mask) + diff[i]) & mask;
lt = src[i];
dst[i] = l;
}
*left = l;
*left_top = lt;
}
static int add_hfyu_left_prediction_int16_c(uint16_t *dst, const uint16_t *src, unsigned mask, int w, int acc){ static int add_hfyu_left_prediction_int16_c(uint16_t *dst, const uint16_t *src, unsigned mask, int w, int acc){
int i; int i;
@ -84,6 +102,7 @@ void ff_llviddsp_init(LLVidDSPContext *c)
c->add_int16 = add_int16_c; c->add_int16 = add_int16_c;
c->diff_int16= diff_int16_c; c->diff_int16= diff_int16_c;
c->add_hfyu_left_prediction_int16 = add_hfyu_left_prediction_int16_c; c->add_hfyu_left_prediction_int16 = add_hfyu_left_prediction_int16_c;
c->add_hfyu_median_prediction_int16 = add_hfyu_median_prediction_int16_c;
if (ARCH_X86) if (ARCH_X86)
ff_llviddsp_init_x86(c); ff_llviddsp_init_x86(c);

2
libavcodec/lossless_videodsp.h
View File

@ -28,6 +28,8 @@
typedef struct LLVidDSPContext { typedef struct LLVidDSPContext {
void (*add_int16)(uint16_t *dst/*align 16*/, const uint16_t *src/*align 16*/, unsigned mask, int w); void (*add_int16)(uint16_t *dst/*align 16*/, const uint16_t *src/*align 16*/, unsigned mask, int w);
void (*diff_int16)(uint16_t *dst/*align 16*/, const uint16_t *src1/*align 16*/, const uint16_t *src2/*align 1*/, unsigned mask, int w); void (*diff_int16)(uint16_t *dst/*align 16*/, const uint16_t *src1/*align 16*/, const uint16_t *src2/*align 1*/, unsigned mask, int w);
void (*add_hfyu_median_prediction_int16)(uint16_t *dst, const uint16_t *top, const uint16_t *diff, unsigned mask, int w, int *left, int *left_top);
int (*add_hfyu_left_prediction_int16)(uint16_t *dst, const uint16_t *src, unsigned mask, int w, int left); int (*add_hfyu_left_prediction_int16)(uint16_t *dst, const uint16_t *src, unsigned mask, int w, int left);
} LLVidDSPContext; } LLVidDSPContext;