History

Use void instead of void_t

There's really no reason for adding a typedef for void.

Martin Storsjö committed 12 years ago

Commit 7b96c671 parent 2b77fe755 files · +400 −404Browse files

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

Unified · Split

codec/decoder/core/src/deblocking.cpp+17−17
@@ -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 ENFORCE_STACK_ALIGN_1D (uint8_t, uiBsx3, 4, 4);148 ENFORCE_STACK_ALIGN_1D (uint8_t, uiBsx3, 4, 4);
149 149
@@ -177,7 +177,7 @@ void_t inline DeblockingBSInsideMBAvsbase (int8_t* pNnzTab, uint8_t nBS[2][4][4] · 27 unmodified lines
177 177
178}178}
179 179
180void_t static inline DeblockingBSInsideMBNormal (PDqLayer pCurDqLayer, uint8_t nBS[2][4][4], int8_t* pNnzTab,180void static inline DeblockingBSInsideMBNormal (PDqLayer pCurDqLayer, uint8_t nBS[2][4][4], int8_t* pNnzTab,
181 int32_t iMbXy) {181 int32_t iMbXy) {
182 uint32_t uiNnz32b0, uiNnz32b1, uiNnz32b2, uiNnz32b3;182 uint32_t uiNnz32b0, uiNnz32b1, uiNnz32b2, uiNnz32b3;
183 int8_t* iRefIndex = pCurDqLayer->pRefIndex[LIST_0][iMbXy];183 int8_t* iRefIndex = pCurDqLayer->pRefIndex[LIST_0][iMbXy];
@@ -265,7 +265,7 @@ int32_t DeblockingAvailableNoInterlayer (PDqLayer pCurDqLayer, int32_t iFilterId · 81 unmodified lines
265 return (bLeftFlag << LEFT_FLAG_BIT) | (bTopFlag << TOP_FLAG_BIT);265 return (bLeftFlag << LEFT_FLAG_BIT) | (bTopFlag << TOP_FLAG_BIT);
266}266}
267 267
268void_t FilteringEdgeLumaH (SDeblockingFilter* pFilter, uint8_t* pPix, int32_t iStride, uint8_t* pBS) {268void FilteringEdgeLumaH (SDeblockingFilter* pFilter, uint8_t* pPix, int32_t iStride, uint8_t* pBS) {
269 int32_t iIndexA;269 int32_t iIndexA;
270 int32_t iAlpha;270 int32_t iAlpha;
271 int32_t iBeta;271 int32_t iBeta;
@@ -282,7 +282,7 @@ void_t FilteringEdgeLumaH (SDeblockingFilter* pFilter, uint8_t* pPix, int32_t iS · 10 unmodified lines
282}282}
283 283
284 284
285void_t FilteringEdgeLumaV (SDeblockingFilter* pFilter, uint8_t* pPix, int32_t iStride, uint8_t* pBS) {285void FilteringEdgeLumaV (SDeblockingFilter* pFilter, uint8_t* pPix, int32_t iStride, uint8_t* pBS) {
286 int32_t iIndexA;286 int32_t iIndexA;
287 int32_t iAlpha;287 int32_t iAlpha;
288 int32_t iBeta;288 int32_t iBeta;
@@ -299,7 +299,7 @@ void_t FilteringEdgeLumaV (SDeblockingFilter* pFilter, uint8_t* pPix, int32_t iS · 10 unmodified lines
299}299}
300 300
301 301
302void_t FilteringEdgeLumaIntraH (SDeblockingFilter* pFilter, uint8_t* pPix, int32_t iStride, uint8_t* pBS) {302void FilteringEdgeLumaIntraH (SDeblockingFilter* pFilter, uint8_t* pPix, int32_t iStride, uint8_t* pBS) {
303 int32_t iIndexA;303 int32_t iIndexA;
304 int32_t iAlpha;304 int32_t iAlpha;
305 int32_t iBeta;305 int32_t iBeta;
@@ -313,7 +313,7 @@ void_t FilteringEdgeLumaIntraH (SDeblockingFilter* pFilter, uint8_t* pPix, int32 · 7 unmodified lines
313 return;313 return;
314}314}
315 315
316void_t FilteringEdgeLumaIntraV (SDeblockingFilter* pFilter, uint8_t* pPix, int32_t iStride, uint8_t* pBS) {316void FilteringEdgeLumaIntraV (SDeblockingFilter* pFilter, uint8_t* pPix, int32_t iStride, uint8_t* pBS) {
317 int32_t iIndexA;317 int32_t iIndexA;
318 int32_t iAlpha;318 int32_t iAlpha;
319 int32_t iBeta;319 int32_t iBeta;
@@ -326,7 +326,7 @@ void_t FilteringEdgeLumaIntraV (SDeblockingFilter* pFilter, uint8_t* pPix, int32 · 6 unmodified lines
326 }326 }
327 return;327 return;
328}328}
329void_t FilteringEdgeChromaH (SDeblockingFilter* pFilter, uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride,329void FilteringEdgeChromaH (SDeblockingFilter* pFilter, uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride,
330 uint8_t* pBS) {330 uint8_t* pBS) {
331 int32_t iIndexA;331 int32_t iIndexA;
332 int32_t iAlpha;332 int32_t iAlpha;
@@ -342,7 +342,7 @@ void_t FilteringEdgeChromaH (SDeblockingFilter* pFilter, uint8_t* pPixCb, uint8_ · 9 unmodified lines
342 }342 }
343 return;343 return;
344}344}
345void_t FilteringEdgeChromaV (SDeblockingFilter* pFilter, uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride,345void FilteringEdgeChromaV (SDeblockingFilter* pFilter, uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride,
346 uint8_t* pBS) {346 uint8_t* pBS) {
347 int32_t iIndexA;347 int32_t iIndexA;
348 int32_t iAlpha;348 int32_t iAlpha;
@@ -359,7 +359,7 @@ void_t FilteringEdgeChromaV (SDeblockingFilter* pFilter, uint8_t* pPixCb, uint8_ · 10 unmodified lines
359 return;359 return;
360}360}
361 361
362void_t FilteringEdgeChromaIntraH (SDeblockingFilter* pFilter, uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride,362void FilteringEdgeChromaIntraH (SDeblockingFilter* pFilter, uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride,
363 uint8_t* pBS) {363 uint8_t* pBS) {
364 int32_t iIndexA;364 int32_t iIndexA;
365 int32_t iAlpha;365 int32_t iAlpha;
@@ -374,7 +374,7 @@ void_t FilteringEdgeChromaIntraH (SDeblockingFilter* pFilter, uint8_t* pPixCb, u · 8 unmodified lines
374 return;374 return;
375}375}
376 376
377void_t FilteringEdgeChromaIntraV (SDeblockingFilter* pFilter, uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride,377void FilteringEdgeChromaIntraV (SDeblockingFilter* pFilter, uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride,
378 uint8_t* pBS) {378 uint8_t* pBS) {
379 int32_t iIndexA;379 int32_t iIndexA;
380 int32_t iAlpha;380 int32_t iAlpha;
@@ -390,7 +390,7 @@ void_t FilteringEdgeChromaIntraV (SDeblockingFilter* pFilter, uint8_t* pPixCb, u · 9 unmodified lines
390}390}
391 391
392 392
393void_t DeblockingInterMb (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, uint8_t nBS[2][4][4],393void DeblockingInterMb (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, uint8_t nBS[2][4][4],
394 int32_t iBoundryFlag) {394 int32_t iBoundryFlag) {
395 int32_t iMbXyIndex = pCurDqLayer->iMbXyIndex;395 int32_t iMbXyIndex = pCurDqLayer->iMbXyIndex;
396 int32_t iMbX = pCurDqLayer->iMbX;396 int32_t iMbX = pCurDqLayer->iMbX;
@@ -472,7 +472,7 @@ void_t DeblockingInterMb (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, uint · 75 unmodified lines
472 }472 }
473}473}
474 474
475void_t FilteringEdgeLumaHV (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, int32_t iBoundryFlag) {475void FilteringEdgeLumaHV (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, int32_t iBoundryFlag) {
476 int32_t iMbXyIndex = pCurDqLayer->iMbXyIndex;476 int32_t iMbXyIndex = pCurDqLayer->iMbXyIndex;
477 int32_t iMbX = pCurDqLayer->iMbX;477 int32_t iMbX = pCurDqLayer->iMbX;
478 int32_t iMbY = pCurDqLayer->iMbY;478 int32_t iMbY = pCurDqLayer->iMbY;
@@ -520,7 +520,7 @@ void_t FilteringEdgeLumaHV (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, in · 41 unmodified lines
520 pFilter->pLoopf->pfLumaDeblockingLT4Ver (&pDestY[ (3 << 2)*iLineSize], iLineSize, iAlpha, iBeta, iTc);520 pFilter->pLoopf->pfLumaDeblockingLT4Ver (&pDestY[ (3 << 2)*iLineSize], iLineSize, iAlpha, iBeta, iTc);
521 }521 }
522}522}
523void_t FilteringEdgeChromaHV (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, int32_t iBoundryFlag) {523void FilteringEdgeChromaHV (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, int32_t iBoundryFlag) {
524 int32_t iMbXyIndex = pCurDqLayer->iMbXyIndex;524 int32_t iMbXyIndex = pCurDqLayer->iMbXyIndex;
525 int32_t iMbX = pCurDqLayer->iMbX;525 int32_t iMbX = pCurDqLayer->iMbX;
526 int32_t iMbY = pCurDqLayer->iMbY;526 int32_t iMbY = pCurDqLayer->iMbY;
@@ -567,12 +567,12 @@ void_t FilteringEdgeChromaHV (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, · 40 unmodified lines
567}567}
568 568
569// merge h&v lookup table operation to save performance569// merge h&v lookup table operation to save performance
570void_t DeblockingIntraMb (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, int32_t iBoundryFlag) {570void DeblockingIntraMb (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, int32_t iBoundryFlag) {
571 FilteringEdgeLumaHV (pCurDqLayer, pFilter, iBoundryFlag);571 FilteringEdgeLumaHV (pCurDqLayer, pFilter, iBoundryFlag);
572 FilteringEdgeChromaHV (pCurDqLayer, pFilter, iBoundryFlag);572 FilteringEdgeChromaHV (pCurDqLayer, pFilter, iBoundryFlag);
573}573}
574 574
575void_t WelsDeblockingMb (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, int32_t iBoundryFlag) {575void WelsDeblockingMb (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, int32_t iBoundryFlag) {
576 uint8_t nBS[2][4][4] = { 0 };576 uint8_t nBS[2][4][4] = { 0 };
577 577
578 int32_t iMbXyIndex = pCurDqLayer->iMbXyIndex;578 int32_t iMbXyIndex = pCurDqLayer->iMbXyIndex;
@@ -624,7 +624,7 @@ void_t WelsDeblockingMb (PDqLayer pCurDqLayer, PDeblockingFilter pFilter, int32 · 45 unmodified lines
624 *624 *
625 * \return NONE625 * \return NONE
626 */626 */
627void_t WelsDeblockingFilterSlice (PWelsDecoderContext pCtx, PDeblockingFilterMbFunc pDeblockMb) {627void WelsDeblockingFilterSlice (PWelsDecoderContext pCtx, PDeblockingFilterMbFunc pDeblockMb) {
628 PDqLayer pCurDqLayer = pCtx->pCurDqLayer;628 PDqLayer pCurDqLayer = pCtx->pCurDqLayer;
629 PSliceHeaderExt pSliceHeaderExt = &pCurDqLayer->sLayerInfo.sSliceInLayer.sSliceHeaderExt;629 PSliceHeaderExt pSliceHeaderExt = &pCurDqLayer->sLayerInfo.sSliceInLayer.sSliceHeaderExt;
630 int32_t iMbWidth = pCurDqLayer->iMbWidth;630 int32_t iMbWidth = pCurDqLayer->iMbWidth;
@@ -695,7 +695,7 @@ void_t WelsDeblockingFilterSlice (PWelsDecoderContext pCtx, PDeblockingFilterMbF · 64 unmodified lines
695 * \return NONE695 * \return NONE
696 */696 */
697 697
698void_t DeblockingInit (SDeblockingFunc* pFunc, int32_t iCpu) {698void DeblockingInit (SDeblockingFunc* pFunc, int32_t iCpu) {
699 pFunc->pfLumaDeblockingLT4Ver = DeblockLumaLt4V_c;699 pFunc->pfLumaDeblockingLT4Ver = DeblockLumaLt4V_c;
700 pFunc->pfLumaDeblockingEQ4Ver = DeblockLumaEq4V_c;700 pFunc->pfLumaDeblockingEQ4Ver = DeblockLumaEq4V_c;
701 pFunc->pfLumaDeblockingLT4Hor = DeblockLumaLt4H_c;701 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