# HG changeset patch # User lorenm # Date 1255898845 0 # Node ID 546b7ebeaf07dc495077618c3b32c49d799b6889 # Parent 12c8175d6db5f5031a16c69a7328e5af5177b22c huffyuv: add some const qualifiers diff -r 12c8175d6db5 -r 546b7ebeaf07 dsputil.c --- a/dsputil.c Sun Oct 18 20:10:10 2009 +0000 +++ b/dsputil.c Sun Oct 18 20:47:25 2009 +0000 @@ -3573,7 +3573,7 @@ dst[i+0] = src1[i+0]-src2[i+0]; } -static void add_hfyu_median_prediction_c(uint8_t *dst, const uint8_t *src1, uint8_t *diff, int w, int *left, int *left_top){ +static void add_hfyu_median_prediction_c(uint8_t *dst, const uint8_t *src1, const uint8_t *diff, int w, int *left, int *left_top){ int i; uint8_t l, lt; @@ -3590,7 +3590,7 @@ *left_top= lt; } -static void sub_hfyu_median_prediction_c(uint8_t *dst, const uint8_t *src1, uint8_t *src2, int w, int *left, int *left_top){ +static void sub_hfyu_median_prediction_c(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, int w, int *left, int *left_top){ int i; uint8_t l, lt; diff -r 12c8175d6db5 -r 546b7ebeaf07 dsputil.h --- a/dsputil.h Sun Oct 18 20:10:10 2009 +0000 +++ b/dsputil.h Sun Oct 18 20:47:25 2009 +0000 @@ -347,8 +347,8 @@ * subtract huffyuv's variant of median prediction * note, this might read from src1[-1], src2[-1] */ - void (*sub_hfyu_median_prediction)(uint8_t *dst, const uint8_t *src1, uint8_t *src2, int w, int *left, int *left_top); - void (*add_hfyu_median_prediction)(uint8_t *dst, const uint8_t *top, uint8_t *diff, int w, int *left, int *left_top); + void (*sub_hfyu_median_prediction)(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, int w, int *left, int *left_top); + void (*add_hfyu_median_prediction)(uint8_t *dst, const uint8_t *top, const uint8_t *diff, int w, int *left, int *left_top); int (*add_hfyu_left_prediction)(uint8_t *dst, const uint8_t *src, int w, int left); void (*add_hfyu_left_prediction_bgr32)(uint8_t *dst, const uint8_t *src, int w, int *red, int *green, int *blue); /* this might write to dst[w] */ diff -r 12c8175d6db5 -r 546b7ebeaf07 x86/dsputil_mmx.c --- a/x86/dsputil_mmx.c Sun Oct 18 20:10:10 2009 +0000 +++ b/x86/dsputil_mmx.c Sun Oct 18 20:47:25 2009 +0000 @@ -597,7 +597,7 @@ } #if HAVE_7REGS && HAVE_TEN_OPERANDS -static void add_hfyu_median_prediction_cmov(uint8_t *dst, uint8_t *top, uint8_t *diff, int w, int *left, int *left_top) { +static void add_hfyu_median_prediction_cmov(uint8_t *dst, const uint8_t *top, const uint8_t *diff, int w, int *left, int *left_top) { x86_reg w2 = -w; x86_reg x; int l = *left & 0xff; @@ -2384,9 +2384,9 @@ void ff_float_to_int16_interleave6_sse(int16_t *dst, const float **src, int len); void ff_float_to_int16_interleave6_3dnow(int16_t *dst, const float **src, int len); void ff_float_to_int16_interleave6_3dn2(int16_t *dst, const float **src, int len); -void ff_add_hfyu_median_prediction_mmx2(uint8_t *dst, uint8_t *top, uint8_t *diff, int w, int *left, int *left_top); -int ff_add_hfyu_left_prediction_ssse3(uint8_t *dst, uint8_t *src, int w, int left); -int ff_add_hfyu_left_prediction_sse4(uint8_t *dst, uint8_t *src, int w, int left); +void ff_add_hfyu_median_prediction_mmx2(uint8_t *dst, const uint8_t *top, const uint8_t *diff, int w, int *left, int *left_top); +int ff_add_hfyu_left_prediction_ssse3(uint8_t *dst, const uint8_t *src, int w, int left); +int ff_add_hfyu_left_prediction_sse4(uint8_t *dst, const uint8_t *src, int w, int left); void ff_x264_deblock_v_luma_sse2(uint8_t *pix, int stride, int alpha, int beta, int8_t *tc0); void ff_x264_deblock_h_luma_sse2(uint8_t *pix, int stride, int alpha, int beta, int8_t *tc0); void ff_x264_deblock_v8_luma_intra_mmxext(uint8_t *pix, int stride, int alpha, int beta); diff -r 12c8175d6db5 -r 546b7ebeaf07 x86/dsputil_yasm.asm --- a/x86/dsputil_yasm.asm Sun Oct 18 20:10:10 2009 +0000 +++ b/x86/dsputil_yasm.asm Sun Oct 18 20:47:25 2009 +0000 @@ -99,7 +99,7 @@ -; void ff_add_hfyu_median_prediction_mmx2(uint8_t *dst, uint8_t *top, uint8_t *diff, int w, int *left, int *left_top) +; void ff_add_hfyu_median_prediction_mmx2(uint8_t *dst, const uint8_t *top, const uint8_t *diff, int w, int *left, int *left_top) cglobal add_hfyu_median_prediction_mmx2, 6,6,0, dst, top, diff, w, left, left_top movq mm0, [topq] movq mm2, mm0 @@ -197,7 +197,7 @@ RET %endmacro -; int ff_add_hfyu_left_prediction(uint8_t *dst, uint8_t *src, int w, int left) +; int ff_add_hfyu_left_prediction(uint8_t *dst, const uint8_t *src, int w, int left) INIT_MMX cglobal add_hfyu_left_prediction_ssse3, 3,3,7, dst, src, w, left .skip_prologue: diff -r 12c8175d6db5 -r 546b7ebeaf07 x86/dsputilenc_mmx.c --- a/x86/dsputilenc_mmx.c Sun Oct 18 20:10:10 2009 +0000 +++ b/x86/dsputilenc_mmx.c Sun Oct 18 20:47:25 2009 +0000 @@ -902,7 +902,7 @@ dst[i+0] = src1[i+0]-src2[i+0]; } -static void sub_hfyu_median_prediction_mmx2(uint8_t *dst, uint8_t *src1, uint8_t *src2, int w, int *left, int *left_top){ +static void sub_hfyu_median_prediction_mmx2(uint8_t *dst, const uint8_t *src1, const uint8_t *src2, int w, int *left, int *left_top){ x86_reg i=0; uint8_t l, lt;