History

astyle all cpp files

huili2 committed 12 years ago

Commit adb0fa41 parent 0dbdbfb14 files · +138 −121Browse files

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

Unified · Split

codec/decoder/core/src/manage_dec_ref.cpp+10−9
@@ -123,7 +123,7 @@ int32_t WelsInitRefList (PWelsDecoderContext pCtx, int32_t iPoc) { · 122 unmodified lines
123123 pRef->uiTemporalId = pRef->uiQualityId = 0;
124124 AddShortTermToList (&pCtx->sRefPic, pRef);
125125 } else {
126− WelsLog (&(pCtx->sLogCtx), WELS_LOG_ERROR, "WelsInitRefList()::PrefetchPic for EC errors.\n");
126+ WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR, "WelsInitRefList()::PrefetchPic for EC errors.\n");
127127 pCtx->iErrorCode |= dsOutOfMemory;
128128 return ERR_INFO_REF_COUNT_OVERFLOW;
129129 }
@@ -187,7 +187,7 @@ int32_t WelsReorderRefList (PWelsDecoderContext pCtx) { · 57 unmodified lines
187187 if (ppRefList[i]->iFrameNum == iPredFrameNum && !ppRefList[i]->bIsLongRef) {
188188 if ((pNalHeaderExt->uiQualityId == ppRefList[i]->uiQualityId)
189189 && (pSliceHeader->iSpsId != ppRefList[i]->iSpsId)) { //check;
190− WelsLog (&(pCtx->sLogCtx), WELS_LOG_WARNING, "WelsReorderRefList()::::BASE LAYER::::iSpsId:%d, ref_sps_id:%d\n",
190+ WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "WelsReorderRefList()::::BASE LAYER::::iSpsId:%d, ref_sps_id:%d\n",
191191 pSliceHeader->iSpsId, ppRefList[i]->iSpsId);
192192 pCtx->iErrorCode = dsNoParamSets; //cross-IDR reference frame selection, SHOULD request IDR.--
193193 return ERR_INFO_REFERENCE_PIC_LOST;
@@ -204,7 +204,7 @@ int32_t WelsReorderRefList (PWelsDecoderContext pCtx) { · 10 unmodified lines
204204 pRefPicListReorderSyn->sReorderingSyn[LIST_0][iReorderingIndex].uiLongTermPicNum) {
205205 if ((pNalHeaderExt->uiQualityId == ppRefList[i]->uiQualityId)
206206 && (pSliceHeader->iSpsId != ppRefList[i]->iSpsId)) { //check;
207− WelsLog (&(pCtx->sLogCtx), WELS_LOG_WARNING, "WelsReorderRefList()::::BASE LAYER::::iSpsId:%d, ref_sps_id:%d\n",
207+ WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "WelsReorderRefList()::::BASE LAYER::::iSpsId:%d, ref_sps_id:%d\n",
208208 pSliceHeader->iSpsId, ppRefList[i]->iSpsId);
209209 pCtx->iErrorCode = dsNoParamSets; //cross-IDR reference frame selection, SHOULD request IDR.--
210210 return ERR_INFO_REFERENCE_PIC_LOST;
@@ -328,13 +328,13 @@ static int32_t MMCOProcess (PWelsDecoderContext pCtx, uint32_t uiMmcoType, · 117 unmodified lines
328328 case MMCO_SHORT2UNUSED:
329329 pPic = WelsDelShortFromListSetUnref (pRefPic, iShortFrameNum);
330330 if (pPic == NULL) {
331− WelsLog (&(pCtx->sLogCtx), WELS_LOG_WARNING, "MMCO_SHORT2UNUSED: delete a empty entry from short term list\n");
331+ WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "MMCO_SHORT2UNUSED: delete a empty entry from short term list\n");
332332 }
333333 break;
334334 case MMCO_LONG2UNUSED:
335335 pPic = WelsDelLongFromListSetUnref (pRefPic, uiLongTermPicNum);
336336 if (pPic == NULL) {
337− WelsLog (&(pCtx->sLogCtx), WELS_LOG_WARNING, "MMCO_LONG2UNUSED: delete a empty entry from long term list\n");
337+ WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "MMCO_LONG2UNUSED: delete a empty entry from long term list\n");
338338 }
339339 break;
340340 case MMCO_SHORT2LONG:
@@ -343,14 +343,14 @@ static int32_t MMCOProcess (PWelsDecoderContext pCtx, uint32_t uiMmcoType, · 2 unmodified lines
343343 }
344344 pPic = WelsDelShortFromList (pRefPic, iShortFrameNum);
345345 if (pPic == NULL) {
346− WelsLog (&(pCtx->sLogCtx), WELS_LOG_WARNING, "MMCO_LONG2LONG: delete a empty entry from short term list\n");
346+ WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "MMCO_LONG2LONG: delete a empty entry from short term list\n");
347347 break;
348348 }
349349 WelsDelLongFromListSetUnref (pRefPic, iLongTermFrameIdx);
350350 #ifdef LONG_TERM_REF
351351 pCtx->bCurAuContainLtrMarkSeFlag = true;
352352 pCtx->iFrameNumOfAuMarkedLtr = iShortFrameNum;
353− WelsLog (&(pCtx->sLogCtx), WELS_LOG_INFO, "ex_mark_avc():::MMCO_SHORT2LONG:::LTR marking....iFrameNum: %d\n",
353+ WelsLog (& (pCtx->sLogCtx), WELS_LOG_INFO, "ex_mark_avc():::MMCO_SHORT2LONG:::LTR marking....iFrameNum: %d\n",
354354 pCtx->iFrameNumOfAuMarkedLtr);
355355 #endif
356356
@@ -379,7 +379,8 @@ static int32_t MMCOProcess (PWelsDecoderContext pCtx, uint32_t uiMmcoType, · 22 unmodified lines
379379 #ifdef LONG_TERM_REF
380380 pCtx->bCurAuContainLtrMarkSeFlag = true;
381381 pCtx->iFrameNumOfAuMarkedLtr = pCtx->iFrameNum;
382− WelsLog (&(pCtx->sLogCtx), WELS_LOG_INFO, "ex_mark_avc():::MMCO_LONG:::LTR marking....iFrameNum: %d\n", pCtx->iFrameNum);
382+ WelsLog (& (pCtx->sLogCtx), WELS_LOG_INFO, "ex_mark_avc():::MMCO_LONG:::LTR marking....iFrameNum: %d\n",
383+ pCtx->iFrameNum);
383384 #endif
384385 iRet = AddLongTermToList (pRefPic, pCtx->pDec, iLongTermFrameIdx);
385386 break;
@@ -564,7 +565,7 @@ static int32_t RemainOneBufferInDpbForEC (PWelsDecoderContext pCtx) { · 178 unmodified lines
564565 }
565566 if (pRefPic->uiShortRefCount[0] + pRefPic->uiLongRefCount[0] >=
566567 pCtx->pSps->iNumRefFrames) { //fail to remain one empty buffer in DPB
567− WelsLog (&(pCtx->sLogCtx), WELS_LOG_WARNING, "RemainOneBufferInDpbForEC(): empty one DPB failed for EC!\n");
568+ WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "RemainOneBufferInDpbForEC(): empty one DPB failed for EC!\n");
568569 iRet = ERR_INFO_REF_COUNT_OVERFLOW;
569570 }
570571

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