diff options
Diffstat (limited to 'libavcodec/lossless_videodsp.c')
| -rw-r--r-- | libavcodec/lossless_videodsp.c | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/libavcodec/lossless_videodsp.c b/libavcodec/lossless_videodsp.c index 5440ce2..b93d4e7 100644 --- a/libavcodec/lossless_videodsp.c +++ b/libavcodec/lossless_videodsp.c @@ -92,32 +92,6 @@ static void add_int16_c(uint16_t *dst, const uint16_t *src, unsigned mask, int w dst[i] = (dst[i] + src[i]) & mask; } -static void diff_int16_c(uint16_t *dst, const uint16_t *src1, const uint16_t *src2, unsigned mask, int w){ - long i; -#if !HAVE_FAST_UNALIGNED - if((long)src2 & (sizeof(long)-1)){ - for(i=0; i+3<w; i+=4){ - dst[i+0] = (src1[i+0]-src2[i+0]) & mask; - dst[i+1] = (src1[i+1]-src2[i+1]) & mask; - dst[i+2] = (src1[i+2]-src2[i+2]) & mask; - dst[i+3] = (src1[i+3]-src2[i+3]) & mask; - } - }else -#endif - { - unsigned long pw_lsb = (mask >> 1) * 0x0001000100010001ULL; - unsigned long pw_msb = pw_lsb + 0x0001000100010001ULL; - - for (i = 0; i <= w - (int)sizeof(long)/2; i += sizeof(long)/2) { - long a = *(long*)(src1+i); - long b = *(long*)(src2+i); - *(long*)(dst+i) = ((a|pw_msb) - (b&pw_lsb)) ^ ((a^b^pw_msb)&pw_msb); - } - } - for (; i<w; i++) - dst[i] = (src1[i] - src2[i]) & mask; -} - static void add_hfyu_median_pred_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; @@ -135,24 +109,6 @@ static void add_hfyu_median_pred_int16_c(uint16_t *dst, const uint16_t *src, con *left_top = lt; } -static void sub_hfyu_median_pred_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_pred_int16_c(uint16_t *dst, const uint16_t *src, unsigned mask, int w, unsigned acc){ int i; @@ -180,10 +136,8 @@ void ff_llviddsp_init(LLVidDSPContext *c, AVCodecContext *avctx) c->add_left_pred = add_left_pred_c; c->add_int16 = add_int16_c; - c->diff_int16= diff_int16_c; c->add_hfyu_left_pred_int16 = add_hfyu_left_pred_int16_c; c->add_hfyu_median_pred_int16 = add_hfyu_median_pred_int16_c; - c->sub_hfyu_median_pred_int16 = sub_hfyu_median_pred_int16_c; if (ARCH_X86) ff_llviddsp_init_x86(c, avctx); |
