History

Merge pull request #274 from mstorsjo/typedef-cleanup

Remove typedefs for standard C++ types

Ethan Hugg committed 12 years ago

Commit 8b8e0d42 parents 1e549e6 80862ee134 files · +1105 −1130Browse files

Showing the changes to codec/decoder/core/src/deblocking.cpp (1 of 134 files). Show all

Unified · Split

codec/decoder/core/src/deblocking.cpp+19−19
@@ -143,7 +143,7 @@ static const uint8_t g_kuiTableBIdx[2][8] = { · 142 unmodified lines
143 tc[3] = g_kiTc0Table(iIndexA)[pBS[3]] + bChroma;\143 tc[3] = g_kiTc0Table(iIndexA)[pBS[3]] + bChroma;\
144}144}
145 145
146void_t inline DeblockingBSInsideMBAvsbase (int8_t* pNnzTab, uint8_t nBS[2][4][4], int32_t iLShiftFactor) {146void inline DeblockingBSInsideMBAvsbase (int8_t* pNnzTab, uint8_t nBS[2][4][4], int32_t iLShiftFactor) {
147 uint32_t uiNnz32b0, uiNnz32b1, uiNnz32b2, uiNnz32b3;147 uint32_t uiNnz32b0, uiNnz32b1, uiNnz32b2, uiNnz32b3;
148 148
149 uiNnz32b0 = * (uint32_t*) (pNnzTab + 0);149 uiNnz32b0 = * (uint32_t*) (pNnzTab + 0);
@@ -172,7 +172,7 @@ void_t inline DeblockingBSInsideMBAvsbase (int8_t* pNnzTab, uint8_t nBS[2][4][4] · 22 unmodified lines
172 172
173}173}
174 174
175void_t static inline DeblockingBSInsideMBNormal (PDqLayer pCurDqLayer, uint8_t nBS[2][4][4], int8_t* pNnzTab,175void static inline DeblockingBSInsideMBNormal (PDqLayer pCurDqLayer, uint8_t nBS[2][4][4], int8_t* pNnzTab,
176 int32_t iMbXy) {176 int32_t iMbXy) {
177 uint32_t uiNnz32b0, uiNnz32b1, uiNnz32b2, uiNnz32b3;177 uint32_t uiNnz32b0, uiNnz32b1, uiNnz32b2, uiNnz32b3;
178 int8_t* iRefIndex = pCurDqLayer->pRefIndex[LIST_0][iMbXy];178 int8_t* iRefIndex = pCurDqLayer->pRefIndex[LIST_0][iMbXy];
@@ -251,8 +251,8 @@ int32_t DeblockingAvailableNoInterlayer (PDqLayer pCurDqLayer, int32_t iFilterId · 72 unmodified lines
251 int32_t iMbY = pCurDqLayer->iMbY;251 int32_t iMbY = pCurDqLayer->iMbY;
252 int32_t iMbX = pCurDqLayer->iMbX;252 int32_t iMbX = pCurDqLayer->iMbX;
253 int32_t iMbXy = pCurDqLayer->iMbXyIndex;253 int32_t iMbXy = pCurDqLayer->iMbXyIndex;
254 BOOL_T bLeftFlag = FALSE;254 bool bLeftFlag = false;
255 BOOL_T bTopFlag = FALSE;255 bool bTopFlag = false;
256 256
257 if (2 == iFilterIdc) {257 if (2 == iFilterIdc) {
258 bLeftFlag = (iMbX > 0) && (pCurDqLayer->pSliceIdc[iMbXy] == pCurDqLayer->pSliceIdc[iMbXy - 1]);258 bLeftFlag = (iMbX > 0) && (pCurDqLayer->pSliceIdc[iMbXy] == pCurDqLayer->pSliceIdc[iMbXy - 1]);
@@ -264,7 +264,7 @@ int32_t DeblockingAvailableNoInterlayer (PDqLayer pCurDqLayer, int32_t iFilterId · 5 unmodified lines
264 return (bLeftFlag << LEFT_FLAG_BIT) | (bTopFlag << TOP_FLAG_BIT);264 return (bLeftFlag << LEFT_FLAG_BIT) | (bTopFlag << TOP_FLAG_BIT);
265}265}
266 266
267void_t FilteringEdgeLumaH (SDeblockingFilter* pFilter, uint8_t* pPix, int32_t iStride, uint8_t* pBS) {267void FilteringEdgeLumaH (SDeblockingFilter* pFilter, uint8_t* pPix, int32_t iStride, uint8_t* pBS) {
268 int32_t iIndexA;268 int32_t iIndexA;
269 int32_t iAlpha;269 int32_t iAlpha;
270 int32_t iBeta;270 int32_t iBeta;
@@ -281,7 +281,7 @@ void_t FilteringEdgeLumaH (SDeblockingFilter* pFilter, uint8_t* pPix, int32_t iS · 10 unmodified lines
281}281}
282 282
283 283
284void_t FilteringEdgeLumaV (SDeblockingFilter* pFilter, uint8_t* pPix, int32_t iStride, uint8_t* pBS) {284void FilteringEdgeLumaV (SDeblockingFilter* pFilter, uint8_t* pPix, int32_t iStride, uint8_t* pBS) {
285 int32_t iIndexA;285 int32_t iIndexA;
286 int32_t iAlpha;286 int32_t iAlpha;
287 int32_t iBeta;287 int32_t iBeta;
@@ -298,7 +298,7 @@ void_t FilteringEdgeLumaV (SDeblockingFilter* pFilter, uint8_t* pPix, int32_t iS · 10 unmodified lines
298}298}
299 299
300 300
301void_t FilteringEdgeLumaIntraH (SDeblockingFilter* pFilter, uint8_t* pPix, int32_t iStride, uint8_t* pBS) {301void FilteringEdgeLumaIntraH (SDeblockingFilter* pFilter, uint8_t* pPix, int32_t iStride, uint8_t* pBS) {
302 int32_t iIndexA;302 int32_t iIndexA;
303 int32_t iAlpha;303 int32_t iAlpha;
304 int32_t iBeta;304 int32_t iBeta;
@@ -312,7 +312,7 @@ void_t FilteringEdgeLumaIntraH (SDeblockingFilter* pFilter, uint8_t* pPix, int32 · 7 unmodified lines
312 return;312 return;
313}313}
314 314
315void_t FilteringEdgeLumaIntraV (SDeblockingFilter* pFilter, uint8_t* pPix, int32_t iStride, uint8_t* pBS) {315void FilteringEdgeLumaIntraV (SDeblockingFilter* pFilter, uint8_t* pPix, int32_t iStride, uint8_t* pBS) {
316 int32_t iIndexA;316 int32_t iIndexA;
317 int32_t iAlpha;317 int32_t iAlpha;
318 int32_t iBeta;318 int32_t iBeta;
@@ -325,7 +325,7 @@ void_t FilteringEdgeLumaIntraV (SDeblockingFilter* pFilter, uint8_t* pPix, int32 · 6 unmodified lines
325 }325 }
326 return;326 return;
327}327}
328void_t FilteringEdgeChromaH (SDeblockingFilter* pFilter, uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride,328void FilteringEdgeChromaH (SDeblockingFilter* pFilter, uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride,
329 uint8_t* pBS) {329 uint8_t* pBS) {
330 int32_t iIndexA;330 int32_t iIndexA;
331 int32_t iAlpha;331 int32_t iAlpha;
@@ -341,7 +341,7 @@ void_t FilteringEdgeChromaH (SDeblockingFilter* pFilter, uint8_t* pPixCb, uint8_ · 9 unmodified lines
341 }341 }
342 return;342 return;
343}343}
344void_t FilteringEdgeChromaV (SDeblockingFilter* pFilter, uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride,344void FilteringEdgeChromaV (SDeblockingFilter* pFilter, uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride,
345 uint8_t* pBS) {345 uint8_t* pBS) {
346 int32_t iIndexA;346 int32_t iIndexA;
347 int32_t iAlpha;347 int32_t iAlpha;
@@ -358,7 +358,7 @@ void_t FilteringEdgeChromaV (SDeblockingFilter* pFilter, uint8_t* pPixCb, uint8_ · 10 unmodified lines
358 return;358 return;
359}359}
360 360
361void_t FilteringEdgeChromaIntraH (SDeblockingFilter* pFilter, uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride,361void FilteringEdgeChromaIntraH (SDeblockingFilter* pFilter, uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride,
362 uint8_t* pBS) {362 uint8_t* pBS) {
363 int32_t iIndexA;363 int32_t iIndexA;
364 int32_t iAlpha;364 int32_t iAlpha;
@@ -373,7 +373,7 @@ void_t FilteringEdgeChromaIntraH (SDeblockingFilter* pFilter, uint8_t* pPixCb, u · 8 unmodified lines
373 return;373 return;
374}374}
375 375
376void_t FilteringEdgeChromaIntraV (SDeblockingFilter* pFilter, uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride,376void FilteringEdgeChromaIntraV (SDeblockingFilter* pFilter, uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride,
377 uint8_t* pBS) {377 uint8_t* pBS) {
378 int32_t iIndexA;378 int32_t iIndexA;
379 int32_t iAlpha;379 int32_t iAlpha;
@@ -389,7 +389,7 @@ void_t FilteringEdgeChromaIntraV (SDeblockingFilter* pFilter, uint8_t* pPixCb, u · 9 unmodified lines
389}389}
390 390
391 391
392void_t DeblockingInterMb (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, uint8_t nBS[2][4][4],392void DeblockingInterMb (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, uint8_t nBS[2][4][4],
393 int32_t iBoundryFlag) {393 int32_t iBoundryFlag) {
394 int32_t iMbXyIndex = pCurDqLayer->iMbXyIndex;394 int32_t iMbXyIndex = pCurDqLayer->iMbXyIndex;
395 int32_t iMbX = pCurDqLayer->iMbX;395 int32_t iMbX = pCurDqLayer->iMbX;
@@ -471,7 +471,7 @@ void_t DeblockingInterMb (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, uint · 75 unmodified lines
471 }471 }
472}472}
473 473
474void_t FilteringEdgeLumaHV (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, int32_t iBoundryFlag) {474void FilteringEdgeLumaHV (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, int32_t iBoundryFlag) {
475 int32_t iMbXyIndex = pCurDqLayer->iMbXyIndex;475 int32_t iMbXyIndex = pCurDqLayer->iMbXyIndex;
476 int32_t iMbX = pCurDqLayer->iMbX;476 int32_t iMbX = pCurDqLayer->iMbX;
477 int32_t iMbY = pCurDqLayer->iMbY;477 int32_t iMbY = pCurDqLayer->iMbY;
@@ -519,7 +519,7 @@ void_t FilteringEdgeLumaHV (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, in · 41 unmodified lines
519 pFilter->pLoopf->pfLumaDeblockingLT4Ver (&pDestY[ (3 << 2)*iLineSize], iLineSize, iAlpha, iBeta, iTc);519 pFilter->pLoopf->pfLumaDeblockingLT4Ver (&pDestY[ (3 << 2)*iLineSize], iLineSize, iAlpha, iBeta, iTc);
520 }520 }
521}521}
522void_t FilteringEdgeChromaHV (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, int32_t iBoundryFlag) {522void FilteringEdgeChromaHV (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, int32_t iBoundryFlag) {
523 int32_t iMbXyIndex = pCurDqLayer->iMbXyIndex;523 int32_t iMbXyIndex = pCurDqLayer->iMbXyIndex;
524 int32_t iMbX = pCurDqLayer->iMbX;524 int32_t iMbX = pCurDqLayer->iMbX;
525 int32_t iMbY = pCurDqLayer->iMbY;525 int32_t iMbY = pCurDqLayer->iMbY;
@@ -566,12 +566,12 @@ void_t FilteringEdgeChromaHV (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, · 40 unmodified lines
566}566}
567 567
568// merge h&v lookup table operation to save performance568// merge h&v lookup table operation to save performance
569void_t DeblockingIntraMb (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, int32_t iBoundryFlag) {569void DeblockingIntraMb (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, int32_t iBoundryFlag) {
570 FilteringEdgeLumaHV (pCurDqLayer, pFilter, iBoundryFlag);570 FilteringEdgeLumaHV (pCurDqLayer, pFilter, iBoundryFlag);
571 FilteringEdgeChromaHV (pCurDqLayer, pFilter, iBoundryFlag);571 FilteringEdgeChromaHV (pCurDqLayer, pFilter, iBoundryFlag);
572}572}
573 573
574void_t WelsDeblockingMb (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, int32_t iBoundryFlag) {574void WelsDeblockingMb (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, int32_t iBoundryFlag) {
575 uint8_t nBS[2][4][4] = { 0 };575 uint8_t nBS[2][4][4] = { 0 };
576 576
577 int32_t iMbXyIndex = pCurDqLayer->iMbXyIndex;577 int32_t iMbXyIndex = pCurDqLayer->iMbXyIndex;
@@ -623,7 +623,7 @@ void_t WelsDeblockingMb (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, int32 · 45 unmodified lines
623 *623 *
624 * \return NONE624 * \return NONE
625 */625 */
626void_t WelsDeblockingFilterSlice (PWelsDecoderContext pCtx, PDeblockingFilterMbFunc pDeblockMb) {626void WelsDeblockingFilterSlice (PWelsDecoderContext pCtx, PDeblockingFilterMbFunc pDeblockMb) {
627 PDqLayer pCurDqLayer = pCtx->pCurDqLayer;627 PDqLayer pCurDqLayer = pCtx->pCurDqLayer;
628 PSliceHeaderExt pSliceHeaderExt = &pCurDqLayer->sLayerInfo.sSliceInLayer.sSliceHeaderExt;628 PSliceHeaderExt pSliceHeaderExt = &pCurDqLayer->sLayerInfo.sSliceInLayer.sSliceHeaderExt;
629 int32_t iMbWidth = pCurDqLayer->iMbWidth;629 int32_t iMbWidth = pCurDqLayer->iMbWidth;
@@ -694,7 +694,7 @@ void_t WelsDeblockingFilterSlice (PWelsDecoderContext pCtx, PDeblockingFilterMbF · 64 unmodified lines
694 * \return NONE694 * \return NONE
695 */695 */
696 696
697void_t DeblockingInit (SDeblockingFunc* pFunc, int32_t iCpu) {697void DeblockingInit (SDeblockingFunc* pFunc, int32_t iCpu) {
698 pFunc->pfLumaDeblockingLT4Ver = DeblockLumaLt4V_c;698 pFunc->pfLumaDeblockingLT4Ver = DeblockLumaLt4V_c;
699 pFunc->pfLumaDeblockingEQ4Ver = DeblockLumaEq4V_c;699 pFunc->pfLumaDeblockingEQ4Ver = DeblockLumaEq4V_c;
700 pFunc->pfLumaDeblockingLT4Hor = DeblockLumaLt4H_c;700 pFunc->pfLumaDeblockingLT4Hor = DeblockLumaLt4H_c;

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