History

Fix a typo, Chorma -> Chroma

Martin Storsjö committed 12 years ago

Commit a474e001 parent 894f0734 files · +41 −41Browse files

Showing the changes to codec/encoder/core/src/sample.cpp (1 of 4 files). Show all

Unified · Split

codec/encoder/core/src/sample.cpp+15−15
@@ -169,17 +169,17 @@ int32_t WelsSampleSatdIntra4x4Combined3_c (uint8_t* pDec, int32_t iDecStride, ui · 168 unmodified lines
169169
170170 return iBestCost;
171171 }
172−extern void WelsIChormaPredDc_c (uint8_t* pPred, uint8_t* pRef, const int32_t iStride);
173−extern void WelsIChormaPredH_c (uint8_t* pPred, uint8_t* pRef, const int32_t iStride);
174−extern void WelsIChormaPredV_c (uint8_t* pPred, uint8_t* pRef, const int32_t iStride);
172+extern void WelsIChromaPredDc_c (uint8_t* pPred, uint8_t* pRef, const int32_t iStride);
173+extern void WelsIChromaPredH_c (uint8_t* pPred, uint8_t* pRef, const int32_t iStride);
174+extern void WelsIChromaPredV_c (uint8_t* pPred, uint8_t* pRef, const int32_t iStride);
175175
176176 int32_t WelsSampleSatdIntra8x8Combined3_c (uint8_t* pDecCb, int32_t iDecStride, uint8_t* pEncCb, int32_t iEncStride,
177177 int32_t* pBestMode, int32_t iLambda, uint8_t* pDstChroma, uint8_t* pDecCr, uint8_t* pEncCr) {
178178 int32_t iBestMode = -1;
179179 int32_t iCurCost, iBestCost = INT_MAX;
180180
181− WelsIChormaPredV_c (pDstChroma, pDecCb, iDecStride);
182− WelsIChormaPredV_c (pDstChroma + 64, pDecCr, iDecStride);
181+ WelsIChromaPredV_c (pDstChroma, pDecCb, iDecStride);
182+ WelsIChromaPredV_c (pDstChroma + 64, pDecCr, iDecStride);
183183 iCurCost = WelsSampleSatd8x8_c (pDstChroma, 8, pEncCb, iEncStride);
184184 iCurCost += WelsSampleSatd8x8_c (pDstChroma + 64, 8, pEncCr, iEncStride) + iLambda * 2;
185185
@@ -188,16 +188,16 @@ int32_t WelsSampleSatdIntra8x8Combined3_c (uint8_t* pDecCb, int32_t iDecStride, · 2 unmodified lines
188188 iBestCost = iCurCost;
189189 }
190190
191− WelsIChormaPredH_c (pDstChroma, pDecCb, iDecStride);
192− WelsIChormaPredH_c (pDstChroma + 64, pDecCr, iDecStride);
191+ WelsIChromaPredH_c (pDstChroma, pDecCb, iDecStride);
192+ WelsIChromaPredH_c (pDstChroma + 64, pDecCr, iDecStride);
193193 iCurCost = WelsSampleSatd8x8_c (pDstChroma, 8, pEncCb, iEncStride);
194194 iCurCost += WelsSampleSatd8x8_c (pDstChroma + 64, 8, pEncCr, iEncStride) + iLambda * 2;
195195 if (iCurCost < iBestCost) {
196196 iBestMode = 1;
197197 iBestCost = iCurCost;
198198 }
199− WelsIChormaPredDc_c (pDstChroma, pDecCb, iDecStride);
200− WelsIChormaPredDc_c (pDstChroma + 64, pDecCr, iDecStride);
199+ WelsIChromaPredDc_c (pDstChroma, pDecCb, iDecStride);
200+ WelsIChromaPredDc_c (pDstChroma + 64, pDecCr, iDecStride);
201201 iCurCost = WelsSampleSatd8x8_c (pDstChroma, 8, pEncCb, iEncStride);
202202 iCurCost += WelsSampleSatd8x8_c (pDstChroma + 64, 8, pEncCr, iEncStride);
203203 if (iCurCost < iBestCost) {
@@ -216,8 +216,8 @@ int32_t WelsSampleSadIntra8x8Combined3_c (uint8_t* pDecCb, int32_t iDecStride, u · 12 unmodified lines
216216 int32_t iBestMode = -1;
217217 int32_t iCurCost, iBestCost = INT_MAX;
218218
219− WelsIChormaPredV_c (pDstChroma, pDecCb, iDecStride);
220− WelsIChormaPredV_c (pDstChroma + 64, pDecCr, iDecStride);
219+ WelsIChromaPredV_c (pDstChroma, pDecCb, iDecStride);
220+ WelsIChromaPredV_c (pDstChroma + 64, pDecCr, iDecStride);
221221 iCurCost = WelsSampleSad8x8_c (pDstChroma, 8, pEncCb, iEncStride);
222222 iCurCost += WelsSampleSad8x8_c (pDstChroma + 64, 8, pEncCr, iEncStride) + iLambda * 2;
223223
@@ -226,16 +226,16 @@ int32_t WelsSampleSadIntra8x8Combined3_c (uint8_t* pDecCb, int32_t iDecStride, u · 2 unmodified lines
226226 iBestCost = iCurCost;
227227 }
228228
229− WelsIChormaPredH_c (pDstChroma, pDecCb, iDecStride);
230− WelsIChormaPredH_c (pDstChroma + 64, pDecCr, iDecStride);
229+ WelsIChromaPredH_c (pDstChroma, pDecCb, iDecStride);
230+ WelsIChromaPredH_c (pDstChroma + 64, pDecCr, iDecStride);
231231 iCurCost = WelsSampleSad8x8_c (pDstChroma, 8, pEncCb, iEncStride);
232232 iCurCost += WelsSampleSad8x8_c (pDstChroma + 64, 8, pEncCr, iEncStride) + iLambda * 2;
233233 if (iCurCost < iBestCost) {
234234 iBestMode = 1;
235235 iBestCost = iCurCost;
236236 }
237− WelsIChormaPredDc_c (pDstChroma, pDecCb, iDecStride);
238− WelsIChormaPredDc_c (pDstChroma + 64, pDecCr, iDecStride);
237+ WelsIChromaPredDc_c (pDstChroma, pDecCb, iDecStride);
238+ WelsIChromaPredDc_c (pDstChroma + 64, pDecCr, iDecStride);
239239 iCurCost = WelsSampleSad8x8_c (pDstChroma, 8, pEncCb, iEncStride);
240240 iCurCost += WelsSampleSad8x8_c (pDstChroma + 64, 8, pEncCr, iEncStride);
241241 if (iCurCost < iBestCost) {

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