History

Remove tabs where a simple space is just enough

Martin Storsjö committed 11 years ago

Commit ca51ee01 parent 51efa5754 files · +769 −772Browse files

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

Unified · Split

codec/decoder/core/src/decoder.cpp+20−20
@@ -67,7 +67,7 @@ static int32_t CreatePicBuff (PWelsDecoderContext pCtx, PPicBuff* ppPicBuf, cons · 66 unmodified lines
6767 return 1;
6868 }
6969
70− pPicBuf = (PPicBuff)WelsMallocz (sizeof (SPicBuff), "PPicBuff");
70+ pPicBuf = (PPicBuff)WelsMallocz (sizeof (SPicBuff), "PPicBuff");
7171
7272 if (NULL == pPicBuf) {
7373 return 1;
@@ -109,7 +109,7 @@ static int32_t IncreasePicBuff (PWelsDecoderContext pCtx, PPicBuff* ppPicBuf, co · 35 unmodified lines
109109 return 1;
110110 }
111111
112− pPicNewBuf = (PPicBuff)WelsMallocz (sizeof (SPicBuff), "PPicBuff");
112+ pPicNewBuf = (PPicBuff)WelsMallocz (sizeof (SPicBuff), "PPicBuff");
113113
114114 if (NULL == pPicNewBuf) {
115115 return 1;
@@ -153,9 +153,9 @@ static int32_t IncreasePicBuff (PWelsDecoderContext pCtx, PPicBuff* ppPicBuf, co · 37 unmodified lines
153153 // remove old PicBuf
154154 if (pPicOldBuf->ppPic != NULL) {
155155 WelsFree (pPicOldBuf->ppPic, "pPicOldBuf->queue");
156− pPicOldBuf->ppPic = NULL;
156+ pPicOldBuf->ppPic = NULL;
157157 }
158− pPicOldBuf->iCapacity = 0;
158+ pPicOldBuf->iCapacity = 0;
159159 pPicOldBuf->iCurrentIdx = 0;
160160 WelsFree (pPicOldBuf, "pPicOldBuf");
161161 pPicOldBuf = NULL;
@@ -171,7 +171,7 @@ static int32_t DecreasePicBuff (PWelsDecoderContext pCtx, PPicBuff* ppPicBuf, co · 9 unmodified lines
171171 return 1;
172172 }
173173
174− pPicNewBuf = (PPicBuff)WelsMallocz (sizeof (SPicBuff), "PPicBuff");
174+ pPicNewBuf = (PPicBuff)WelsMallocz (sizeof (SPicBuff), "PPicBuff");
175175
176176 if (NULL == pPicNewBuf) {
177177 return 1;
@@ -180,7 +180,7 @@ static int32_t DecreasePicBuff (PWelsDecoderContext pCtx, PPicBuff* ppPicBuf, co · 2 unmodified lines
180180 pPicNewBuf->ppPic = (PPicture*)WelsMallocz (kiNewSize * sizeof (PPicture), "PPicture*");
181181
182182 if (NULL == pPicNewBuf->ppPic) {
183− pPicNewBuf->iCapacity = 0;
183+ pPicNewBuf->iCapacity = 0;
184184 DestroyPicBuff (&pPicNewBuf);
185185 return 1;
186186 }
@@ -227,9 +227,9 @@ static int32_t DecreasePicBuff (PWelsDecoderContext pCtx, PPicBuff* ppPicBuf, co · 40 unmodified lines
227227 // remove old PicBuf
228228 if (pPicOldBuf->ppPic != NULL) {
229229 WelsFree (pPicOldBuf->ppPic, "pPicOldBuf->queue");
230− pPicOldBuf->ppPic = NULL;
230+ pPicOldBuf->ppPic = NULL;
231231 }
232− pPicOldBuf->iCapacity = 0;
232+ pPicOldBuf->iCapacity = 0;
233233 pPicOldBuf->iCurrentIdx = 0;
234234 WelsFree (pPicOldBuf, "pPicOldBuf");
235235 pPicOldBuf = NULL;
@@ -257,9 +257,9 @@ void DestroyPicBuff (PPicBuff* ppPicBuf) { · 21 unmodified lines
257257
258258 WelsFree (pPicBuf->ppPic, "pPicBuf->queue");
259259
260− pPicBuf->ppPic = NULL;
260+ pPicBuf->ppPic = NULL;
261261 }
262− pPicBuf->iCapacity = 0;
262+ pPicBuf->iCapacity = 0;
263263 pPicBuf->iCurrentIdx = 0;
264264
265265 WelsFree (pPicBuf, "pPicBuf");
@@ -331,7 +331,7 @@ void WelsDecoderDefaults (PWelsDecoderContext pCtx, SLogContext* pLogCtx) { · 65 unmodified lines
331331 * get size of reference picture list in target layer incoming, = (iNumRefFrames
332332 */
333333 static inline int32_t GetTargetRefListSize (PWelsDecoderContext pCtx) {
334− int32_t iNumRefFrames = 0;
334+ int32_t iNumRefFrames = 0;
335335 // +2 for EC MV Copy buffer exchange
336336 if ((pCtx == NULL) || (pCtx->pSps == NULL)) {
337337 iNumRefFrames = MAX_REF_PIC_COUNT + 2;
@@ -365,7 +365,7 @@ int32_t WelsRequestMem (PWelsDecoderContext pCtx, const int32_t kiMbWidth, const · 27 unmodified lines
365365
366366 // Fixed the issue about different gop size over last, 5/17/2010
367367 // get picture queue size currently
368− iPicQueueSize = GetTargetRefListSize (pCtx); // adaptive size of picture queue, = (pSps->iNumRefFrames x 2)
368+ iPicQueueSize = GetTargetRefListSize (pCtx); // adaptive size of picture queue, = (pSps->iNumRefFrames x 2)
369369 pCtx->iPicQueueNumber = iPicQueueSize;
370370 if (pCtx->pPicBuff[LIST_0] != NULL
371371 && pCtx->pPicBuff[LIST_0]->iCapacity ==
@@ -482,7 +482,7 @@ int32_t WelsOpenDecoder (PWelsDecoderContext pCtx) { · 110 unmodified lines
482482 #ifdef LONG_TERM_REF
483483 pCtx->bParamSetsLostFlag = true;
484484 #else
485− pCtx->bReferenceLostAtT0Flag = true; // should be true to waiting IDR at incoming AU bits following, 6/4/2010
485+ pCtx->bReferenceLostAtT0Flag = true; // should be true to waiting IDR at incoming AU bits following, 6/4/2010
486486 #endif //LONG_TERM_REF
487487 pCtx->bNewSeqBegin = true;
488488 pCtx->bPrintFrameErrorTraceFlag = true;
@@ -517,13 +517,13 @@ int32_t DecoderConfigParam (PWelsDecoderContext pCtx, const SDecodingParam* kpPa · 28 unmodified lines
517517 if (NULL == pCtx || NULL == kpParam)
518518 return 1;
519519
520− pCtx->pParam = (SDecodingParam*)WelsMallocz (sizeof (SDecodingParam), "SDecodingParam");
520+ pCtx->pParam = (SDecodingParam*)WelsMallocz (sizeof (SDecodingParam), "SDecodingParam");
521521
522522 if (NULL == pCtx->pParam)
523523 return 1;
524524
525525 memcpy (pCtx->pParam, kpParam, sizeof (SDecodingParam));
526− pCtx->eOutputColorFormat = pCtx->pParam->eOutputColorFormat;
526+ pCtx->eOutputColorFormat = pCtx->pParam->eOutputColorFormat;
527527 if (!pCtx->bParseOnly) {
528528 int32_t iRet = DecoderSetCsp (pCtx, pCtx->pParam->eOutputColorFormat);
529529 if (iRet)
@@ -668,7 +668,7 @@ int32_t WelsDecodeBs (PWelsDecoderContext pCtx, const uint8_t* kpBsBuf, const in · 138 unmodified lines
668668 iConsumedBytes = 0;
669669 pDstNal[iDstIdx] = pDstNal[iDstIdx + 1] = pDstNal[iDstIdx + 2] = pDstNal[iDstIdx + 3] =
670670 0; // set 4 reserved bytes to zero
671− pNalPayload = ParseNalHeader (pCtx, &pCtx->sCurNalHead, pDstNal, iDstIdx, pSrcNal - 3, iSrcIdx + 3, &iConsumedBytes);
671+ pNalPayload = ParseNalHeader (pCtx, &pCtx->sCurNalHead, pDstNal, iDstIdx, pSrcNal - 3, iSrcIdx + 3, &iConsumedBytes);
672672 if (pNalPayload) { //parse correct
673673 if (IS_PARAM_SETS_NALS (pCtx->sCurNalHead.eNalUnitType)) {
674674 iRet = ParseNonVclNal (pCtx, pNalPayload, iDstIdx - iConsumedBytes, pSrcNal - 3, iSrcIdx + 3);
@@ -758,8 +758,8 @@ int32_t WelsDecodeBs (PWelsDecoderContext pCtx, const uint8_t* kpBsBuf, const in · 83 unmodified lines
758758 return pCtx->iErrorCode;
759759 }
760760 } else { /* no supplementary picture payload input, but stored a picture */
761− PAccessUnit pCurAu =
762− pCtx->pAccessUnitList; // current access unit, it will never point to NULL after decode's successful initialization
761+ PAccessUnit pCurAu =
762+ pCtx->pAccessUnitList; // current access unit, it will never point to NULL after decode's successful initialization
763763
764764 if (pCurAu->uiAvailUnitsNum == 0) {
765765 return pCtx->iErrorCode;
@@ -789,9 +789,9 @@ int32_t WelsDecodeBs (PWelsDecoderContext pCtx, const uint8_t* kpBsBuf, const in · 23 unmodified lines
789789 int32_t DecoderSetCsp (PWelsDecoderContext pCtx, const int32_t kiColorFormat) {
790790 WELS_VERIFY_RETURN_IF (1, (NULL == pCtx));
791791
792− pCtx->eOutputColorFormat = (EVideoFormatType) kiColorFormat;
792+ pCtx->eOutputColorFormat = (EVideoFormatType) kiColorFormat;
793793 if (pCtx->pParam != NULL) {
794− pCtx->pParam->eOutputColorFormat = (EVideoFormatType) kiColorFormat;
794+ pCtx->pParam->eOutputColorFormat = (EVideoFormatType) kiColorFormat;
795795 }
796796
797797 //For now, support only videoFormatI420!

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