From 7b4c46050e6824febb8f16d28d5148741aa8ad1a Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 29 May 2014 19:49:29 +0200 Subject: [PATCH] rename add_hfyu_left_prediction_int16 to add_hfyu_left_pred_int16 This makes the naming more consistent with the 8bit variant Signed-off-by: Michael Niedermayer --- libavcodec/huffyuvdec.c | 2 +- libavcodec/lossless_videodsp.c | 4 ++-- libavcodec/lossless_videodsp.h | 2 +- libavcodec/x86/lossless_videodsp.asm | 6 +++--- libavcodec/x86/lossless_videodsp_init.c | 8 ++++---- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/libavcodec/huffyuvdec.c b/libavcodec/huffyuvdec.c index b49c10b4dc..531398923f 100644 --- a/libavcodec/huffyuvdec.c +++ b/libavcodec/huffyuvdec.c @@ -750,7 +750,7 @@ static int left_prediction(HYuvContext *s, uint8_t *dst, const uint8_t *src, int if (s->bps <= 8) { return s->hdsp.add_hfyu_left_pred(dst, src, w, acc); } else { - return s->llviddsp.add_hfyu_left_prediction_int16(( uint16_t *)dst, (const uint16_t *)src, s->n-1, w, acc); + return s->llviddsp.add_hfyu_left_pred_int16(( uint16_t *)dst, (const uint16_t *)src, s->n-1, w, acc); } } diff --git a/libavcodec/lossless_videodsp.c b/libavcodec/lossless_videodsp.c index 0e2ff78eaa..3491621dc4 100644 --- a/libavcodec/lossless_videodsp.c +++ b/libavcodec/lossless_videodsp.c @@ -95,7 +95,7 @@ static void sub_hfyu_median_pred_int16_c(uint16_t *dst, const uint16_t *src1, co *left_top = lt; } -static int add_hfyu_left_prediction_int16_c(uint16_t *dst, const uint16_t *src, unsigned mask, int w, unsigned acc){ +static int add_hfyu_left_pred_int16_c(uint16_t *dst, const uint16_t *src, unsigned mask, int w, unsigned acc){ int i; for(i=0; iadd_int16 = add_int16_c; c->diff_int16= diff_int16_c; - c->add_hfyu_left_prediction_int16 = add_hfyu_left_prediction_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; diff --git a/libavcodec/lossless_videodsp.h b/libavcodec/lossless_videodsp.h index 0ce3d70d2c..040902e7ba 100644 --- a/libavcodec/lossless_videodsp.h +++ b/libavcodec/lossless_videodsp.h @@ -31,7 +31,7 @@ typedef struct LLVidDSPContext { void (*sub_hfyu_median_pred_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_pred_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, unsigned left); + int (*add_hfyu_left_pred_int16)(uint16_t *dst, const uint16_t *src, unsigned mask, int w, unsigned left); } LLVidDSPContext; void ff_llviddsp_init(LLVidDSPContext *llviddsp, AVCodecContext *avctx); diff --git a/libavcodec/x86/lossless_videodsp.asm b/libavcodec/x86/lossless_videodsp.asm index a75b799e90..c8222136f6 100644 --- a/libavcodec/x86/lossless_videodsp.asm +++ b/libavcodec/x86/lossless_videodsp.asm @@ -156,9 +156,9 @@ cglobal diff_int16, 5,5,5, dst, src1, src2, mask, w RET %endmacro -; int add_hfyu_left_prediction_int16(uint16_t *dst, const uint16_t *src, unsigned mask, int w, int left) +; int add_hfyu_left_pred_int16(uint16_t *dst, const uint16_t *src, unsigned mask, int w, int left) INIT_MMX ssse3 -cglobal add_hfyu_left_prediction_int16, 4,4,8, dst, src, mask, w, left +cglobal add_hfyu_left_pred_int16, 4,4,8, dst, src, mask, w, left .skip_prologue: mova m5, [pb_67] mova m3, [pb_zzzz2323zzzzabab] @@ -169,7 +169,7 @@ cglobal add_hfyu_left_prediction_int16, 4,4,8, dst, src, mask, w, left ADD_HFYU_LEFT_LOOP_INT16 a, a INIT_XMM sse4 -cglobal add_hfyu_left_prediction_int16, 4,4,8, dst, src, mask, w, left +cglobal add_hfyu_left_pred_int16, 4,4,8, dst, src, mask, w, left mova m5, [pb_ef] mova m4, [pb_zzzzzzzz67676767] mova m3, [pb_zzzz2323zzzzabab] diff --git a/libavcodec/x86/lossless_videodsp_init.c b/libavcodec/x86/lossless_videodsp_init.c index ef65e7bf0a..6589024a1a 100644 --- a/libavcodec/x86/lossless_videodsp_init.c +++ b/libavcodec/x86/lossless_videodsp_init.c @@ -26,8 +26,8 @@ void ff_add_int16_mmx(uint16_t *dst, const uint16_t *src, unsigned mask, int w); void ff_add_int16_sse2(uint16_t *dst, const uint16_t *src, unsigned mask, int w); void ff_diff_int16_mmx (uint16_t *dst, const uint16_t *src1, const uint16_t *src2, unsigned mask, int w); void ff_diff_int16_sse2(uint16_t *dst, const uint16_t *src1, const uint16_t *src2, unsigned mask, int w); -int ff_add_hfyu_left_prediction_int16_ssse3(uint16_t *dst, const uint16_t *src, unsigned mask, int w, unsigned acc); -int ff_add_hfyu_left_prediction_int16_sse4(uint16_t *dst, const uint16_t *src, unsigned mask, int w, unsigned acc); +int ff_add_hfyu_left_pred_int16_ssse3(uint16_t *dst, const uint16_t *src, unsigned mask, int w, unsigned acc); +int ff_add_hfyu_left_pred_int16_sse4(uint16_t *dst, const uint16_t *src, unsigned mask, int w, unsigned acc); void ff_add_hfyu_median_pred_int16_mmxext(uint16_t *dst, const uint16_t *top, const uint16_t *diff, unsigned mask, int w, int *left, int *left_top); void ff_sub_hfyu_median_pred_int16_mmxext(uint16_t *dst, const uint16_t *src1, const uint16_t *src2, unsigned mask, int w, int *left, int *left_top); @@ -53,10 +53,10 @@ void ff_llviddsp_init_x86(LLVidDSPContext *c, AVCodecContext *avctx) } if (EXTERNAL_SSSE3(cpu_flags)) { - c->add_hfyu_left_prediction_int16 = ff_add_hfyu_left_prediction_int16_ssse3; + c->add_hfyu_left_pred_int16 = ff_add_hfyu_left_pred_int16_ssse3; } if (EXTERNAL_SSE4(cpu_flags)) { - c->add_hfyu_left_prediction_int16 = ff_add_hfyu_left_prediction_int16_sse4; + c->add_hfyu_left_pred_int16 = ff_add_hfyu_left_pred_int16_sse4; } }