shithub: openh264

Download patch

ref: abb1311fb9384209bd6a2334217b4647fabe12a4
parent: 16ad879dafe9177cce30dd85c348297173584818
author: licaiguo <guolicai@gmail.com>
date: Mon Jan 6 06:22:39 EST 2014

rename decoder's intra-prediction prefix from Wels to WelsDecoder.

--- a/codec/decoder/core/asm/intra_pred.asm
+++ b/codec/decoder/core/asm/intra_pred.asm
@@ -37,9 +37,9 @@
 ;*  History
 ;*      18/09/2009 Created
 ;*		19/11/2010 Added
-;*					WelsI16x16LumaPredDcTop_sse2, WelsI16x16LumaPredDcNA_sse2,
-;*					WelsIChromaPredDcLeft_mmx, WelsIChromaPredDcTop_sse2
-;*					and WelsIChromaPredDcNA_mmx
+;*					WelsDecoderI16x16LumaPredDcTop_sse2, WelsDecoderI16x16LumaPredDcNA_sse2,
+;*					WelsDecoderIChromaPredDcLeft_mmx, WelsDecoderIChromaPredDcTop_sse2
+;*					and WelsDecoderIChromaPredDcNA_mmx
 ;*
 ;*
 ;*************************************************************************/
@@ -177,18 +177,18 @@
 ;*******************************************************************************
 
 SECTION .text
-WELS_EXTERN WelsI4x4LumaPredH_sse2
-WELS_EXTERN WelsI4x4LumaPredDDR_mmx
-WELS_EXTERN WelsI16x16LumaPredPlane_sse2
+WELS_EXTERN WelsDecoderI4x4LumaPredH_sse2
+WELS_EXTERN WelsDecoderI4x4LumaPredDDR_mmx
+WELS_EXTERN WelsDecoderI16x16LumaPredPlane_sse2
 WELS_EXTERN WelsI4x4LumaPredDc_sse2
 
 ALIGN 16
 ;*******************************************************************************
-;   void_t __cdecl WelsI4x4LumaPredH_sse2(uint8_t *pPred, const int32_t kiStride)
+;   void_t __cdecl WelsDecoderI4x4LumaPredH_sse2(uint8_t *pPred, const int32_t kiStride)
 ;
 ;	pPred must align to 16
 ;*******************************************************************************
-WelsI4x4LumaPredH_sse2:
+WelsDecoderI4x4LumaPredH_sse2:
 	%assign push_num 0
 	LOAD_2_PARA
 	%ifndef X86_32
@@ -224,9 +224,9 @@
 	ret
 
 ;*******************************************************************************
-; void_t WelsI16x16LumaPredPlane_sse2(uint8_t *pPred, const int32_t kiStride);
+; void_t WelsDecoderI16x16LumaPredPlane_sse2(uint8_t *pPred, const int32_t kiStride);
 ;*******************************************************************************
-WelsI16x16LumaPredPlane_sse2:
+WelsDecoderI16x16LumaPredPlane_sse2:
 		;%define pushsize	4
 		push r3
 		push r4
@@ -325,7 +325,7 @@
 
 
 ;*******************************************************************************
-; void_t WelsI16x16LumaPredH_sse2(uint8_t *pPred, const int32_t kiStride);
+; void_t WelsDecoderI16x16LumaPredH_sse2(uint8_t *pPred, const int32_t kiStride);
 ;*******************************************************************************
 
 %macro SSE2_PRED_H_16X16_TWO_LINE_DEC 2
@@ -337,8 +337,8 @@
     movdqa  [%1+%2],	xmm0
 %endmacro
 
-WELS_EXTERN WelsI16x16LumaPredH_sse2
-WelsI16x16LumaPredH_sse2:
+WELS_EXTERN WelsDecoderI16x16LumaPredH_sse2
+WelsDecoderI16x16LumaPredH_sse2:
 	%assign push_num 0
 	LOAD_2_PARA
 	%ifndef X86_32
