RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-26 01:02:33 +00:00
Code Issues Projects Releases Wiki Activity

Move sub_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 13c33c8e1f
commit d9779d648e
3 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavcodec/huffyuvenc.c
View File

@ -156,25 +156,7 @@ static void sub_median_prediction(HYuvContext *s, uint8_t *dst, const uint8_t *s
if (s->bps <= 8) {
s->dsp.sub_hfyu_median_prediction(dst, src1, src2, w , left, left_top);
} else {
int i;
uint16_t l, lt;
const uint16_t *src116 = (const uint16_t *)src1;
const uint16_t *src216 = (const uint16_t *)src2;
uint16_t *dst16 = ( uint16_t *)dst;
unsigned mask = s->n - 1;
l = *left;
lt = *left_top;
for(i=0; i<w; i++){
const int pred = mid_pred(l, src116[i], (l + src116[i] - lt) & mask);
lt = src116[i];
l = src216[i];
dst16[i] = (l - pred) & mask;
}
*left = l;
*left_top = lt;
s->llviddsp.sub_hfyu_median_prediction_int16((uint16_t *)dst, (const uint16_t *)src1, (const uint16_t *)src2, s->n - 1, w , left, left_top);
}
}

19
libavcodec/lossless_videodsp.c
View File

@ -77,6 +77,24 @@ static void add_hfyu_median_prediction_int16_c(uint16_t *dst, const uint16_t *sr
*left_top = lt;
}
static void sub_hfyu_median_prediction_int16_c(uint16_t *dst, const uint16_t *src1, const uint16_t *src2, 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++){
const int pred = mid_pred(l, src1[i], (l + src1[i] - lt) & mask);
lt = src1[i];
l = src2[i];
dst[i] = (l - pred) & mask;
}
*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){
int i;
@ -103,6 +121,7 @@ void ff_llviddsp_init(LLVidDSPContext *c)
c->diff_int16= diff_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;
c->sub_hfyu_median_prediction_int16 = sub_hfyu_median_prediction_int16_c;
if (ARCH_X86)
ff_llviddsp_init_x86(c);

1
libavcodec/lossless_videodsp.h
View File

@ -29,6 +29,7 @@ typedef struct LLVidDSPContext {
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 (*sub_hfyu_median_prediction_int16)(uint16_t *dst, const uint16_t *src1, const uint16_t *src2, unsigned mask, int w, int *left, int *left_top);
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);
} LLVidDSPContext;