History

Convert tabs to spaces in vertically aligned code

Martin Storsjö committed 11 years ago

Commit 51efa571 parent 723044864 files · +2746 −2751Browse files

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

Unified · Split

codec/decoder/core/src/au_parser.cpp+27−27
@@ -138,8 +138,8 @@ uint8_t* ParseNalHeader (PWelsDecoderContext pCtx, SNalUnitHeader* pNalUnitHeade · 137 unmodified lines
138138 return NULL; //uiForbiddenZeroBit should always equal to 0
139139 }
140140
141− pNalUnitHeader->uiNalRefIdc = (uint8_t) (pNal[0] >> 5); // uiNalRefIdc
142− pNalUnitHeader->eNalUnitType = (EWelsNalUnitType) (pNal[0] & 0x1f); // eNalUnitType
141+ pNalUnitHeader->uiNalRefIdc = (uint8_t) (pNal[0] >> 5); // uiNalRefIdc
142+ pNalUnitHeader->eNalUnitType = (EWelsNalUnitType) (pNal[0] & 0x1f); // eNalUnitType
143143
144144 ++pNal;
145145 --iNalSize;
@@ -241,8 +241,8 @@ uint8_t* ParseNalHeader (PWelsDecoderContext pCtx, SNalUnitHeader* pNalUnitHeade · 95 unmodified lines
241241 *pConsumedBytes += NAL_UNIT_HEADER_EXT_SIZE;
242242
243243 pCurNal->sNalHeaderExt.sNalUnitHeader.uiForbiddenZeroBit = pNalUnitHeader->uiForbiddenZeroBit;
244− pCurNal->sNalHeaderExt.sNalUnitHeader.uiNalRefIdc = pNalUnitHeader->uiNalRefIdc;
245− pCurNal->sNalHeaderExt.sNalUnitHeader.eNalUnitType = pNalUnitHeader->eNalUnitType;
244+ pCurNal->sNalHeaderExt.sNalUnitHeader.uiNalRefIdc = pNalUnitHeader->uiNalRefIdc;
245+ pCurNal->sNalHeaderExt.sNalUnitHeader.eNalUnitType = pNalUnitHeader->eNalUnitType;
246246 if (pNalUnitHeader->uiNalRefIdc != 0) {
247247 pBs = &pCtx->sBs;
248248 iBitSize = (iNalSize << 3) - BsGetTrailingBits (pNal + iNalSize - 1); // convert into bit
@@ -272,9 +272,9 @@ uint8_t* ParseNalHeader (PWelsDecoderContext pCtx, SNalUnitHeader* pNalUnitHeade · 23 unmodified lines
272272 }
273273 pCurNal->uiTimeStamp = pCtx->uiTimeStamp;
274274 pCurNal->sNalHeaderExt.sNalUnitHeader.uiForbiddenZeroBit = pNalUnitHeader->uiForbiddenZeroBit;
275− pCurNal->sNalHeaderExt.sNalUnitHeader.uiNalRefIdc = pNalUnitHeader->uiNalRefIdc;
276− pCurNal->sNalHeaderExt.sNalUnitHeader.eNalUnitType = pNalUnitHeader->eNalUnitType;
277− pCurAu = pCtx->pAccessUnitList;
275+ pCurNal->sNalHeaderExt.sNalUnitHeader.uiNalRefIdc = pNalUnitHeader->uiNalRefIdc;
276+ pCurNal->sNalHeaderExt.sNalUnitHeader.eNalUnitType = pNalUnitHeader->eNalUnitType;
277+ pCurAu = pCtx->pAccessUnitList;
278278 uiAvailNalNum = pCurAu->uiAvailUnitsNum;
279279
280280
@@ -576,12 +576,12 @@ bool CheckNextAuNewSeq (PWelsDecoderContext pCtx, const PNalUnit kpCurNal, const · 295 unmodified lines
576576 */
577577 int32_t ParseNonVclNal (PWelsDecoderContext pCtx, uint8_t* pRbsp, const int32_t kiSrcLen, uint8_t* pSrcNal,
578578 const int32_t kSrcNalLen) {
579− PBitStringAux pBs = NULL;
580− EWelsNalUnitType eNalType = NAL_UNIT_UNSPEC_0; // make initial value as unspecified
581− int32_t iPicWidth = 0;
582− int32_t iPicHeight = 0;
583− int32_t iBitSize = 0;
584− int32_t iErr = ERR_NONE;
579+ PBitStringAux pBs = NULL;
580+ EWelsNalUnitType eNalType = NAL_UNIT_UNSPEC_0; // make initial value as unspecified
581+ int32_t iPicWidth = 0;
582+ int32_t iPicHeight = 0;
583+ int32_t iBitSize = 0;
584+ int32_t iErr = ERR_NONE;
585585 if (kiSrcLen <= 0)
586586 return iErr;
587587
@@ -674,8 +674,8 @@ int32_t ParseRefBasePicMarking (PBitStringAux pBs, PRefBasePicMarking pRefBasePi · 86 unmodified lines
674674
675675 if (kuiMmco == MMCO_SHORT2UNUSED) {
676676 WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //difference_of_base_pic_nums_minus1
677− pRefBasePicMarking->mmco_base[iIdx].uiDiffOfPicNums = 1 + uiCode;
678− pRefBasePicMarking->mmco_base[iIdx].iShortFrameNum = 0;
677+ pRefBasePicMarking->mmco_base[iIdx].uiDiffOfPicNums = 1 + uiCode;
678+ pRefBasePicMarking->mmco_base[iIdx].iShortFrameNum = 0;
679679 } else if (kuiMmco == MMCO_LONG2UNUSED) {
680680 WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //long_term_base_pic_num
681681 pRefBasePicMarking->mmco_base[iIdx].uiLongTermPicNum = uiCode;
@@ -747,8 +747,8 @@ int32_t DecodeSpsSvcExt (PWelsDecoderContext pCtx, PSubsetSps pSpsExt, PBitStrin · 65 unmodified lines
747747 WELS_READ_VERIFY (BsGetBits (pBs, 2, &uiCode)); //chroma_phase_y_plus1
748748 pExt->uiChromaPhaseYPlus1 = uiCode;
749749
750− pExt->uiSeqRefLayerChromaPhaseXPlus1Flag = pExt->uiChromaPhaseXPlus1Flag;
751− pExt->uiSeqRefLayerChromaPhaseYPlus1 = pExt->uiChromaPhaseYPlus1;
750+ pExt->uiSeqRefLayerChromaPhaseXPlus1Flag = pExt->uiChromaPhaseXPlus1Flag;
751+ pExt->uiSeqRefLayerChromaPhaseYPlus1 = pExt->uiChromaPhaseYPlus1;
752752 memset (&pExt->sSeqScaledRefLayer, 0, sizeof (SPosOffset));
753753
754754 if (pExt->uiExtendedSpatialScalability == 1) {
@@ -948,11 +948,11 @@ int32_t ParseSps (PWelsDecoderContext pCtx, PBitStringAux pBsAux, int32_t* pPicW · 193 unmodified lines
948948 return GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS, ERR_INFO_UNSUPPORTED_NON_BASELINE);
949949 } else pSps->pSLevelLimits = pSLevelLimits;
950950 // syntax elements in default
951− pSps->uiChromaFormatIdc = 1;
951+ pSps->uiChromaFormatIdc = 1;
952952
953− pSps->uiProfileIdc = uiProfileIdc;
954− pSps->uiLevelIdc = uiLevelIdc;
955− pSps->iSpsId = iSpsId;
953+ pSps->uiProfileIdc = uiProfileIdc;
954+ pSps->uiLevelIdc = uiLevelIdc;
955+ pSps->iSpsId = iSpsId;
956956
957957 if (PRO_SCALABLE_BASELINE == uiProfileIdc || PRO_SCALABLE_HIGH == uiProfileIdc ||
958958 PRO_HIGH == uiProfileIdc || PRO_HIGH10 == uiProfileIdc ||
@@ -1100,10 +1100,10 @@ int32_t ParseSps (PWelsDecoderContext pCtx, PBitStringAux pBsAux, int32_t* pPicW · 141 unmodified lines
11001100 return GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS, ERR_INFO_INVALID_CROPPING_DATA);
11011101 }
11021102 } else {
1103− pSps->sFrameCrop.iLeftOffset = 0; // frame_crop_left_offset
1104− pSps->sFrameCrop.iRightOffset = 0; // frame_crop_right_offset
1105− pSps->sFrameCrop.iTopOffset = 0; // frame_crop_top_offset
1106− pSps->sFrameCrop.iBottomOffset = 0; // frame_crop_bottom_offset
1103+ pSps->sFrameCrop.iLeftOffset = 0; // frame_crop_left_offset
1104+ pSps->sFrameCrop.iRightOffset = 0; // frame_crop_right_offset
1105+ pSps->sFrameCrop.iTopOffset = 0; // frame_crop_top_offset
1106+ pSps->sFrameCrop.iBottomOffset = 0; // frame_crop_bottom_offset
11071107 }
11081108 WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //vui_parameters_present_flag
11091109 pSps->bVuiParamPresentFlag = !!uiCode;
@@ -1208,8 +1208,8 @@ int32_t ParseSps (PWelsDecoderContext pCtx, PBitStringAux pBsAux, int32_t* pPicW · 98 unmodified lines
12081208 if (PRO_SCALABLE_BASELINE == uiProfileIdc || PRO_SCALABLE_HIGH == uiProfileIdc)
12091209 pCtx->bAvcBasedFlag = false;
12101210
1211− *pPicWidth = pSps->iMbWidth << 4;
1212− *pPicHeight = pSps->iMbHeight << 4;
1211+ *pPicWidth = pSps->iMbWidth << 4;
1212+ *pPicHeight = pSps->iMbHeight << 4;
12131213 PSps pTmpSps = NULL;
12141214 if (kbUseSubsetFlag) {
12151215 pTmpSps = &pCtx->sSubsetSpsBuffer[iSpsId].sSps;

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