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
143143 tc[3] = g_kiTc0Table(iIndexA)[pBS[3]] + bChroma;\
144144 }
145145
146−void_t inline DeblockingBSInsideMBAvsbase (int8_t* pNnzTab, uint8_t nBS[2][4][4], int32_t iLShiftFactor) {
146+void inline DeblockingBSInsideMBAvsbase (int8_t* pNnzTab, uint8_t nBS[2][4][4], int32_t iLShiftFactor) {
147147 uint32_t uiNnz32b0, uiNnz32b1, uiNnz32b2, uiNnz32b3;
148148
149149 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
172172
173173 }
174174
175−void_t static inline DeblockingBSInsideMBNormal (PDqLayer pCurDqLayer, uint8_t nBS[2][4][4], int8_t* pNnzTab,
175+void static inline DeblockingBSInsideMBNormal (PDqLayer pCurDqLayer, uint8_t nBS[2][4][4], int8_t* pNnzTab,
176176 int32_t iMbXy) {
177177 uint32_t uiNnz32b0, uiNnz32b1, uiNnz32b2, uiNnz32b3;
178178 int8_t* iRefIndex = pCurDqLayer->pRefIndex[LIST_0][iMbXy];
@@ -251,8 +251,8 @@ int32_t DeblockingAvailableNoInterlayer (PDqLayer pCurDqLayer, int32_t iFilterId · 72 unmodified lines
251251 int32_t iMbY = pCurDqLayer->iMbY;
252252 int32_t iMbX = pCurDqLayer->iMbX;
253253 int32_t iMbXy = pCurDqLayer->iMbXyIndex;
254− BOOL_T bLeftFlag = FALSE;
255− BOOL_T bTopFlag = FALSE;
254+ bool bLeftFlag = false;
255+ bool bTopFlag = false;
256256
257257 if (2 == iFilterIdc) {
258258 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
264264 return (bLeftFlag << LEFT_FLAG_BIT) | (bTopFlag << TOP_FLAG_BIT);
265265 }
266266
267−void_t FilteringEdgeLumaH (SDeblockingFilter* pFilter, uint8_t* pPix, int32_t iStride, uint8_t* pBS) {
267+void FilteringEdgeLumaH (SDeblockingFilter* pFilter, uint8_t* pPix, int32_t iStride, uint8_t* pBS) {
268268 int32_t iIndexA;
269269 int32_t iAlpha;
270270 int32_t iBeta;
@@ -281,7 +281,7 @@ void_t FilteringEdgeLumaH (SDeblockingFilter* pFilter, uint8_t* pPix, int32_t iS · 10 unmodified lines
281281 }
282282
283283
284−void_t FilteringEdgeLumaV (SDeblockingFilter* pFilter, uint8_t* pPix, int32_t iStride, uint8_t* pBS) {
284+void FilteringEdgeLumaV (SDeblockingFilter* pFilter, uint8_t* pPix, int32_t iStride, uint8_t* pBS) {
285285 int32_t iIndexA;
286286 int32_t iAlpha;
287287 int32_t iBeta;
@@ -298,7 +298,7 @@ void_t FilteringEdgeLumaV (SDeblockingFilter* pFilter, uint8_t* pPix, int32_t iS · 10 unmodified lines
298298 }
299299
300300
301−void_t FilteringEdgeLumaIntraH (SDeblockingFilter* pFilter, uint8_t* pPix, int32_t iStride, uint8_t* pBS) {
301+void FilteringEdgeLumaIntraH (SDeblockingFilter* pFilter, uint8_t* pPix, int32_t iStride, uint8_t* pBS) {
302302 int32_t iIndexA;
303303 int32_t iAlpha;
304304 int32_t iBeta;
@@ -312,7 +312,7 @@ void_t FilteringEdgeLumaIntraH (SDeblockingFilter* pFilter, uint8_t* pPix, int32 · 7 unmodified lines
312312 return;
313313 }
314314
315−void_t FilteringEdgeLumaIntraV (SDeblockingFilter* pFilter, uint8_t* pPix, int32_t iStride, uint8_t* pBS) {
315+void FilteringEdgeLumaIntraV (SDeblockingFilter* pFilter, uint8_t* pPix, int32_t iStride, uint8_t* pBS) {
316316 int32_t iIndexA;
317317 int32_t iAlpha;
318318 int32_t iBeta;
@@ -325,7 +325,7 @@ void_t FilteringEdgeLumaIntraV (SDeblockingFilter* pFilter, uint8_t* pPix, int32 · 6 unmodified lines
325325 }
326326 return;
327327 }
328−void_t FilteringEdgeChromaH (SDeblockingFilter* pFilter, uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride,
328+void FilteringEdgeChromaH (SDeblockingFilter* pFilter, uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride,
329329 uint8_t* pBS) {
330330 int32_t iIndexA;
331331 int32_t iAlpha;
@@ -341,7 +341,7 @@ void_t FilteringEdgeChromaH (SDeblockingFilter* pFilter, uint8_t* pPixCb, uint8_ · 9 unmodified lines
341341 }
342342 return;
343343 }
344−void_t FilteringEdgeChromaV (SDeblockingFilter* pFilter, uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride,
344+void FilteringEdgeChromaV (SDeblockingFilter* pFilter, uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride,
345345 uint8_t* pBS) {
346346 int32_t iIndexA;
347347 int32_t iAlpha;
@@ -358,7 +358,7 @@ void_t FilteringEdgeChromaV (SDeblockingFilter* pFilter, uint8_t* pPixCb, uint8_ · 10 unmodified lines
358358 return;
359359 }
360360
361−void_t FilteringEdgeChromaIntraH (SDeblockingFilter* pFilter, uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride,
361+void FilteringEdgeChromaIntraH (SDeblockingFilter* pFilter, uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride,
362362 uint8_t* pBS) {
363363 int32_t iIndexA;
364364 int32_t iAlpha;
@@ -373,7 +373,7 @@ void_t FilteringEdgeChromaIntraH (SDeblockingFilter* pFilter, uint8_t* pPixCb, u · 8 unmodified lines
373373 return;
374374 }
375375
376−void_t FilteringEdgeChromaIntraV (SDeblockingFilter* pFilter, uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride,
376+void FilteringEdgeChromaIntraV (SDeblockingFilter* pFilter, uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride,
377377 uint8_t* pBS) {
378378 int32_t iIndexA;
379379 int32_t iAlpha;
@@ -389,7 +389,7 @@ void_t FilteringEdgeChromaIntraV (SDeblockingFilter* pFilter, uint8_t* pPixCb, u · 9 unmodified lines
389389 }
390390
391391
392−void_t DeblockingInterMb (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, uint8_t nBS[2][4][4],
392+void DeblockingInterMb (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, uint8_t nBS[2][4][4],
393393 int32_t iBoundryFlag) {
394394 int32_t iMbXyIndex = pCurDqLayer->iMbXyIndex;
395395 int32_t iMbX = pCurDqLayer->iMbX;
@@ -471,7 +471,7 @@ void_t DeblockingInterMb (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, uint · 75 unmodified lines
471471 }
472472 }
473473
474−void_t FilteringEdgeLumaHV (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, int32_t iBoundryFlag) {
474+void FilteringEdgeLumaHV (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, int32_t iBoundryFlag) {
475475 int32_t iMbXyIndex = pCurDqLayer->iMbXyIndex;
476476 int32_t iMbX = pCurDqLayer->iMbX;
477477 int32_t iMbY = pCurDqLayer->iMbY;
@@ -519,7 +519,7 @@ void_t FilteringEdgeLumaHV (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, in · 41 unmodified lines
519519 pFilter->pLoopf->pfLumaDeblockingLT4Ver (&pDestY[ (3 << 2)*iLineSize], iLineSize, iAlpha, iBeta, iTc);
520520 }
521521 }
522−void_t FilteringEdgeChromaHV (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, int32_t iBoundryFlag) {
522+void FilteringEdgeChromaHV (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, int32_t iBoundryFlag) {
523523 int32_t iMbXyIndex = pCurDqLayer->iMbXyIndex;
524524 int32_t iMbX = pCurDqLayer->iMbX;
525525 int32_t iMbY = pCurDqLayer->iMbY;
@@ -566,12 +566,12 @@ void_t FilteringEdgeChromaHV (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, · 40 unmodified lines
566566 }
567567
568568 // merge h&v lookup table operation to save performance
569−void_t DeblockingIntraMb (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, int32_t iBoundryFlag) {
569+void DeblockingIntraMb (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, int32_t iBoundryFlag) {
570570 FilteringEdgeLumaHV (pCurDqLayer, pFilter, iBoundryFlag);
571571 FilteringEdgeChromaHV (pCurDqLayer, pFilter, iBoundryFlag);
572572 }
573573
574−void_t WelsDeblockingMb (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, int32_t iBoundryFlag) {
574+void WelsDeblockingMb (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, int32_t iBoundryFlag) {
575575 uint8_t nBS[2][4][4] = { 0 };
576576
577577 int32_t iMbXyIndex = pCurDqLayer->iMbXyIndex;
@@ -623,7 +623,7 @@ void_t WelsDeblockingMb (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, int32 · 45 unmodified lines
623623 *
624624 * \return NONE
625625 */
626−void_t WelsDeblockingFilterSlice (PWelsDecoderContext pCtx, PDeblockingFilterMbFunc pDeblockMb) {
626+void WelsDeblockingFilterSlice (PWelsDecoderContext pCtx, PDeblockingFilterMbFunc pDeblockMb) {
627627 PDqLayer pCurDqLayer = pCtx->pCurDqLayer;
628628 PSliceHeaderExt pSliceHeaderExt = &pCurDqLayer->sLayerInfo.sSliceInLayer.sSliceHeaderExt;
629629 int32_t iMbWidth = pCurDqLayer->iMbWidth;
@@ -694,7 +694,7 @@ void_t WelsDeblockingFilterSlice (PWelsDecoderContext pCtx, PDeblockingFilterMbF · 64 unmodified lines
694694 * \return NONE
695695 */
696696
697−void_t DeblockingInit (SDeblockingFunc* pFunc, int32_t iCpu) {
697+void DeblockingInit (SDeblockingFunc* pFunc, int32_t iCpu) {
698698 pFunc->pfLumaDeblockingLT4Ver = DeblockLumaLt4V_c;
699699 pFunc->pfLumaDeblockingEQ4Ver = DeblockLumaEq4V_c;
700700 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