From f4fdb1539772e7cd1bfc438fa2ded900127ab4c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Fri, 14 Mar 2014 23:28:36 +0200 Subject: [PATCH] Fix a typo, Smple -> Sample --- codec/encoder/core/asm/intra_pred.asm | 6 +++--- codec/encoder/core/inc/sample.h | 4 ++-- codec/encoder/core/src/sample.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/codec/encoder/core/asm/intra_pred.asm b/codec/encoder/core/asm/intra_pred.asm index 5f56db06..ae7781ff 100644 --- a/codec/encoder/core/asm/intra_pred.asm +++ b/codec/encoder/core/asm/intra_pred.asm @@ -1257,14 +1257,14 @@ WelsI16x16LumaPredDc_sse2: ;*********************************************************************** ; -;int32_t WelsSmpleSatdThree4x4_sse2( uint8_t *pDec, int32_t iLineSizeDec, uint8_t *pEnc, int32_t iLinesizeEnc, +;int32_t WelsSampleSatdThree4x4_sse2( uint8_t *pDec, int32_t iLineSizeDec, uint8_t *pEnc, int32_t iLinesizeEnc, ; uint8_t* pRed, int32_t* pBestMode, int32_t, int32_t, int32_t); ; ;*********************************************************************** %ifdef X86_32 -WELS_EXTERN WelsSmpleSatdThree4x4_sse2 +WELS_EXTERN WelsSampleSatdThree4x4_sse2 align 16 -WelsSmpleSatdThree4x4_sse2: +WelsSampleSatdThree4x4_sse2: push ebx push esi push edi diff --git a/codec/encoder/core/inc/sample.h b/codec/encoder/core/inc/sample.h index 48f7eac8..b5e62bc2 100644 --- a/codec/encoder/core/inc/sample.h +++ b/codec/encoder/core/inc/sample.h @@ -94,8 +94,8 @@ int32_t WelsSampleSatd16x8_sse2 (uint8_t*, int32_t, uint8_t*, int32_t); int32_t WelsSampleSatd8x16_sse2 (uint8_t*, int32_t, uint8_t*, int32_t); int32_t WelsSampleSatd16x16_sse2 (uint8_t*, int32_t, uint8_t*, int32_t); int32_t WelsSampleSatd4x4_sse2 (uint8_t*, int32_t, uint8_t*, int32_t); -int32_t WelsSmpleSatdThree4x4_sse2 (uint8_t*, int32_t, uint8_t*, int32_t, uint8_t*, int32_t*, int32_t, int32_t, - int32_t); +int32_t WelsSampleSatdThree4x4_sse2 (uint8_t*, int32_t, uint8_t*, int32_t, uint8_t*, int32_t*, int32_t, int32_t, + int32_t); int32_t WelsSampleSatd8x8_sse41 (uint8_t*, int32_t, uint8_t*, int32_t); int32_t WelsSampleSatd8x16_sse41 (uint8_t*, int32_t, uint8_t*, int32_t); diff --git a/codec/encoder/core/src/sample.cpp b/codec/encoder/core/src/sample.cpp index 38fef9f8..7e0228b0 100644 --- a/codec/encoder/core/src/sample.cpp +++ b/codec/encoder/core/src/sample.cpp @@ -463,7 +463,7 @@ void WelsInitSampleSadFunc (SWelsFuncPtrList* pFuncList, uint32_t uiCpuFlag) { pFuncList->sSampleDealingFuncs.pfSampleSatd[BLOCK_8x16 ] = WelsSampleSatd8x16_sse2; pFuncList->sSampleDealingFuncs.pfSampleSatd[BLOCK_16x8 ] = WelsSampleSatd16x8_sse2; pFuncList->sSampleDealingFuncs.pfSampleSatd[BLOCK_16x16] = WelsSampleSatd16x16_sse2; - //pFuncList->sSampleDealingFuncs.pfIntra4x4Combined3Satd = WelsSmpleSatdThree4x4_sse2; + //pFuncList->sSampleDealingFuncs.pfIntra4x4Combined3Satd = WelsSampleSatdThree4x4_sse2; } if (uiCpuFlag & WELS_CPU_SSSE3) {