@@ -363,10 +363,10 @@
     ret
 
 ;*******************************************************************************
-; void_t WelsI16x16LumaPredV_sse2(uint8_t *pPred, const int32_t kiStride);
+; void_t WelsDecoderI16x16LumaPredV_sse2(uint8_t *pPred, const int32_t kiStride);
 ;*******************************************************************************
-WELS_EXTERN WelsI16x16LumaPredV_sse2
-WelsI16x16LumaPredV_sse2:
+WELS_EXTERN WelsDecoderI16x16LumaPredV_sse2
+WelsDecoderI16x16LumaPredV_sse2:
 	%assign push_num 0
 	LOAD_2_PARA
 	%ifndef X86_32
@@ -406,10 +406,10 @@
     ret
 
 ;*******************************************************************************
-; void_t WelsIChromaPredPlane_sse2(uint8_t *pPred, const int32_t kiStride);
+; void_t WelsDecoderIChromaPredPlane_sse2(uint8_t *pPred, const int32_t kiStride);
 ;*******************************************************************************
-WELS_EXTERN WelsIChromaPredPlane_sse2
-WelsIChromaPredPlane_sse2:
+WELS_EXTERN WelsDecoderIChromaPredPlane_sse2
+WelsDecoderIChromaPredPlane_sse2:
 		;%define pushsize	4
 		push r3
 		push r4
@@ -515,10 +515,10 @@
 ;	7 is the start pixel of current 4x4 block
 ;	pPred[7] = ([6]+[0]*2+[1]+2)/4
 ;
-;   void_t __cdecl WelsI4x4LumaPredDDR_mmx(uint8_t *pPred, const int32_t kiStride)
+;   void_t __cdecl WelsDecoderI4x4LumaPredDDR_mmx(uint8_t *pPred, const int32_t kiStride)
 ;
 ;*******************************************************************************
-WelsI4x4LumaPredDDR_mmx:
+WelsDecoderI4x4LumaPredDDR_mmx:
 	%assign push_num 0
 	LOAD_2_PARA
 	%ifndef X86_32
@@ -632,7 +632,7 @@
 
 ALIGN 16
 ;*******************************************************************************
-;	void_t __cdecl WelsIChromaPredH_mmx(uint8_t *pPred, const int32_t kiStride)
+;	void_t __cdecl WelsDecoderIChromaPredH_mmx(uint8_t *pPred, const int32_t kiStride)
 ;   copy 8 pixel of 8 line from left
 ;*******************************************************************************
 %macro MMX_PRED_H_8X8_ONE_LINE 4
@@ -653,8 +653,8 @@
 	movq		[%4],	%1
 %endmacro
 
-WELS_EXTERN WelsIChromaPredH_mmx
-WelsIChromaPredH_mmx:
+WELS_EXTERN WelsDecoderIChromaPredH_mmx
+WelsDecoderIChromaPredH_mmx:
 	%assign push_num 0
 	LOAD_2_PARA
 	%ifndef X86_32
@@ -698,11 +698,11 @@
 
 ALIGN 16
 ;*******************************************************************************
-;	void_t __cdecl WelsIChromaPredV_mmx(uint8_t *pPred, const int32_t kiStride)
+;	void_t __cdecl WelsDecoderIChromaPredV_mmx(uint8_t *pPred, const int32_t kiStride)
 ;   copy 8 pixels from top 8 pixels
 ;*******************************************************************************
-WELS_EXTERN WelsIChromaPredV_mmx
-WelsIChromaPredV_mmx:
+WELS_EXTERN WelsDecoderIChromaPredV_mmx
+WelsDecoderIChromaPredV_mmx:
 	%assign push_num 0
 	LOAD_2_PARA
 	%ifndef X86_32
@@ -758,10 +758,10 @@
 ;   j = (2 + l3 + (l2<<1) + l1)>>2
 ;   [b a f e h g j i] + [d c b a] --> mov to memory
 ;
