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
118}118}
119 119
120 120
121inline void_t HandleReferenceLostL0 (PWelsDecoderContext pCtx, PNalUnit pCurNal) {121inline void HandleReferenceLostL0 (PWelsDecoderContext pCtx, PNalUnit pCurNal) {
122 if (0 == pCurNal->sNalHeaderExt.uiTemporalId) {122 if (0 == pCurNal->sNalHeaderExt.uiTemporalId) {
123 pCtx->bReferenceLostAtT0Flag = true;123 pCtx->bReferenceLostAtT0Flag = true;
124 }124 }
@@ -130,7 +130,7 @@ inline void_t HandleReferenceLostL0 (PWelsDecoderContext pCtx, PNalUnit pCurN · 5 unmodified lines
130 pCtx->iErrorCode |= dsBitstreamError;130 pCtx->iErrorCode |= dsBitstreamError;
131}131}
132 132
133inline void_t HandleReferenceLost (PWelsDecoderContext pCtx, PNalUnit pCurNal) {133inline void HandleReferenceLost (PWelsDecoderContext pCtx, PNalUnit pCurNal) {
134 if ((0 == pCurNal->sNalHeaderExt.uiTemporalId) || (1 == pCurNal->sNalHeaderExt.uiTemporalId)) {134 if ((0 == pCurNal->sNalHeaderExt.uiTemporalId) || (1 == pCurNal->sNalHeaderExt.uiTemporalId)) {
135 pCtx->bReferenceLostAtT0Flag = true;135 pCtx->bReferenceLostAtT0Flag = true;
136 }136 }
@@ -309,7 +309,7 @@ int32_t WelsInitMemory (PWelsDecoderContext pCtx) { · 172 unmodified lines
309 * Free memory introduced in WelsInitMemory at destruction of decoder.309 * Free memory introduced in WelsInitMemory at destruction of decoder.
310 *310 *
311 */311 */
312void_t WelsFreeMemory (PWelsDecoderContext pCtx) {312void WelsFreeMemory (PWelsDecoderContext pCtx) {
313 if (pCtx == NULL)313 if (pCtx == NULL)
314 return;314 return;
315 315
@@ -337,7 +337,7 @@ void_t WelsFreeMemory (PWelsDecoderContext pCtx) { · 21 unmodified lines
337 * pNal: target NALUnit ptr337 * pNal: target NALUnit ptr
338 * pSrc: NAL Unit bitstream338 * pSrc: NAL Unit bitstream
339 */339 */
340void_t DecodeNalHeaderExt (PNalUnit pNal, uint8_t* pSrc) {340void DecodeNalHeaderExt (PNalUnit pNal, uint8_t* pSrc) {
341 PNalUnitHeaderExt pHeaderExt = &pNal->sNalHeaderExt;341 PNalUnitHeaderExt pHeaderExt = &pNal->sNalHeaderExt;
342 342
343 uint8_t uiCurByte = *pSrc;343 uint8_t uiCurByte = *pSrc;
@@ -1029,7 +1029,7 @@ int32_t InitialDqLayersContext (PWelsDecoderContext pCtx, const int32_t kiMaxWid · 685 unmodified lines
1029 return ERR_NONE;1029 return ERR_NONE;
1030}1030}
1031 1031
1032void_t UninitialDqLayersContext (PWelsDecoderContext pCtx) {1032void UninitialDqLayersContext (PWelsDecoderContext pCtx) {
1033 int32_t i = 0;1033 int32_t i = 0;
1034 int32_t j = 0;1034 int32_t j = 0;
1035 1035
@@ -1183,7 +1183,7 @@ void_t UninitialDqLayersContext (PWelsDecoderContext pCtx) { · 147 unmodified lines
1183 pCtx->bInitialDqLayersMem = false;1183 pCtx->bInitialDqLayersMem = false;
1184}1184}
1185 1185
1186void_t ResetCurrentAccessUnit (PWelsDecoderContext pCtx) {1186void ResetCurrentAccessUnit (PWelsDecoderContext pCtx) {
1187 PAccessUnit pCurAu = pCtx->pAccessUnitList;1187 PAccessUnit pCurAu = pCtx->pAccessUnitList;
1188 1188
1189 pCurAu->uiEndPos = 0;1189 pCurAu->uiEndPos = 0;
@@ -1211,7 +1211,7 @@ void_t ResetCurrentAccessUnit (PWelsDecoderContext pCtx) { · 21 unmodified lines
1211 * \author1211 * \author
1212 * \history 11/16/20091212 * \history 11/16/2009
1213 */1213 */
1214void_t ForceResetCurrentAccessUnit (PAccessUnit pAu) {1214void ForceResetCurrentAccessUnit (PAccessUnit pAu) {
1215 uint32_t uiSucAuIdx = pAu->uiEndPos + 1;1215 uint32_t uiSucAuIdx = pAu->uiEndPos + 1;
1216 uint32_t uiCurAuIdx = 0;1216 uint32_t uiCurAuIdx = 0;
1217 1217
@@ -1235,13 +1235,13 @@ void_t ForceResetCurrentAccessUnit (PAccessUnit pAu) { · 17 unmodified lines
1235}1235}
1236 1236
1237//clear current corrupted NAL from pNalUnitsList1237//clear current corrupted NAL from pNalUnitsList
1238void_t ForceClearCurrentNal (PAccessUnit pAu) {1238void ForceClearCurrentNal (PAccessUnit pAu) {
1239 if (pAu->uiAvailUnitsNum > 0)1239 if (pAu->uiAvailUnitsNum > 0)
1240 -- pAu->uiAvailUnitsNum;1240 -- pAu->uiAvailUnitsNum;
1241}1241}
1242 1242
1243 1243
1244void_t CheckAvailNalUnitsListContinuity (PWelsDecoderContext pCtx, int32_t iStartIdx, int32_t iEndIdx) {1244void CheckAvailNalUnitsListContinuity (PWelsDecoderContext pCtx, int32_t iStartIdx, int32_t iEndIdx) {
1245 PAccessUnit pCurAu = pCtx->pAccessUnitList;1245 PAccessUnit pCurAu = pCtx->pAccessUnitList;
1246 1246
1247 uint8_t uiLastNuDependencyId, uiLastNuLayerDqId;1247 uint8_t uiLastNuDependencyId, uiLastNuLayerDqId;
@@ -1284,7 +1284,7 @@ void_t CheckAvailNalUnitsListContinuity (PWelsDecoderContext pCtx, int32_t iStar · 36 unmodified lines
1284 1284
1285//main purpose: to support multi-slice and to include all slice which have the same uiDependencyId, uiQualityId and frame_num1285//main purpose: to support multi-slice and to include all slice which have the same uiDependencyId, uiQualityId and frame_num
1286//for single slice, pIdxNoInterLayerPred SHOULD NOT be modified1286//for single slice, pIdxNoInterLayerPred SHOULD NOT be modified
1287void_t RefineIdxNoInterLayerPred (PAccessUnit pCurAu, int32_t* pIdxNoInterLayerPred) {1287void RefineIdxNoInterLayerPred (PAccessUnit pCurAu, int32_t* pIdxNoInterLayerPred) {
1288 int32_t iLastNalDependId = pCurAu->pNalUnitsList[*pIdxNoInterLayerPred]->sNalHeaderExt.uiDependencyId;1288 int32_t iLastNalDependId = pCurAu->pNalUnitsList[*pIdxNoInterLayerPred]->sNalHeaderExt.uiDependencyId;
1289 int32_t iLastNalQualityId = pCurAu->pNalUnitsList[*pIdxNoInterLayerPred]->sNalHeaderExt.uiQualityId;1289 int32_t iLastNalQualityId = pCurAu->pNalUnitsList[*pIdxNoInterLayerPred]->sNalHeaderExt.uiQualityId;
1290 uint8_t uiLastNalTId = pCurAu->pNalUnitsList[*pIdxNoInterLayerPred]->sNalHeaderExt.uiTemporalId;1290 uint8_t uiLastNalTId = pCurAu->pNalUnitsList[*pIdxNoInterLayerPred]->sNalHeaderExt.uiTemporalId;
@@ -1471,7 +1471,7 @@ bool CheckIntegrityNalUnitsList (PWelsDecoderContext pCtx) { · 180 unmodified lines
1471 return true;1471 return true;
1472}1472}
1473 1473
1474void_t CheckOnlyOneLayerInAu (PWelsDecoderContext pCtx) {1474void CheckOnlyOneLayerInAu (PWelsDecoderContext pCtx) {
1475 PAccessUnit pCurAu = pCtx->pAccessUnitList;1475 PAccessUnit pCurAu = pCtx->pAccessUnitList;
1476 1476
1477 int32_t iEndIdx = pCurAu->uiEndPos;1477 int32_t iEndIdx = pCurAu->uiEndPos;
@@ -1524,7 +1524,7 @@ int32_t WelsDecodeAccessUnitStart (PWelsDecoderContext pCtx) { · 46 unmodified lines
1524 return ERR_NONE;1524 return ERR_NONE;
1525}1525}
1526 1526
1527void_t WelsDecodeAccessUnitEnd (PWelsDecoderContext pCtx) {1527void WelsDecodeAccessUnitEnd (PWelsDecoderContext pCtx) {
1528 // uninitialize context of current access unit and rbsp buffer clean1528 // uninitialize context of current access unit and rbsp buffer clean
1529 ResetCurrentAccessUnit (pCtx);1529 ResetCurrentAccessUnit (pCtx);
1530}1530}
@@ -1596,7 +1596,7 @@ int32_t ConstructAccessUnit (PWelsDecoderContext pCtx, uint8_t** ppDst, SBufferI · 65 unmodified lines
1596 return 0;1596 return 0;
1597}1597}
1598 1598
1599static inline void_t InitDqLayerInfo (PDqLayer pDqLayer, PLayerInfo pLayerInfo, PNalUnit pNalUnit, PPicture pPicDec) {1599static inline void InitDqLayerInfo (PDqLayer pDqLayer, PLayerInfo pLayerInfo, PNalUnit pNalUnit, PPicture pPicDec) {
1600 PNalUnitHeaderExt pNalHdrExt = &pNalUnit->sNalHeaderExt;1600 PNalUnitHeaderExt pNalHdrExt = &pNalUnit->sNalHeaderExt;
1601 PSliceHeaderExt pShExt = &pNalUnit->sNalData.sVclNal.sSliceHeaderExt;1601 PSliceHeaderExt pShExt = &pNalUnit->sNalData.sVclNal.sSliceHeaderExt;
1602 PSliceHeader pSh = &pShExt->sSliceHeader;1602 PSliceHeader pSh = &pShExt->sSliceHeader;
@@ -1634,7 +1634,7 @@ static inline void_t InitDqLayerInfo (PDqLayer pDqLayer, PLayerInfo pLayerInfo, · 31 unmodified lines
1634 pDqLayer->bUseRefBasePicFlag = pNalHdrExt->bUseRefBasePicFlag;1634 pDqLayer->bUseRefBasePicFlag = pNalHdrExt->bUseRefBasePicFlag;
1635}1635}
1636 1636
1637void_t WelsDqLayerDecodeStart (PWelsDecoderContext pCtx, PNalUnit pCurNal, PSps pSps, PPps pPps) {1637void WelsDqLayerDecodeStart (PWelsDecoderContext pCtx, PNalUnit pCurNal, PSps pSps, PPps pPps) {
1638 SNalUnitHeader* pNalHdr = &pCurNal->sNalHeaderExt.sNalUnitHeader;1638 SNalUnitHeader* pNalHdr = &pCurNal->sNalHeaderExt.sNalUnitHeader;
1639 PSliceHeader pSh = &pCurNal->sNalData.sVclNal.sSliceHeaderExt.sSliceHeader;1639 PSliceHeader pSh = &pCurNal->sNalData.sVclNal.sSliceHeaderExt.sSliceHeader;
1640 1640
@@ -1661,7 +1661,7 @@ int32_t InitRefPicList (PWelsDecoderContext pCtx, const uint8_t kuiNRi, const bo · 20 unmodified lines
1661 return iRet;1661 return iRet;
1662}1662}
1663 1663
1664void_t InitCurDqLayerData (PWelsDecoderContext pCtx, PDqLayer pCurDq) {1664void InitCurDqLayerData (PWelsDecoderContext pCtx, PDqLayer pCurDq) {
1665 if (NULL != pCtx && NULL != pCurDq) {1665 if (NULL != pCtx && NULL != pCurDq) {
1666 pCurDq->pCsData[0] = pCtx->pCsListXchg[0][0];1666 pCurDq->pCsData[0] = pCtx->pCsListXchg[0][0];
1667 pCurDq->pCsData[1] = pCtx->pCsListXchg[0][1];1667 pCurDq->pCsData[1] = pCtx->pCsListXchg[0][1];
@@ -1691,7 +1691,7 @@ void_t InitCurDqLayerData (PWelsDecoderContext pCtx, PDqLayer pCurDq) { · 23 unmodified lines
1691 1691
1692// added to reset state of parameter sets to waiting successive incoming IDR, 6/4/20101692// added to reset state of parameter sets to waiting successive incoming IDR, 6/4/2010
1693// It will be called in case packets lost/ broken and decoded failed at temporal level 01693// It will be called in case packets lost/ broken and decoded failed at temporal level 0
1694void_t ResetParameterSetsState (PWelsDecoderContext pCtx) {1694void ResetParameterSetsState (PWelsDecoderContext pCtx) {
1695 pCtx->bSpsExistAheadFlag = false;1695 pCtx->bSpsExistAheadFlag = false;
1696 pCtx->bSubspsExistAheadFlag = false;1696 pCtx->bSubspsExistAheadFlag = false;
1697 pCtx->bPpsExistAheadFlag = false;1697 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