History

modify WELS_CLIP1 to be inline functions

huili2 committed 12 years ago

Commit 090e8cc1 parent b21411a9 files · +36 −37Browse files

Showing the changes to codec/decoder/core/src (3 of 9 files). Show all

Unified · Split

3 files
  1. codec/decoder/core/src/decode_mb_aux.cpp +4 −4
  2. codec/decoder/core/src/get_intra_predictor.cpp +2 −2
  3. codec/decoder/core/src/mc.cpp +3 −3
codec/decoder/core/src/decode_mb_aux.cpp+4−4
@@ -92,13 +92,13 @@ void IdctResAddPred_c (uint8_t* pPred, const int32_t kiStride, int16_t* pRs) { · 91 unmodified lines
92 int32_t kT3 = (32 + kT1 + kT2) >> 6;92 int32_t kT3 = (32 + kT1 + kT2) >> 6;
93 int32_t kT4 = (32 + kT1 - kT2) >> 6;93 int32_t kT4 = (32 + kT1 - kT2) >> 6;
94 94
95 pDst[i] = WELS_CLIP1( kT3 + pPred[i] );95 pDst[i] = WelsClip1( kT3 + pPred[i] );
96 pDst[i + kiStride3] = WELS_CLIP1( kT4 + pPred[i + kiStride3] );96 pDst[i + kiStride3] = WelsClip1( kT4 + pPred[i + kiStride3] );
97 97
98 kT1 = iSrc[i] - iSrc[i + 8];98 kT1 = iSrc[i] - iSrc[i + 8];
99 kT2 = (iSrc[i + 4] >> 1) - iSrc[i + 12];99 kT2 = (iSrc[i + 4] >> 1) - iSrc[i + 12];
100 pDst[i + kiStride] = WELS_CLIP1( ((32 + kT1 + kT2) >> 6) + pDst[i + kiStride] );100 pDst[i + kiStride] = WelsClip1( ((32 + kT1 + kT2) >> 6) + pDst[i + kiStride] );
101 pDst[i + kiStride2] = WELS_CLIP1( ((32 + kT1 - kT2) >> 6) + pDst[i + kiStride2] );101 pDst[i + kiStride2] = WelsClip1( ((32 + kT1 - kT2) >> 6) + pDst[i + kiStride2] );
102 }102 }
103}103}
104 104
codec/decoder/core/src/get_intra_predictor.cpp+2−2
@@ -428,7 +428,7 @@ void WelsIChromaPredPlane_c (uint8_t* pPred, const int32_t kiStride) { · 427 unmodified lines
428 for (i = 0 ; i < 8 ; i ++) {428 for (i = 0 ; i < 8 ; i ++) {
429 for (j = 0 ; j < 8 ; j ++) {429 for (j = 0 ; j < 8 ; j ++) {
430 int32_t iTmp = (a + b * (j - 3) + c * (i - 3) + 16) >> 5;430 int32_t iTmp = (a + b * (j - 3) + c * (i - 3) + 16) >> 5;
431 iTmp = WELS_CLIP1 (iTmp);431 iTmp = WelsClip1 (iTmp);
432 pPred[j] = iTmp;432 pPred[j] = iTmp;
433 }433 }
434 pPred += kiStride;434 pPred += kiStride;
@@ -567,7 +567,7 @@ void WelsI16x16LumaPredPlane_c (uint8_t* pPred, const int32_t kiStride) { · 132 unmodified lines
567 for (i = 0 ; i < 16 ; i ++) {567 for (i = 0 ; i < 16 ; i ++) {
568 for (j = 0 ; j < 16 ; j ++) {568 for (j = 0 ; j < 16 ; j ++) {
569 int32_t iTmp = (a + b * (j - 7) + c * (i - 7) + 16) >> 5;569 int32_t iTmp = (a + b * (j - 7) + c * (i - 7) + 16) >> 5;
570 iTmp = WELS_CLIP1 (iTmp);570 iTmp = WelsClip1 (iTmp);
571 pPred[j] = iTmp;571 pPred[j] = iTmp;
572 }572 }
573 pPred += kiStride;573 pPred += kiStride;
codec/decoder/core/src/mc.cpp+3−3
@@ -181,7 +181,7 @@ static inline void McHorVer20_c (const uint8_t* pSrc, int32_t iSrcStride, uint8_ · 180 unmodified lines
181 int32_t i, j;181 int32_t i, j;
182 for (i = 0; i < iHeight; i++) {182 for (i = 0; i < iHeight; i++) {
183 for (j = 0; j < iWidth; j++) {183 for (j = 0; j < iWidth; j++) {
184 pDst[j] = WELS_CLIP1 ((FilterInput8bitWithStride_c (pSrc + j, 1) + 16) >> 5);184 pDst[j] = WelsClip1 ((FilterInput8bitWithStride_c (pSrc + j, 1) + 16) >> 5);
185 }185 }
186 pDst += iDstStride;186 pDst += iDstStride;
187 pSrc += iSrcStride;187 pSrc += iSrcStride;
@@ -193,7 +193,7 @@ static inline void McHorVer02_c (const uint8_t* pSrc, int32_t iSrcStride, uint8_ · 5 unmodified lines
193 int32_t i, j;193 int32_t i, j;
194 for (i = 0; i < iHeight; i++) {194 for (i = 0; i < iHeight; i++) {
195 for (j = 0; j < iWidth; j++) {195 for (j = 0; j < iWidth; j++) {
196 pDst[j] = WELS_CLIP1 ((FilterInput8bitWithStride_c (pSrc + j, iSrcStride) + 16) >> 5);196 pDst[j] = WelsClip1 ((FilterInput8bitWithStride_c (pSrc + j, iSrcStride) + 16) >> 5);
197 }197 }
198 pDst += iDstStride;198 pDst += iDstStride;
199 pSrc += iSrcStride;199 pSrc += iSrcStride;
@@ -210,7 +210,7 @@ static inline void McHorVer22_c (const uint8_t* pSrc, int32_t iSrcStride, uint8_ · 10 unmodified lines
210 iTmp[j] = FilterInput8bitWithStride_c (pSrc - 2 + j, iSrcStride);210 iTmp[j] = FilterInput8bitWithStride_c (pSrc - 2 + j, iSrcStride);
211 }211 }
212 for (k = 0; k < iWidth; k++) {212 for (k = 0; k < iWidth; k++) {
213 pDst[k] = WELS_CLIP1 ((HorFilterInput16bit_c (&iTmp[2 + k]) + 512) >> 10);213 pDst[k] = WelsClip1 ((HorFilterInput16bit_c (&iTmp[2 + k]) + 512) >> 10);
214 }214 }
215 pSrc += iSrcStride;215 pSrc += iSrcStride;
216 pDst += iDstStride;216 pDst += iDstStride;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t