-;   void_t WelsI4x4LumaPredHD_mmx(uint8_t *pPred, const int32_t kiStride)
+;   void_t WelsDecoderI4x4LumaPredHD_mmx(uint8_t *pPred, const int32_t kiStride)
 ;*******************************************************************************
-WELS_EXTERN WelsI4x4LumaPredHD_mmx
-WelsI4x4LumaPredHD_mmx:
+WELS_EXTERN WelsDecoderI4x4LumaPredHD_mmx
+WelsDecoderI4x4LumaPredHD_mmx:
 	%assign push_num 0
 	LOAD_2_PARA
 	%ifndef X86_32
@@ -847,10 +847,10 @@
 
 ;   [g g f e d c b a] + [g g g g] --> mov to memory
 ;
-;   void_t WelsI4x4LumaPredHU_mmx(uint8_t *pPred, const int32_t kiStride)
+;   void_t WelsDecoderI4x4LumaPredHU_mmx(uint8_t *pPred, const int32_t kiStride)
 ;*******************************************************************************
-WELS_EXTERN WelsI4x4LumaPredHU_mmx
-WelsI4x4LumaPredHU_mmx:
+WELS_EXTERN WelsDecoderI4x4LumaPredHU_mmx
+WelsDecoderI4x4LumaPredHU_mmx:
 	%assign push_num 0
 	LOAD_2_PARA
 	%ifndef X86_32
@@ -939,10 +939,10 @@
 ;   i = (2 + lt + (l0<<1) + l1)>>2
 ;   j = (2 + l0 + (l1<<1) + l2)>>2
 ;
-;   void_t WelsI4x4LumaPredVR_mmx(uint8_t *pPred, const int32_t kiStride)
+;   void_t WelsDecoderI4x4LumaPredVR_mmx(uint8_t *pPred, const int32_t kiStride)
 ;*******************************************************************************
-WELS_EXTERN WelsI4x4LumaPredVR_mmx
-WelsI4x4LumaPredVR_mmx:
+WELS_EXTERN WelsDecoderI4x4LumaPredVR_mmx
+WelsDecoderI4x4LumaPredVR_mmx:
 	%assign push_num 0
 	LOAD_2_PARA
 	%ifndef X86_32
@@ -1032,10 +1032,10 @@
 
 ;   [g f e d c b a] --> mov to memory
 ;
-;   void_t WelsI4x4LumaPredDDL_mmx(uint8_t *pPred, const int32_t kiStride)
+;   void_t WelsDecoderI4x4LumaPredDDL_mmx(uint8_t *pPred, const int32_t kiStride)
 ;*******************************************************************************
-WELS_EXTERN WelsI4x4LumaPredDDL_mmx
-WelsI4x4LumaPredDDL_mmx:
+WELS_EXTERN WelsDecoderI4x4LumaPredDDL_mmx
+WelsDecoderI4x4LumaPredDDL_mmx:
 	%assign push_num 0
 	LOAD_2_PARA
 	%ifndef X86_32
@@ -1107,10 +1107,10 @@
 
 ;   [i d c b a] + [j h g f e] --> mov to memory
 ;
-;   void_t WelsI4x4LumaPredVL_mmx(uint8_t *pPred, const int32_t kiStride)
+;   void_t WelsDecoderI4x4LumaPredVL_mmx(uint8_t *pPred, const int32_t kiStride)
 ;*******************************************************************************
-WELS_EXTERN WelsI4x4LumaPredVL_mmx
-WelsI4x4LumaPredVL_mmx:
+WELS_EXTERN WelsDecoderI4x4LumaPredVL_mmx
+WelsDecoderI4x4LumaPredVL_mmx:
 	%assign push_num 0
 	LOAD_2_PARA
 	%ifndef X86_32
@@ -1154,10 +1154,10 @@
 ALIGN 16
 ;*******************************************************************************
 ;
-;   void_t WelsIChromaPredDc_sse2(uint8_t *pPred, const int32_t kiStride)
+;   void_t WelsDecoderIChromaPredDc_sse2(uint8_t *pPred, const int32_t kiStride)
 ;*******************************************************************************
