History

Convert tabs to spaces in code that looks like tables

Also fix the alignment in some related cases, even though they didn't use tabs originally.

Martin Storsjö committed 11 years ago

Commit b052a951 parent 8c60f848 files · +74 −78Browse files

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

Unified · Split

codec/encoder/core/src/svc_encode_mb.cpp+13−13
@@ -45,10 +45,10 @@ · 44 unmodified lines
45 45
46namespace WelsEnc {46namespace WelsEnc {
47void WelsDctMb (int16_t* pRes, uint8_t* pEncMb, int32_t iEncStride, uint8_t* pBestPred, PDctFunc pfDctFourT4) {47void WelsDctMb (int16_t* pRes, uint8_t* pEncMb, int32_t iEncStride, uint8_t* pBestPred, PDctFunc pfDctFourT4) {
48 pfDctFourT4 (pRes, pEncMb, iEncStride, pBestPred, 16);48 pfDctFourT4 (pRes, pEncMb, iEncStride, pBestPred, 16);
49 pfDctFourT4 (pRes + 64, pEncMb + 8, iEncStride, pBestPred + 8, 16);49 pfDctFourT4 (pRes + 64, pEncMb + 8, iEncStride, pBestPred + 8, 16);
50 pfDctFourT4 (pRes + 128, pEncMb + 8 * iEncStride, iEncStride, pBestPred + 128, 16);50 pfDctFourT4 (pRes + 128, pEncMb + 8 * iEncStride, iEncStride, pBestPred + 128, 16);
51 pfDctFourT4 (pRes + 192, pEncMb + 8 * iEncStride + 8, iEncStride, pBestPred + 136, 16);51 pfDctFourT4 (pRes + 192, pEncMb + 8 * iEncStride + 8, iEncStride, pBestPred + 136, 16);
52}52}
53 53
54void WelsEncRecI16x16Y (sWelsEncCtx* pEncCtx, SMB* pCurMb, SMbCache* pMbCache) {54void WelsEncRecI16x16Y (sWelsEncCtx* pEncCtx, SMB* pCurMb, SMbCache* pMbCache) {
@@ -77,7 +77,7 @@ void WelsEncRecI16x16Y (sWelsEncCtx* pEncCtx, SMB* pCurMb, SMbCache* pMbCache) { · 22 unmodified lines
77 77
78 for (i = 0; i < 4; i++) {78 for (i = 0; i < 4; i++) {
79 pFuncList->pfQuantizationFour4x4 (pRes, pFF, pMF);79 pFuncList->pfQuantizationFour4x4 (pRes, pFF, pMF);
80 pFuncList->pfScan4x4Ac (pBlock, pRes);80 pFuncList->pfScan4x4Ac (pBlock, pRes);
81 pFuncList->pfScan4x4Ac (pBlock + 16, pRes + 16);81 pFuncList->pfScan4x4Ac (pBlock + 16, pRes + 16);
82 pFuncList->pfScan4x4Ac (pBlock + 32, pRes + 32);82 pFuncList->pfScan4x4Ac (pBlock + 32, pRes + 32);
83 pFuncList->pfScan4x4Ac (pBlock + 48, pRes + 48);83 pFuncList->pfScan4x4Ac (pBlock + 48, pRes + 48);
@@ -126,12 +126,12 @@ void WelsEncRecI16x16Y (sWelsEncCtx* pEncCtx, SMB* pCurMb, SMbCache* pMbCache) { · 42 unmodified lines
126 pRes[224] = aDctT4Dc[14];126 pRes[224] = aDctT4Dc[14];
127 pRes[240] = aDctT4Dc[15];127 pRes[240] = aDctT4Dc[15];
128 128
129 pFuncList->pfIDctFourT4 (pPred, kiRecStride, pBestPred, 16, pRes);129 pFuncList->pfIDctFourT4 (pPred, kiRecStride, pBestPred, 16, pRes);
130 pFuncList->pfIDctFourT4 (pPred + 8, kiRecStride, pBestPred + 8, 16, pRes + 64);130 pFuncList->pfIDctFourT4 (pPred + 8, kiRecStride, pBestPred + 8, 16, pRes + 64);
131 pFuncList->pfIDctFourT4 (pPred + kiRecStride * 8, kiRecStride, pBestPred + 128, 16, pRes + 128);131 pFuncList->pfIDctFourT4 (pPred + kiRecStride * 8, kiRecStride, pBestPred + 128, 16, pRes + 128);
132 pFuncList->pfIDctFourT4 (pPred + kiRecStride * 8 + 8, kiRecStride, pBestPred + 136, 16, pRes + 192);132 pFuncList->pfIDctFourT4 (pPred + kiRecStride * 8 + 8, kiRecStride, pBestPred + 136, 16, pRes + 192);
133 } else if (uiCountI16x16Dc > 0) {133 } else if (uiCountI16x16Dc > 0) {
134 pFuncList->pfIDctI16x16Dc (pPred, kiRecStride, pBestPred, 16, aDctT4Dc);134 pFuncList->pfIDctI16x16Dc (pPred, kiRecStride, pBestPred, 16, aDctT4Dc);
135 } else {135 } else {
136 pFuncList->pfCopy16x16Aligned (pPred, kiRecStride, pBestPred, 16);136 pFuncList->pfCopy16x16Aligned (pPred, kiRecStride, pBestPred, 16);
137 }137 }
@@ -319,10 +319,10 @@ void WelsRecPskip (SDqLayer* pCurLayer, SWelsFuncPtrList* pFuncList, SMB* pCu · 181 unmodified lines
319 int32_t* iRecStride = pCurLayer->iCsStride;319 int32_t* iRecStride = pCurLayer->iCsStride;
320 uint8_t** pCsMb = &pMbCache->SPicData.pCsMb[0];320 uint8_t** pCsMb = &pMbCache->SPicData.pCsMb[0];
321 321
322 pFuncList->pfCopy16x16Aligned (pCsMb[0], *iRecStride++, pMbCache->pSkipMb, 16);322 pFuncList->pfCopy16x16Aligned (pCsMb[0], *iRecStride++, pMbCache->pSkipMb, 16);
323 pFuncList->pfCopy8x8Aligned (pCsMb[1], *iRecStride++, pMbCache->pSkipMb + 256, 8);323 pFuncList->pfCopy8x8Aligned (pCsMb[1], *iRecStride++, pMbCache->pSkipMb + 256, 8);
324 pFuncList->pfCopy8x8Aligned (pCsMb[2], *iRecStride, pMbCache->pSkipMb + 320, 8);324 pFuncList->pfCopy8x8Aligned (pCsMb[2], *iRecStride, pMbCache->pSkipMb + 320, 8);
325 pFuncList->pfSetMemZeroSize8 (pCurMb->pNonZeroCount, 24);325 pFuncList->pfSetMemZeroSize8 (pCurMb->pNonZeroCount, 24);
326}326}
327 327
328bool WelsTryPYskip (sWelsEncCtx* pEncCtx, SMB* pCurMb, SMbCache* pMbCache) {328bool WelsTryPYskip (sWelsEncCtx* pEncCtx, SMB* pCurMb, SMbCache* pMbCache) {

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