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/decoder_core.cpp (1 of 55 files). Show all

Unified · Split

codec/decoder/core/src/decoder_core.cpp+16−16
@@ -118,7 +118,7 @@ inline uint8_t GetTargetDqId (uint8_t uiTargetDqId, SDecodingParam* psParam) { · 117 unmodified lines
118118 }
119119
120120
121−inline void_t HandleReferenceLostL0 (PWelsDecoderContext pCtx, PNalUnit pCurNal) {
121+inline void HandleReferenceLostL0 (PWelsDecoderContext pCtx, PNalUnit pCurNal) {
122122 if (0 == pCurNal->sNalHeaderExt.uiTemporalId) {
123123 pCtx->bReferenceLostAtT0Flag = true;
124124 }
@@ -130,7 +130,7 @@ inline void_t HandleReferenceLostL0 (PWelsDecoderContext pCtx, PNalUnit pCurN · 5 unmodified lines
130130 pCtx->iErrorCode |= dsBitstreamError;
131131 }
132132
133−inline void_t HandleReferenceLost (PWelsDecoderContext pCtx, PNalUnit pCurNal) {
133+inline void HandleReferenceLost (PWelsDecoderContext pCtx, PNalUnit pCurNal) {
134134 if ((0 == pCurNal->sNalHeaderExt.uiTemporalId) || (1 == pCurNal->sNalHeaderExt.uiTemporalId)) {
135135 pCtx->bReferenceLostAtT0Flag = true;
136136 }
@@ -309,7 +309,7 @@ int32_t WelsInitMemory (PWelsDecoderContext pCtx) { · 172 unmodified lines
309309 * Free memory introduced in WelsInitMemory at destruction of decoder.
310310 *
311311 */
312−void_t WelsFreeMemory (PWelsDecoderContext pCtx) {
312+void WelsFreeMemory (PWelsDecoderContext pCtx) {
313313 if (pCtx == NULL)
314314 return;
315315
@@ -337,7 +337,7 @@ void_t WelsFreeMemory (PWelsDecoderContext pCtx) { · 21 unmodified lines
337337 * pNal: target NALUnit ptr
338338 * pSrc: NAL Unit bitstream
339339 */
340−void_t DecodeNalHeaderExt (PNalUnit pNal, uint8_t* pSrc) {
340+void DecodeNalHeaderExt (PNalUnit pNal, uint8_t* pSrc) {
341341 PNalUnitHeaderExt pHeaderExt = &pNal->sNalHeaderExt;
342342
343343 uint8_t uiCurByte = *pSrc;
@@ -1029,7 +1029,7 @@ int32_t InitialDqLayersContext (PWelsDecoderContext pCtx, const int32_t kiMaxWid · 685 unmodified lines
10291029 return ERR_NONE;
10301030 }
10311031
1032−void_t UninitialDqLayersContext (PWelsDecoderContext pCtx) {
1032+void UninitialDqLayersContext (PWelsDecoderContext pCtx) {
10331033 int32_t i = 0;
10341034 int32_t j = 0;
10351035
@@ -1183,7 +1183,7 @@ void_t UninitialDqLayersContext (PWelsDecoderContext pCtx) { · 147 unmodified lines
11831183 pCtx->bInitialDqLayersMem = false;
11841184 }
11851185
1186−void_t ResetCurrentAccessUnit (PWelsDecoderContext pCtx) {
1186+void ResetCurrentAccessUnit (PWelsDecoderContext pCtx) {
11871187 PAccessUnit pCurAu = pCtx->pAccessUnitList;
11881188
11891189 pCurAu->uiEndPos = 0;
@@ -1211,7 +1211,7 @@ void_t ResetCurrentAccessUnit (PWelsDecoderContext pCtx) { · 21 unmodified lines
12111211 * \author
12121212 * \history 11/16/2009
12131213 */
1214−void_t ForceResetCurrentAccessUnit (PAccessUnit pAu) {
1214+void ForceResetCurrentAccessUnit (PAccessUnit pAu) {
12151215 uint32_t uiSucAuIdx = pAu->uiEndPos + 1;
12161216 uint32_t uiCurAuIdx = 0;
12171217
@@ -1235,13 +1235,13 @@ void_t ForceResetCurrentAccessUnit (PAccessUnit pAu) { · 17 unmodified lines
12351235 }
12361236
12371237 //clear current corrupted NAL from pNalUnitsList
1238−void_t ForceClearCurrentNal (PAccessUnit pAu) {
1238+void ForceClearCurrentNal (PAccessUnit pAu) {
12391239 if (pAu->uiAvailUnitsNum > 0)
12401240 -- pAu->uiAvailUnitsNum;
12411241 }
12421242
12431243
1244−void_t CheckAvailNalUnitsListContinuity (PWelsDecoderContext pCtx, int32_t iStartIdx, int32_t iEndIdx) {
1244+void CheckAvailNalUnitsListContinuity (PWelsDecoderContext pCtx, int32_t iStartIdx, int32_t iEndIdx) {
12451245 PAccessUnit pCurAu = pCtx->pAccessUnitList;
12461246
12471247 uint8_t uiLastNuDependencyId, uiLastNuLayerDqId;
@@ -1284,7 +1284,7 @@ void_t CheckAvailNalUnitsListContinuity (PWelsDecoderContext pCtx, int32_t iStar · 36 unmodified lines
12841284
12851285 //main purpose: to support multi-slice and to include all slice which have the same uiDependencyId, uiQualityId and frame_num
12861286 //for single slice, pIdxNoInterLayerPred SHOULD NOT be modified
1287−void_t RefineIdxNoInterLayerPred (PAccessUnit pCurAu, int32_t* pIdxNoInterLayerPred) {
1287+void RefineIdxNoInterLayerPred (PAccessUnit pCurAu, int32_t* pIdxNoInterLayerPred) {
12881288 int32_t iLastNalDependId = pCurAu->pNalUnitsList[*pIdxNoInterLayerPred]->sNalHeaderExt.uiDependencyId;
12891289 int32_t iLastNalQualityId = pCurAu->pNalUnitsList[*pIdxNoInterLayerPred]->sNalHeaderExt.uiQualityId;
12901290 uint8_t uiLastNalTId = pCurAu->pNalUnitsList[*pIdxNoInterLayerPred]->sNalHeaderExt.uiTemporalId;
@@ -1471,7 +1471,7 @@ bool CheckIntegrityNalUnitsList (PWelsDecoderContext pCtx) { · 180 unmodified lines
14711471 return true;
14721472 }
14731473
1474−void_t CheckOnlyOneLayerInAu (PWelsDecoderContext pCtx) {
1474+void CheckOnlyOneLayerInAu (PWelsDecoderContext pCtx) {
14751475 PAccessUnit pCurAu = pCtx->pAccessUnitList;
14761476
14771477 int32_t iEndIdx = pCurAu->uiEndPos;
@@ -1524,7 +1524,7 @@ int32_t WelsDecodeAccessUnitStart (PWelsDecoderContext pCtx) { · 46 unmodified lines
15241524 return ERR_NONE;
15251525 }
15261526
1527−void_t WelsDecodeAccessUnitEnd (PWelsDecoderContext pCtx) {
1527+void WelsDecodeAccessUnitEnd (PWelsDecoderContext pCtx) {
15281528 // uninitialize context of current access unit and rbsp buffer clean
15291529 ResetCurrentAccessUnit (pCtx);
15301530 }
@@ -1596,7 +1596,7 @@ int32_t ConstructAccessUnit (PWelsDecoderContext pCtx, uint8_t** ppDst, SBufferI · 65 unmodified lines
15961596 return 0;
15971597 }
15981598
1599−static inline void_t InitDqLayerInfo (PDqLayer pDqLayer, PLayerInfo pLayerInfo, PNalUnit pNalUnit, PPicture pPicDec) {
1599+static inline void InitDqLayerInfo (PDqLayer pDqLayer, PLayerInfo pLayerInfo, PNalUnit pNalUnit, PPicture pPicDec) {
16001600 PNalUnitHeaderExt pNalHdrExt = &pNalUnit->sNalHeaderExt;
16011601 PSliceHeaderExt pShExt = &pNalUnit->sNalData.sVclNal.sSliceHeaderExt;
16021602 PSliceHeader pSh = &pShExt->sSliceHeader;
@@ -1634,7 +1634,7 @@ static inline void_t InitDqLayerInfo (PDqLayer pDqLayer, PLayerInfo pLayerInfo, · 31 unmodified lines
16341634 pDqLayer->bUseRefBasePicFlag = pNalHdrExt->bUseRefBasePicFlag;
16351635 }
16361636
1637−void_t WelsDqLayerDecodeStart (PWelsDecoderContext pCtx, PNalUnit pCurNal, PSps pSps, PPps pPps) {
1637+void WelsDqLayerDecodeStart (PWelsDecoderContext pCtx, PNalUnit pCurNal, PSps pSps, PPps pPps) {
16381638 SNalUnitHeader* pNalHdr = &pCurNal->sNalHeaderExt.sNalUnitHeader;
16391639 PSliceHeader pSh = &pCurNal->sNalData.sVclNal.sSliceHeaderExt.sSliceHeader;
16401640
@@ -1661,7 +1661,7 @@ int32_t InitRefPicList (PWelsDecoderContext pCtx, const uint8_t kuiNRi, const bo · 20 unmodified lines
16611661 return iRet;
16621662 }
16631663
1664−void_t InitCurDqLayerData (PWelsDecoderContext pCtx, PDqLayer pCurDq) {
1664+void InitCurDqLayerData (PWelsDecoderContext pCtx, PDqLayer pCurDq) {
16651665 if (NULL != pCtx && NULL != pCurDq) {
16661666 pCurDq->pCsData[0] = pCtx->pCsListXchg[0][0];
16671667 pCurDq->pCsData[1] = pCtx->pCsListXchg[0][1];
@@ -1691,7 +1691,7 @@ void_t InitCurDqLayerData (PWelsDecoderContext pCtx, PDqLayer pCurDq) { · 23 unmodified lines
16911691
16921692 // added to reset state of parameter sets to waiting successive incoming IDR, 6/4/2010
16931693 // It will be called in case packets lost/ broken and decoded failed at temporal level 0
1694−void_t ResetParameterSetsState (PWelsDecoderContext pCtx) {
1694+void ResetParameterSetsState (PWelsDecoderContext pCtx) {
16951695 pCtx->bSpsExistAheadFlag = false;
16961696 pCtx->bSubspsExistAheadFlag = false;
16971697 pCtx->bPpsExistAheadFlag = false;

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