-WELS_EXTERN WelsIChromaPredDc_sse2
-WelsIChromaPredDc_sse2:
+WELS_EXTERN WelsDecoderIChromaPredDc_sse2
+WelsDecoderIChromaPredDc_sse2:
 	push 	r3
 	push 	r4
 	%assign push_num 2
@@ -1259,10 +1259,10 @@
 ALIGN 16
 ;*******************************************************************************
 ;
-;   void_t WelsI16x16LumaPredDc_sse2(uint8_t *pPred, const int32_t kiStride)
+;   void_t WelsDecoderI16x16LumaPredDc_sse2(uint8_t *pPred, const int32_t kiStride)
 ;*******************************************************************************
-WELS_EXTERN WelsI16x16LumaPredDc_sse2
-WelsI16x16LumaPredDc_sse2:
+WELS_EXTERN WelsDecoderI16x16LumaPredDc_sse2
+WelsDecoderI16x16LumaPredDc_sse2:
 	;push        ebx
 	;mov         eax, [esp+8]			; pPred
 	;mov			ecx, [esp+12]           ; kiStride
@@ -1347,10 +1347,10 @@
 
 ALIGN 16
 ;*******************************************************************************
-;	void_t WelsI16x16LumaPredDcTop_sse2(uint8_t *pPred, const int32_t kiStride)
+;	void_t WelsDecoderI16x16LumaPredDcTop_sse2(uint8_t *pPred, const int32_t kiStride)
 ;*******************************************************************************
-WELS_EXTERN WelsI16x16LumaPredDcTop_sse2
-WelsI16x16LumaPredDcTop_sse2:
+WELS_EXTERN WelsDecoderI16x16LumaPredDcTop_sse2
+WelsDecoderI16x16LumaPredDcTop_sse2:
 	;push ebx
 	;%define PUSH_SIZE 4
 	;mov eax, [esp+PUSH_SIZE+4]	; pPred
@@ -1427,10 +1427,10 @@
 
 ALIGN 16
 ;*******************************************************************************
-;	void_t WelsI16x16LumaPredDcNA_sse2(uint8_t *pPred, const int32_t kiStride)
+;	void_t WelsDecoderI16x16LumaPredDcNA_sse2(uint8_t *pPred, const int32_t kiStride)
 ;*******************************************************************************
-WELS_EXTERN WelsI16x16LumaPredDcNA_sse2
-WelsI16x16LumaPredDcNA_sse2:
+WELS_EXTERN WelsDecoderI16x16LumaPredDcNA_sse2
+WelsDecoderI16x16LumaPredDcNA_sse2:
 	;push ebx
 
 	;%define PUSH_SIZE	4
@@ -1473,10 +1473,10 @@
 
 ALIGN 16
 ;*******************************************************************************
-;	void_t WelsIChromaPredDcLeft_mmx(uint8_t *pPred, const int32_t kiStride)
+;	void_t WelsDecoderIChromaPredDcLeft_mmx(uint8_t *pPred, const int32_t kiStride)
 ;*******************************************************************************
-WELS_EXTERN WelsIChromaPredDcLeft_mmx
-WelsIChromaPredDcLeft_mmx:
+WELS_EXTERN WelsDecoderIChromaPredDcLeft_mmx
+WelsDecoderIChromaPredDcLeft_mmx:
 	;push ebx
 	;push esi
 	;%define PUSH_SIZE 8
@@ -1556,10 +1556,10 @@
 
 ALIGN 16
 ;*******************************************************************************
-;	void_t WelsIChromaPredDcTop_sse2(uint8_t *pPred, const int32_t kiStride)
+;	void_t WelsDecoderIChromaPredDcTop_sse2(uint8_t *pPred, const int32_t kiStride)
 ;*******************************************************************************
-WELS_EXTERN WelsIChromaPredDcTop_sse2
-WelsIChromaPredDcTop_sse2:
+WELS_EXTERN WelsDecoderIChromaPredDcTop_sse2
+WelsDecoderIChromaPredDcTop_sse2:
 	;push ebx
 	;%define PUSH_SIZE 4
 	;mov eax, [esp+PUSH_SIZE+4]	; pPred
@@ -1605,10 +1605,10 @@
 
 ALIGN 16
 ;*******************************************************************************
-;	void_t WelsIChromaPredDcNA_mmx(uint8_t *pPred, const int32_t kiStride)
+;	void_t WelsDecoderIChromaPredDcNA_mmx(uint8_t *pPred, const int32_t kiStride)
 ;*******************************************************************************
-WELS_EXTERN WelsIChromaPredDcNA_mmx
-WelsIChromaPredDcNA_mmx:
+WELS_EXTERN WelsDecoderIChromaPredDcNA_mmx
+WelsDecoderIChromaPredDcNA_mmx:
 	;push ebx
 	;%define PUSH_SIZE 4
 	;mov eax, [esp+PUSH_SIZE+4]	; pPred
--- a/codec/decoder/core/inc/get_intra_predictor.h
+++ b/codec/decoder/core/inc/get_intra_predictor.h
@@ -83,29 +83,29 @@
 #endif//__cplusplus
 
 #if defined(X86_ASM)
-void_t WelsI16x16LumaPredPlane_sse2 (uint8_t* pPred, const int32_t kiStride);
-void_t WelsI16x16LumaPredH_sse2 (uint8_t* pPred, const int32_t kiStride);
-void_t WelsI16x16LumaPredV_sse2 (uint8_t* pPred, const int32_t kiStride);
-void_t WelsI16x16LumaPredDc_sse2 (uint8_t* pPred, const int32_t kiStride);
-void_t WelsI16x16LumaPredDcTop_sse2 (uint8_t* pPred, const int32_t kiStride);
-void_t WelsI16x16LumaPredDcNA_sse2 (uint8_t* pPred, const int32_t kiStride);
+void_t WelsDecoderI16x16LumaPredPlane_sse2 (uint8_t* pPred, const int32_t kiStride);
+void_t WelsDecoderI16x16LumaPredH_sse2 (uint8_t* pPred, const int32_t kiStride);
+void_t WelsDecoderI16x16LumaPredV_sse2 (uint8_t* pPred, const int32_t kiStride);
+void_t WelsDecoderI16x16LumaPredDc_sse2 (uint8_t* pPred, const int32_t kiStride);
+void_t WelsDecoderI16x16LumaPredDcTop_sse2 (uint8_t* pPred, const int32_t kiStride);
+void_t WelsDecoderI16x16LumaPredDcNA_sse2 (uint8_t* pPred, const int32_t kiStride);
 
-void_t WelsIChromaPredDcTop_sse2 (uint8_t* pPred, const int32_t kiStride);
-void_t WelsIChromaPredPlane_sse2 (uint8_t* pPred, const int32_t kiStride);
-void_t WelsIChromaPredDc_sse2 (uint8_t* pPred, const int32_t kiStride);
-void_t WelsIChromaPredH_mmx (uint8_t* pPred, const int32_t kiStride);
-void_t WelsIChromaPredV_mmx (uint8_t* pPred, const int32_t kiStride);
-void_t WelsIChromaPredDcLeft_mmx (uint8_t* pPred, const int32_t kiStride);
-void_t WelsIChromaPredDcNA_mmx (uint8_t* pPred, const int32_t kiStride);
+void_t WelsDecoderIChromaPredDcTop_sse2 (uint8_t* pPred, const int32_t kiStride);
+void_t WelsDecoderIChromaPredPlane_sse2 (uint8_t* pPred, const int32_t kiStride);
+void_t WelsDecoderIChromaPredDc_sse2 (uint8_t* pPred, const int32_t kiStride);
+void_t WelsDecoderIChromaPredH_mmx (uint8_t* pPred, const int32_t kiStride);
+void_t WelsDecoderIChromaPredV_mmx (uint8_t* pPred, const int32_t kiStride);
+void_t WelsDecoderIChromaPredDcLeft_mmx (uint8_t* pPred, const int32_t kiStride);
+void_t WelsDecoderIChromaPredDcNA_mmx (uint8_t* pPred, const int32_t kiStride);
 
 void_t WelsI4x4LumaPredH_sse2 (uint8_t* pPred, const int32_t kiStride);
 void_t WelsI4x4LumaPredDc_sse2 (uint8_t* pPred, const int32_t kiStride);
-void_t WelsI4x4LumaPredDDR_mmx (uint8_t* pPred, const int32_t kiStride);
-void_t WelsI4x4LumaPredHD_mmx (uint8_t* pPred, const int32_t kiStride);
-void_t WelsI4x4LumaPredHU_mmx (uint8_t* pPred, const int32_t kiStride);
-void_t WelsI4x4LumaPredVR_mmx (uint8_t* pPred, const int32_t kiStride);
-void_t WelsI4x4LumaPredDDL_mmx (uint8_t* pPred, const int32_t kiStride);
-void_t WelsI4x4LumaPredVL_mmx (uint8_t* pPred, const int32_t kiStride);
+void_t WelsDecoderI4x4LumaPredDDR_mmx (uint8_t* pPred, const int32_t kiStride);
+void_t WelsDecoderI4x4LumaPredHD_mmx (uint8_t* pPred, const int32_t kiStride);
+void_t WelsDecoderI4x4LumaPredHU_mmx (uint8_t* pPred, const int32_t kiStride);
+void_t WelsDecoderI4x4LumaPredVR_mmx (uint8_t* pPred, const int32_t kiStride);
+void_t WelsDecoderI4x4LumaPredDDL_mmx (uint8_t* pPred, const int32_t kiStride);
+void_t WelsDecoderI4x4LumaPredVL_mmx (uint8_t* pPred, const int32_t kiStride);
 #endif//X86_ASM
 
 #if defined(__cplusplus)
--- a/codec/decoder/core/src/decoder.cpp
+++ b/codec/decoder/core/src/decoder.cpp
@@ -746,28 +746,28 @@
     pCtx->pIdctResAddPredFunc	= IdctResAddPred_mmx;
 
     /////////mmx code opt---
-    pCtx->pGetIChromaPredFunc[C_PRED_H]      = WelsIChromaPredH_mmx;
-    pCtx->pGetIChromaPredFunc[C_PRED_V]      = WelsIChromaPredV_mmx;
-    pCtx->pGetIChromaPredFunc[C_PRED_DC_L  ] = WelsIChromaPredDcLeft_mmx;
-    pCtx->pGetIChromaPredFunc[C_PRED_DC_128] = WelsIChromaPredDcNA_mmx;
-    pCtx->pGetI4x4LumaPredFunc[I4_PRED_DDR]  = WelsI4x4LumaPredDDR_mmx;
-    pCtx->pGetI4x4LumaPredFunc[I4_PRED_HD ]  = WelsI4x4LumaPredHD_mmx;
-    pCtx->pGetI4x4LumaPredFunc[I4_PRED_HU ]  = WelsI4x4LumaPredHU_mmx;
-    pCtx->pGetI4x4LumaPredFunc[I4_PRED_VR ]  = WelsI4x4LumaPredVR_mmx;
-    pCtx->pGetI4x4LumaPredFunc[I4_PRED_DDL]  = WelsI4x4LumaPredDDL_mmx;
-    pCtx->pGetI4x4LumaPredFunc[I4_PRED_VL ]  = WelsI4x4LumaPredVL_mmx;
+    pCtx->pGetIChromaPredFunc[C_PRED_H]      = WelsDecoderIChromaPredH_mmx;
+    pCtx->pGetIChromaPredFunc[C_PRED_V]      = WelsDecoderIChromaPredV_mmx;
+    pCtx->pGetIChromaPredFunc[C_PRED_DC_L  ] = WelsDecoderIChromaPredDcLeft_mmx;
+    pCtx->pGetIChromaPredFunc[C_PRED_DC_128] = WelsDecoderIChromaPredDcNA_mmx;
+    pCtx->pGetI4x4LumaPredFunc[I4_PRED_DDR]  = WelsDecoderI4x4LumaPredDDR_mmx;
+    pCtx->pGetI4x4LumaPredFunc[I4_PRED_HD ]  = WelsDecoderI4x4LumaPredHD_mmx;
+    pCtx->pGetI4x4LumaPredFunc[I4_PRED_HU ]  = WelsDecoderI4x4LumaPredHU_mmx;
+    pCtx->pGetI4x4LumaPredFunc[I4_PRED_VR ]  = WelsDecoderI4x4LumaPredVR_mmx;
+    pCtx->pGetI4x4LumaPredFunc[I4_PRED_DDL]  = WelsDecoderI4x4LumaPredDDL_mmx;
+    pCtx->pGetI4x4LumaPredFunc[I4_PRED_VL ]  = WelsDecoderI4x4LumaPredVL_mmx;
   }
   if (pCtx->uiCpuFlag & WELS_CPU_SSE2) {
     /////////sse2 code opt---
-    pCtx->pGetI16x16LumaPredFunc[I16_PRED_DC] = WelsI16x16LumaPredDc_sse2;
-    pCtx->pGetI16x16LumaPredFunc[I16_PRED_P]  = WelsI16x16LumaPredPlane_sse2;
-    pCtx->pGetI16x16LumaPredFunc[I16_PRED_H]  = WelsI16x16LumaPredH_sse2;
-    pCtx->pGetI16x16LumaPredFunc[I16_PRED_V]  = WelsI16x16LumaPredV_sse2;
-    pCtx->pGetI16x16LumaPredFunc[I16_PRED_DC_T  ] = WelsI16x16LumaPredDcTop_sse2;
-    pCtx->pGetI16x16LumaPredFunc[I16_PRED_DC_128] = WelsI16x16LumaPredDcNA_sse2;
-    pCtx->pGetIChromaPredFunc[C_PRED_P ]      = WelsIChromaPredPlane_sse2;
-    pCtx->pGetIChromaPredFunc[C_PRED_DC]      = WelsIChromaPredDc_sse2;
-    pCtx->pGetIChromaPredFunc[C_PRED_DC_T]    = WelsIChromaPredDcTop_sse2;
+    pCtx->pGetI16x16LumaPredFunc[I16_PRED_DC] = WelsDecoderI16x16LumaPredDc_sse2;
+    pCtx->pGetI16x16LumaPredFunc[I16_PRED_P]  = WelsDecoderI16x16LumaPredPlane_sse2;
+    pCtx->pGetI16x16LumaPredFunc[I16_PRED_H]  = WelsDecoderI16x16LumaPredH_sse2;
+    pCtx->pGetI16x16LumaPredFunc[I16_PRED_V]  = WelsDecoderI16x16LumaPredV_sse2;
+    pCtx->pGetI16x16LumaPredFunc[I16_PRED_DC_T  ] = WelsDecoderI16x16LumaPredDcTop_sse2;
+    pCtx->pGetI16x16LumaPredFunc[I16_PRED_DC_128] = WelsDecoderI16x16LumaPredDcNA_sse2;
+    pCtx->pGetIChromaPredFunc[C_PRED_P ]      = WelsDecoderIChromaPredPlane_sse2;
+    pCtx->pGetIChromaPredFunc[C_PRED_DC]      = WelsDecoderIChromaPredDc_sse2;
+    pCtx->pGetIChromaPredFunc[C_PRED_DC_T]    = WelsDecoderIChromaPredDcTop_sse2;
   }
 #endif
   DeblockingInit (&pCtx->sDeblockingFunc, pCtx->uiCpuFlag);