History

Use bool instead of bool_t

bool is one of the built in, standard types in C++, there's no need for a typedef for it.

Martin Storsjö committed 12 years ago

Commit 2b77fe71 parent 17d7b5d82 files · +468 −471Browse files

Showing the changes to codec/decoder (27 of 82 files). Show all

Unified · Split

27 files
  1. codec/decoder/core/inc/au_parser.h +2 −2
  2. codec/decoder/core/inc/dec_frame.h +4 −4
  3. codec/decoder/core/inc/decode_slice.h +2 −2
  4. codec/decoder/core/inc/decoder_context.h +18 −18
  5. codec/decoder/core/inc/decoder_core.h +2 −2
  6. codec/decoder/core/inc/fmo.h +2 −2
  7. codec/decoder/core/inc/manage_dec_ref.h +2 −2
  8. codec/decoder/core/inc/nal_prefix.h +8 −8
  9. codec/decoder/core/inc/nalu.h +2 −2
  10. codec/decoder/core/inc/parameter_sets.h +35 −35
  11. codec/decoder/core/inc/picture.h +4 −4
  12. codec/decoder/core/inc/rec_mb.h +1 −1
  13. codec/decoder/core/inc/slice.h +24 −24
  14. codec/decoder/core/src/au_parser.cpp +7 −7
  15. codec/decoder/core/src/deblocking.cpp +2 −2
  16. codec/decoder/core/src/decode_slice.cpp +2 −2
  17. codec/decoder/core/src/decoder.cpp +4 −4
  18. codec/decoder/core/src/decoder_core.cpp +19 −19
  19. codec/decoder/core/src/expand_pic.cpp +1 −1
  20. codec/decoder/core/src/fmo.cpp +4 −4
  21. codec/decoder/core/src/get_intra_predictor.cpp +1 −1
  22. codec/decoder/core/src/manage_dec_ref.cpp +5 −5
  23. codec/decoder/core/src/memmgr_nal_unit.cpp +1 −1
  24. codec/decoder/core/src/mv_pred.cpp +2 −2
  25. codec/decoder/core/src/parse_mb_syn_cavlc.cpp +6 −6
  26. codec/decoder/core/src/pic_queue.cpp +1 −1
  27. codec/decoder/core/src/rec_mb.cpp +2 −2
codec/decoder/core/inc/au_parser.h+2−2
@@ -92,8 +92,8 @@ void_t ParseRefBasePicMarking (PBitStringAux pBs, PRefBasePicMarking pRefBasePic · 91 unmodified lines
9292
9393 void_t ParsePrefixNalUnit (PWelsDecoderContext pCtx, PBitStringAux pBs);
9494
95−bool_t CheckAccessUnitBoundary (const PNalUnit kpCurNal, const PNalUnit kpLastNal, const PSps kpSps);
96−bool_t CheckAccessUnitBoundaryExt (PNalUnitHeaderExt pLastNalHdrExt, PNalUnitHeaderExt pCurNalHeaderExt,
95+bool CheckAccessUnitBoundary (const PNalUnit kpCurNal, const PNalUnit kpLastNal, const PSps kpSps);
96+bool CheckAccessUnitBoundaryExt (PNalUnitHeaderExt pLastNalHdrExt, PNalUnitHeaderExt pCurNalHeaderExt,
9797 PSliceHeader pLastSliceHeader, PSliceHeader pCurSliceHeader);
9898 /*!
9999 *************************************************************************************
codec/decoder/core/inc/dec_frame.h+4−4
@@ -107,14 +107,14 @@ struct TagDqLayer { · 106 unmodified lines
107107 PPicture pRef; // reference picture pointer
108108 PPicture pDec; // reconstruction picture pointer for layer
109109
110− bool_t bStoreRefBasePicFlag; // iCurTid == 0 && iCurQid = 0 && bEncodeKeyPic = 1
111− bool_t bTCoeffLevelPredFlag;
112− bool_t bConstrainedIntraResamplingFlag;
110+ bool bStoreRefBasePicFlag; // iCurTid == 0 && iCurQid = 0 && bEncodeKeyPic = 1
111+ bool bTCoeffLevelPredFlag;
112+ bool bConstrainedIntraResamplingFlag;
113113 uint8_t uiRefLayerDqId;
114114 uint8_t uiRefLayerChromaPhaseXPlus1Flag;
115115 uint8_t uiRefLayerChromaPhaseYPlus1;
116116 uint8_t uiLayerDqId; // dq_id of current layer
117− bool_t bUseRefBasePicFlag; // whether reference pic or reference base pic is referred?
117+ bool bUseRefBasePicFlag; // whether reference pic or reference base pic is referred?
118118 };
119119
120120 typedef struct TagGpuAvcLayer {
codec/decoder/core/inc/decode_slice.h+2−2
@@ -48,12 +48,12 @@ typedef int32_t (*PWelsDecMbCavlcFunc) (PWelsDecoderContext pCtx, PNalUnit pNalC · 47 unmodified lines
4848
4949 int32_t WelsTargetSliceConstruction (PWelsDecoderContext pCtx); //construction based on slice
5050
51−int32_t WelsDecodeSlice (PWelsDecoderContext pCtx, bool_t bFirstSliceInLayer, PNalUnit pNalCur);
51+int32_t WelsDecodeSlice (PWelsDecoderContext pCtx, bool bFirstSliceInLayer, PNalUnit pNalCur);
5252
5353
5454 int32_t WelsTargetMbConstruction (PWelsDecoderContext pCtx);
5555
56−int32_t WelsMbIntraPredictionConstruction (PWelsDecoderContext pCtx, PDqLayer pCurLayer, bool_t bOutput);
56+int32_t WelsMbIntraPredictionConstruction (PWelsDecoderContext pCtx, PDqLayer pCurLayer, bool bOutput);
5757 int32_t WelsMbInterSampleConstruction (PWelsDecoderContext pCtx, PDqLayer pCurLayer,
5858 uint8_t* pDstY, uint8_t* pDstU, uint8_t* pDstV, int32_t iStrideL, int32_t iStrideC);
5959 int32_t WelsMbInterConstruction (PWelsDecoderContext pCtx, PDqLayer pCurLayer);
codec/decoder/core/inc/decoder_context.h+18−18
@@ -180,8 +180,8 @@ typedef struct TagWelsDecoderContext { · 179 unmodified lines
180180
181181 int32_t iOutputColorFormat; // color space format to be outputed
182182 VIDEO_BITSTREAM_TYPE eVideoType; //indicate the type of video to decide whether or not to do qp_delta error detection.
183− bool_t bErrorResilienceFlag; // error resilience flag
184− bool_t bHaveGotMemory; // global memory for decoder context related ever requested?
183+ bool bErrorResilienceFlag; // error resilience flag
184+ bool bHaveGotMemory; // global memory for decoder context related ever requested?
185185
186186 int32_t iImgWidthInPixel; // width of image in pixel reconstruction picture to be output
187187 int32_t iImgHeightInPixel;// height of image in pixel reconstruction picture to be output
@@ -191,7 +191,7 @@ typedef struct TagWelsDecoderContext { · 3 unmodified lines
191191 ESliceType eSliceType; // Slice type
192192 int32_t iFrameNum;
193193 int32_t iPrevFrameNum; // frame number of previous frame well decoded for non-truncated mode yet
194− bool_t bLastHasMmco5; //
194+ bool bLastHasMmco5; //
195195 int32_t iErrorCode; // error code return while decoding in case packets lost
196196 SFmo sFmoList[MAX_PPS_COUNT]; // list for FMO storage
197197 PFmo pFmo; // current fmo context after parsed slice_header
@@ -270,25 +270,25 @@ typedef struct TagWelsDecoderContext { · 72 unmodified lines
270270 int32_t iPicHeightReq; // picture height have requested the memory
271271
272272 uint8_t uiTargetDqId; // maximal DQ ID in current access unit, meaning target layer ID
273− bool_t bAvcBasedFlag; // For decoding bitstream:
274− bool_t bEndOfStreamFlag; // Flag on end of stream requested by external application layer
275− bool_t bInitialDqLayersMem; // dq layers related memory is available?
273+ bool bAvcBasedFlag; // For decoding bitstream:
274+ bool bEndOfStreamFlag; // Flag on end of stream requested by external application layer
275+ bool bInitialDqLayersMem; // dq layers related memory is available?
276276
277− bool_t bOnlyOneLayerInCurAuFlag; //only one layer in current AU: 1
277+ bool bOnlyOneLayerInCurAuFlag; //only one layer in current AU: 1
278278
279279 // for EC parameter sets
280− bool_t bSpsExistAheadFlag; // whether does SPS NAL exist ahead of sequence?
281− bool_t bSubspsExistAheadFlag;// whether does Subset SPS NAL exist ahead of sequence?
282− bool_t bPpsExistAheadFlag; // whether does PPS NAL exist ahead of sequence?
283−
284− bool_t bSpsAvailFlags[MAX_SPS_COUNT];
285− bool_t bSubspsAvailFlags[MAX_SPS_COUNT];
286− bool_t bPpsAvailFlags[MAX_PPS_COUNT];
287− bool_t bReferenceLostAtT0Flag;
280+ bool bSpsExistAheadFlag; // whether does SPS NAL exist ahead of sequence?
281+ bool bSubspsExistAheadFlag;// whether does Subset SPS NAL exist ahead of sequence?
282+ bool bPpsExistAheadFlag; // whether does PPS NAL exist ahead of sequence?
283+
284+ bool bSpsAvailFlags[MAX_SPS_COUNT];
285+ bool bSubspsAvailFlags[MAX_SPS_COUNT];
286+ bool bPpsAvailFlags[MAX_PPS_COUNT];
287+ bool bReferenceLostAtT0Flag;
288288 #ifdef LONG_TERM_REF
289− bool_t bParamSetsLostFlag; //sps or pps do not exist or not correct
289+ bool bParamSetsLostFlag; //sps or pps do not exist or not correct
290290
291− bool_t
291+ bool
292292 bCurAuContainLtrMarkSeFlag; //current AU has the LTR marking syntax element, mark the previous frame or self
293293 int32_t iFrameNumOfAuMarkedLtr; //if bCurAuContainLtrMarkSeFlag==true, SHOULD set this variable
294294
@@ -319,7 +319,7 @@ typedef struct TagWelsDecoderContext { · 24 unmodified lines
319319 int32_t iFeedbackVclNalInAu;
320320 int32_t iFeedbackTidInAu;
321321
322− bool_t bAuReadyFlag; // TRUE: one au is ready for decoding; FALSE: default value
322+ bool bAuReadyFlag; // TRUE: one au is ready for decoding; FALSE: default value
323323
324324 //trace handle
325325 void_t* pTraceHandle;
codec/decoder/core/inc/decoder_core.h+2−2
@@ -89,13 +89,13 @@ void_t DecodeNalHeaderExt (PNalUnit pNal, uint8_t* pSrc); · 88 unmodified lines
8989 * ParseSliceHeaderSyntaxs
9090 * Parse slice header of bitstream
9191 */
92−int32_t ParseSliceHeaderSyntaxs (PWelsDecoderContext pCtx, PBitStringAux pBs, const bool_t kbExtensionFlag);
92+int32_t ParseSliceHeaderSyntaxs (PWelsDecoderContext pCtx, PBitStringAux pBs, const bool kbExtensionFlag);
9393 /*
9494 * Copy relative syntax elements of NALUnitHeaderExt, sRefPicBaseMarking and bStoreRefBasePicFlag in prefix nal unit.
9595 * pSrc: mark as decoded prefix NAL
9696 * pDst: succeeded VCL NAL based AVC (I/P Slice)
9797 */
98−bool_t PrefetchNalHeaderExtSyntax (PWelsDecoderContext pCtx, PNalUnit const kpDst, PNalUnit const kpSrc);
98+bool PrefetchNalHeaderExtSyntax (PWelsDecoderContext pCtx, PNalUnit const kpDst, PNalUnit const kpSrc);
9999
100100
101101 /*
codec/decoder/core/inc/fmo.h+2−2
@@ -58,7 +58,7 @@ uint8_t* pMbAllocMap; · 57 unmodified lines
5858 int32_t iCountMbNum;
5959 int32_t iSliceGroupCount;
6060 int32_t iSliceGroupType;
61−bool_t bActiveFlag;
61+bool bActiveFlag;
6262 uint8_t uiReserved[3]; // reserved padding bytes
6363 } SFmo, *PFmo;
6464
@@ -96,7 +96,7 @@ void_t UninitFmoList (PFmo pFmo, const int32_t kiCnt, const int32_t kiAvail); · 31 unmodified lines
9696 *
9797 * \return true - update/insert successfully; false - failed;
9898 */
99−bool_t FmoParamUpdate (PFmo pFmo, PSps pSps, PPps pPps, int32_t* pActiveFmoNum);
99+bool FmoParamUpdate (PFmo pFmo, PSps pSps, PPps pPps, int32_t* pActiveFmoNum);
100100
101101 /*!
102102 * \brief Get successive mb to be processed with given current mb_xy
codec/decoder/core/inc/manage_dec_ref.h+2−2
@@ -56,7 +56,7 @@ REMOVE_BASE_FIRST = 2 · 55 unmodified lines
5656 void_t WelsResetRefPic (PWelsDecoderContext pCtx);
5757 int32_t WelsInitRefList (PWelsDecoderContext pCtx, int32_t iPoc);
5858 int32_t WelsReorderRefList (PWelsDecoderContext pCtx);
59−int32_t WelsMarkAsRef (PWelsDecoderContext pCtx, const bool_t kbRefBaseMarkingFlag);
59+int32_t WelsMarkAsRef (PWelsDecoderContext pCtx, const bool kbRefBaseMarkingFlag);
6060
6161 static PPicture WelsDelShortFromList (PRefPic pRefPic, int32_t iFrameNum, ERemoveFlag eRemoveFlag);
6262 static PPicture WelsDelLongFromList (PRefPic pRefPic, uint32_t uiLongTermFrameIdx, ERemoveFlag eRemoveFlag);
@@ -65,7 +65,7 @@ static PPicture WelsDelLongFromListSetUnref (PRefPic pRefPic, uint32_t uiLongTer · 2 unmodified lines
6565
6666 static int32_t MMCOBase (PWelsDecoderContext pCtx, PRefBasePicMarking pRefPicBaseMarking);
6767 static int32_t MMCO (PWelsDecoderContext pCtx, PRefPicMarking pRefPicMarking);
68−static int32_t MMCOProcess (PWelsDecoderContext pCtx, uint32_t uiMmcoType, bool_t bRefBasePic,
68+static int32_t MMCOProcess (PWelsDecoderContext pCtx, uint32_t uiMmcoType, bool bRefBasePic,
6969 int32_t iShortFrameNum, uint32_t uiLongTermPicNum, int32_t iLongTermFrameIdx, int32_t iMaxLongTermFrameIdx);
7070 static int32_t SlidingWindow (PWelsDecoderContext pCtx);
7171
codec/decoder/core/inc/nal_prefix.h+8−8
@@ -55,29 +55,29 @@ typedef struct TagNalUnitHeaderExt { · 54 unmodified lines
5555 SNalUnitHeader sNalUnitHeader;
5656
5757 // uint8_t reserved_one_bit;
58− bool_t bIdrFlag;
58+ bool bIdrFlag;
5959 uint8_t uiPriorityId;
6060 int8_t iNoInterLayerPredFlag; // change as int8_t to support 3 values probably in encoder
6161 uint8_t uiDependencyId;
6262
6363 uint8_t uiQualityId;
6464 uint8_t uiTemporalId;
65− bool_t bUseRefBasePicFlag;
66− bool_t bDiscardableFlag;
65+ bool bUseRefBasePicFlag;
66+ bool bDiscardableFlag;
6767
68− bool_t bOutputFlag;
68+ bool bOutputFlag;
6969 uint8_t uiReservedThree2Bits;
7070 // Derived variable(s)
7171 uint8_t uiLayerDqId;
72− bool_t bNalExtFlag;
72+ bool bNalExtFlag;
7373 } SNalUnitHeaderExt, *PNalUnitHeaderExt;
7474
7575 /* Prefix NAL Unix syntax, refer to Page 392 in JVT X201wcm */
7676 typedef struct TagPrefixNalUnit {
7777 SRefBasePicMarking sRefPicBaseMarking;
78− bool_t bStoreRefBasePicFlag;
79− bool_t bPrefixNalUnitAdditionalExtFlag;
80− bool_t bPrefixNalUnitExtFlag;
78+ bool bStoreRefBasePicFlag;
79+ bool bPrefixNalUnitAdditionalExtFlag;
80+ bool bPrefixNalUnitExtFlag;
8181 } SPrefixNalUnit, *PPrefixNalUnit;
8282
8383 } // namespace WelsDec
codec/decoder/core/inc/nalu.h+2−2
@@ -53,7 +53,7 @@ union { · 52 unmodified lines
5353 SBitStringAux sSliceBitsRead;
5454 uint8_t* pNalPos; // save the address of slice nal for GPU function
5555 int32_t iNalLength; // save the nal length for GPU function
56− bool_t bSliceHeaderExtFlag;
56+ bool bSliceHeaderExtFlag;
5757 } sVclNal;
5858 SPrefixNalUnit sPrefixNal;
5959 } sNalData;
@@ -71,7 +71,7 @@ uint32_t uiActualUnitsNum; // actual number of NAL units belong to current au · 11 unmodified lines
7171 uint32_t uiCountUnitsNum; // Count size number of malloced NAL Units in each AU list
7272 uint32_t uiStartPos;
7373 uint32_t uiEndPos;
74−bool_t bCompletedAuFlag; // Indicate whether it is a completed AU
74+bool bCompletedAuFlag; // Indicate whether it is a completed AU
7575 } SAccessUnit, *PAccessUnit;
7676
7777 } // namespace WelsDec
codec/decoder/core/inc/parameter_sets.h+35−35
@@ -80,25 +80,25 @@ uint8_t uiChromaArrayType; · 79 unmodified lines
8080 uint8_t uiBitDepthLuma;
8181 uint8_t uiBitDepthChroma;
8282 /* TO BE CONTINUE: POC type 1 */
83−bool_t bDeltaPicOrderAlwaysZeroFlag;
84−bool_t bGapsInFrameNumValueAllowedFlag;
85−
86−bool_t bFrameMbsOnlyFlag;
87−bool_t bMbaffFlag; // MB Adapative Frame Field
88−bool_t bDirect8x8InferenceFlag;
89−bool_t bFrameCroppingFlag;
90−
91−bool_t bVuiParamPresentFlag;
92−// bool_t bTimingInfoPresentFlag;
93−// bool_t bFixedFrameRateFlag;
94−bool_t bConstraintSet0Flag;
95−bool_t bConstraintSet1Flag;
96−bool_t bConstraintSet2Flag;
97−bool_t bConstraintSet3Flag;
98−bool_t bSeparateColorPlaneFlag;
99−bool_t bQpPrimeYZeroTransfBypassFlag;
100−bool_t bSeqScalingMatrixPresentFlag;
101−bool_t bSeqScalingListPresentFlag[12];
83+bool bDeltaPicOrderAlwaysZeroFlag;
84+bool bGapsInFrameNumValueAllowedFlag;
85+
86+bool bFrameMbsOnlyFlag;
87+bool bMbaffFlag; // MB Adapative Frame Field
88+bool bDirect8x8InferenceFlag;
89+bool bFrameCroppingFlag;
90+
91+bool bVuiParamPresentFlag;
92+// bool bTimingInfoPresentFlag;
93+// bool bFixedFrameRateFlag;
94+bool bConstraintSet0Flag;
95+bool bConstraintSet1Flag;
96+bool bConstraintSet2Flag;
97+bool bConstraintSet3Flag;
98+bool bSeparateColorPlaneFlag;
99+bool bQpPrimeYZeroTransfBypassFlag;
100+bool bSeqScalingMatrixPresentFlag;
101+bool bSeqScalingListPresentFlag[12];
102102 const SLevelLimits *pSLevelLimits;
103103 } SSps, *PSps;
104104
@@ -111,8 +111,8 @@ const SLevelLimits *pSLevelLimits; · 6 unmodified lines
111111 // int32_t iAlphaTransparentValue;
112112
113113 // uint8_t uiBitDepthAux;
114−// bool_t bAlphaIncrFlag;
115−// bool_t bAdditionalExtFlag;
114+// bool bAlphaIncrFlag;
115+// bool bAdditionalExtFlag;
116116 //}SSpsExt, *PSpsExt;
117117
118118 /* Sequence Parameter Set extension syntax, refer to Page 391 in JVT X201wcm */
@@ -124,19 +124,19 @@ uint8_t uiChromaPhaseXPlus1Flag; · 5 unmodified lines
124124 uint8_t uiChromaPhaseYPlus1;
125125 uint8_t uiSeqRefLayerChromaPhaseXPlus1Flag;
126126 uint8_t uiSeqRefLayerChromaPhaseYPlus1;
127−bool_t bInterLayerDeblockingFilterCtrlPresentFlag;
128−bool_t bSeqTCoeffLevelPredFlag;
129−bool_t bAdaptiveTCoeffLevelPredFlag;
130−bool_t bSliceHeaderRestrictionFlag;
127+bool bInterLayerDeblockingFilterCtrlPresentFlag;
128+bool bSeqTCoeffLevelPredFlag;
129+bool bAdaptiveTCoeffLevelPredFlag;
130+bool bSliceHeaderRestrictionFlag;
131131 } SSpsSvcExt, *PSpsSvcExt;
132132
133133 /* Subset sequence parameter set syntax, refer to Page 391 in JVT X201wcm */
134134 typedef struct TagSubsetSps {
135135 SSps sSps;
136136 SSpsSvcExt sSpsSvcExt;
137−bool_t bSvcVuiParamPresentFlag;
138−bool_t bAdditionalExtension2Flag;
139−bool_t bAdditionalExtension2DataFlag;
137+bool bSvcVuiParamPresentFlag;
138+bool bAdditionalExtension2Flag;
139+bool bAdditionalExtension2DataFlag;
140140 } SSubsetSps, *PSubsetSps;
141141
142142 /* Picture parameter set syntax, refer to Page 59 in JVT X201wcm */
@@ -164,15 +164,15 @@ int32_t iPicInitQp; · 21 unmodified lines
164164 int32_t iPicInitQs;
165165 int32_t iChromaQpIndexOffset;
166166
167−bool_t bEntropyCodingModeFlag;
168−bool_t bPicOrderPresentFlag;
167+bool bEntropyCodingModeFlag;
168+bool bPicOrderPresentFlag;
169169 /* slice_group_map_type = 3, 4 or 5 */
170−bool_t bSliceGroupChangeDirectionFlag;
171−bool_t bDeblockingFilterControlPresentFlag;
170+bool bSliceGroupChangeDirectionFlag;
171+bool bDeblockingFilterControlPresentFlag;
172172
173−bool_t bConstainedIntraPredFlag;
174−bool_t bRedundantPicCntPresentFlag;
175−bool_t bWeightedPredFlag;
173+bool bConstainedIntraPredFlag;
174+bool bRedundantPicCntPresentFlag;
175+bool bWeightedPredFlag;
176176 uint8_t uiWeightedBipredIdc;
177177
178178 } SPps, *PPps;
codec/decoder/core/inc/picture.h+4−4
@@ -58,16 +58,16 @@ int32_t iHeightInPixel;// picture height in pixel · 57 unmodified lines
5858 int32_t iFramePoc; // frame POC
5959
6060 /*******************************sef_definition for misc use****************************/
61−bool_t bUsedAsRef; //for ref pic management
62−bool_t bIsLongRef; // long term reference frame flag //for ref pic management
61+bool bUsedAsRef; //for ref pic management
62+bool bIsLongRef; // long term reference frame flag //for ref pic management
6363 uint8_t uiRefCount;
64−bool_t bAvailableFlag; // indicate whether it is available in this picture memory block.
64+bool bAvailableFlag; // indicate whether it is available in this picture memory block.
6565
6666 /*******************************for future use****************************/
6767 uint8_t uiTemporalId;
6868 uint8_t uiSpatialId;
6969 uint8_t uiQualityId;
70−bool_t bRefBaseFlag;
70+bool bRefBaseFlag;
7171
7272 int32_t iFrameNum; // frame number //for ref pic management
7373 int32_t iLongTermFrameIdx; //id for long term ref pic
codec/decoder/core/inc/rec_mb.h+1−1
@@ -49,7 +49,7 @@ · 48 unmodified lines
4949
5050 namespace WelsDec {
5151
52−void_t WelsFillRecNeededMbInfo (PWelsDecoderContext pCtx, bool_t bOutput, PDqLayer pCurLayer);
52+void_t WelsFillRecNeededMbInfo (PWelsDecoderContext pCtx, bool bOutput, PDqLayer pCurLayer);
5353
5454 int32_t RecI4x4Mb (int32_t iMBXY, PWelsDecoderContext pCtx, int16_t* pScoeffLevel, PDqLayer pDqLayer);
5555
codec/decoder/core/inc/slice.h+24−24
@@ -51,7 +51,7 @@ typedef struct TagRefPicListReorderSyntax { · 50 unmodified lines
5151 uint16_t uiLongTermPicNum;
5252 uint16_t uiReorderingOfPicNumsIdc;
5353 } sReorderingSyn[LIST_A][MAX_REF_PIC_COUNT];
54− bool_t bRefPicListReorderingFlag[LIST_A];
54+ bool bRefPicListReorderingFlag[LIST_A];
5555 } SRefPicListReorderSyn, *PRefPicListReorderSyn;
5656
5757 /*
@@ -65,8 +65,8 @@ typedef struct TagPredWeightTabSyntax { · 7 unmodified lines
6565 int32_t iLumaOffset[MAX_REF_PIC_COUNT];
6666 int32_t iChromaWeight[MAX_REF_PIC_COUNT][2];
6767 int32_t iChromaOffset[MAX_REF_PIC_COUNT][2];
68− bool_t bLumaWeightFlag;
69− bool_t bChromaWeightFlag;
68+ bool bLumaWeightFlag;
69+ bool bChromaWeightFlag;
7070 } sPredList[LIST_A];
7171 } SPredWeightTabSyn;
7272
@@ -81,9 +81,9 @@ typedef struct TagRefPicMarking { · 8 unmodified lines
8181 int32_t iMaxLongTermFrameIdx;
8282 } sMmcoRef[MAX_MMCO_COUNT];
8383
84− bool_t bNoOutputOfPriorPicsFlag;
85− bool_t bLongTermRefFlag;
86− bool_t bAdaptiveRefPicMarkingModeFlag;
84+ bool bNoOutputOfPriorPicsFlag;
85+ bool bLongTermRefFlag;
86+ bool bAdaptiveRefPicMarkingModeFlag;
8787 } SRefPicMarking, *PRefPicMarking;
8888
8989 /* Decode reference base picture marking syntax in Page 396 of JVT X201wcm */
@@ -95,7 +95,7 @@ typedef struct TagRefBasePicMarkingSyn { · 5 unmodified lines
9595 uint32_t uiLongTermPicNum; //should uint32_t, cover larger range of iFrameNum.
9696 } mmco_base[MAX_MMCO_COUNT]; // MAX_REF_PIC for reference picture based on frame
9797
98− bool_t bAdaptiveRefBasePicMarkingModeFlag;
98+ bool bAdaptiveRefBasePicMarkingModeFlag;
9999 } SRefBasePicMarking, *PRefBasePicMarking;
100100
101101 /* Header of slice syntax elements, refer to Page 63 in JVT X201wcm */
@@ -131,11 +131,11 @@ typedef struct TagSliceHeaders { · 29 unmodified lines
131131
132132 uint16_t uiIdrPicId;
133133 ESliceType eSliceType;
134− bool_t bNumRefIdxActiveOverrideFlag;
135− bool_t bFieldPicFlag; //not supported in base profile
136− bool_t bBottomFiledFlag; //not supported in base profile
134+ bool bNumRefIdxActiveOverrideFlag;
135+ bool bFieldPicFlag; //not supported in base profile
136+ bool bBottomFiledFlag; //not supported in base profile
137137 uint8_t uiPadding1Byte;
138− bool_t bSpForSwitchFlag; // For SP/SI slices
138+ bool bSpForSwitchFlag; // For SP/SI slices
139139 int16_t iPadding2Bytes;
140140 } SSliceHeader, *PSliceHeader;
141141
@@ -155,18 +155,18 @@ typedef struct TagSliceHeaderExt { · 13 unmodified lines
155155 int32_t iScaledRefLayerPicHeightInSampleLuma;
156156
157157 SRefBasePicMarking sRefBasePicMarking;
158− bool_t bBasePredWeightTableFlag;
159− bool_t bStoreRefBasePicFlag;
160− bool_t bConstrainedIntraResamplingFlag;
161− bool_t bSliceSkipFlag;
162−
163− bool_t bAdaptiveBaseModeFlag;
164− bool_t bDefaultBaseModeFlag;
165− bool_t bAdaptiveMotionPredFlag;
166− bool_t bDefaultMotionPredFlag;
167− bool_t bAdaptiveResidualPredFlag;
168− bool_t bDefaultResidualPredFlag;
169− bool_t bTCoeffLevelPredFlag;
158+ bool bBasePredWeightTableFlag;
159+ bool bStoreRefBasePicFlag;
160+ bool bConstrainedIntraResamplingFlag;
161+ bool bSliceSkipFlag;
162+
163+ bool bAdaptiveBaseModeFlag;
164+ bool bDefaultBaseModeFlag;
165+ bool bAdaptiveMotionPredFlag;
166+ bool bDefaultMotionPredFlag;
167+ bool bAdaptiveResidualPredFlag;
168+ bool bDefaultResidualPredFlag;
169+ bool bTCoeffLevelPredFlag;
170170 uint8_t uiRefLayerChromaPhaseXPlus1Flag;
171171
172172 uint8_t uiRefLayerChromaPhaseYPlus1;
@@ -192,7 +192,7 @@ typedef struct TagSlice { · 19 unmodified lines
192192 /*slice_data_ext() generate*/
193193
194194 /*******************************misc use****************************/
195− bool_t bSliceHeaderExtFlag; // Indicate which slice header is used, avc or ext?
195+ bool bSliceHeaderExtFlag; // Indicate which slice header is used, avc or ext?
196196 /*************got from other layer for effiency if possible***************/
197197 /*from lower layer: slice header*/
198198 uint8_t eSliceType;
codec/decoder/core/src/au_parser.cpp+7−7
@@ -108,7 +108,7 @@ uint8_t* ParseNalHeader (PWelsDecoderContext pCtx, SNalUnitHeader* pNalUnitHeade · 107 unmodified lines
108108 uint8_t* pNal = pSrcRbsp;
109109 int32_t iNalSize = iSrcRbspLen;
110110 PBitStringAux pBs = NULL;
111− bool_t bExtensionFlag = false;
111+ bool bExtensionFlag = false;
112112 int32_t iErr = ERR_NONE;
113113 int32_t iBitSize = 0;
114114
@@ -362,7 +362,7 @@ uint8_t* ParseNalHeader (PWelsDecoderContext pCtx, SNalUnitHeader* pNalUnitHeade · 247 unmodified lines
362362 }
363363
364364
365−bool_t CheckAccessUnitBoundaryExt (PNalUnitHeaderExt pLastNalHdrExt, PNalUnitHeaderExt pCurNalHeaderExt,
365+bool CheckAccessUnitBoundaryExt (PNalUnitHeaderExt pLastNalHdrExt, PNalUnitHeaderExt pCurNalHeaderExt,
366366 PSliceHeader pLastSliceHeader, PSliceHeader pCurSliceHeader) {
367367 const PSps kpSps = pCurSliceHeader->pSps;
368368
@@ -421,7 +421,7 @@ bool_t CheckAccessUnitBoundaryExt (PNalUnitHeaderExt pLastNalHdrExt, PNalUnitHea · 52 unmodified lines
421421 }
422422
423423
424−bool_t CheckAccessUnitBoundary (const PNalUnit kpCurNal, const PNalUnit kpLastNal, const PSps kpSps) {
424+bool CheckAccessUnitBoundary (const PNalUnit kpCurNal, const PNalUnit kpLastNal, const PSps kpSps) {
425425 const PNalUnitHeaderExt kpLastNalHeaderExt = &kpLastNal->sNalHeaderExt;
426426 const PNalUnitHeaderExt kpCurNalHeaderExt = &kpCurNal->sNalHeaderExt;
427427 const SSliceHeader* kpLastSliceHeader = &kpLastNal->sNalData.sVclNal.sSliceHeaderExt.sSliceHeader;
@@ -560,7 +560,7 @@ int32_t ParseNonVclNal (PWelsDecoderContext pCtx, uint8_t* pRbsp, const int32_t · 132 unmodified lines
560560 }
561561
562562 void_t ParseRefBasePicMarking (PBitStringAux pBs, PRefBasePicMarking pRefBasePicMarking) {
563− const bool_t kbAdaptiveMarkingModeFlag = !!BsGetOneBit (pBs);
563+ const bool kbAdaptiveMarkingModeFlag = !!BsGetOneBit (pBs);
564564 pRefBasePicMarking->bAdaptiveRefBasePicMarkingModeFlag = kbAdaptiveMarkingModeFlag;
565565 if (kbAdaptiveMarkingModeFlag) {
566566 int32_t iIdx = 0;
@@ -670,7 +670,7 @@ static const SLevelLimits g_kSLevelLimits[17] = { · 103 unmodified lines
670670 {2073600, 36864, 184320, 240000, 240000, -2048, 2047, 2, 16} /* level 5.2 */
671671 };
672672
673−const SLevelLimits *GetLevelLimits(int32_t iLevelIdx, bool_t bConstraint3) {
673+const SLevelLimits *GetLevelLimits(int32_t iLevelIdx, bool bConstraint3) {
674674 switch (iLevelIdx) {
675675 case 10:
676676 return &g_kSLevelLimits[0];
@@ -737,8 +737,8 @@ int32_t ParseSps (PWelsDecoderContext pCtx, PBitStringAux pBsAux, int32_t* pPicW · 60 unmodified lines
737737 ProfileIdc uiProfileIdc;
738738 uint8_t uiLevelIdc;
739739 int32_t iSpsId;
740− bool_t bConstraintSetFlags[6] = { false };
741− const bool_t kbUseSubsetFlag = IS_SUBSET_SPS_NAL (pNalHead->eNalUnitType);
740+ bool bConstraintSetFlags[6] = { false };
741+ const bool kbUseSubsetFlag = IS_SUBSET_SPS_NAL (pNalHead->eNalUnitType);
742742
743743
744744 if (kbUseSubsetFlag) { // SubsetSps
codec/decoder/core/src/deblocking.cpp+2−2
@@ -252,8 +252,8 @@ int32_t DeblockingAvailableNoInterlayer (PDqLayer pCurDqLayer, int32_t iFilterId · 251 unmodified lines
252252 int32_t iMbY = pCurDqLayer->iMbY;
253253 int32_t iMbX = pCurDqLayer->iMbX;
254254 int32_t iMbXy = pCurDqLayer->iMbXyIndex;
255− bool_t bLeftFlag = FALSE;
256− bool_t bTopFlag = FALSE;
255+ bool bLeftFlag = FALSE;
256+ bool bTopFlag = FALSE;
257257
258258 if (2 == iFilterIdc) {
259259 bLeftFlag = (iMbX > 0) && (pCurDqLayer->pSliceIdc[iMbXy] == pCurDqLayer->pSliceIdc[iMbXy - 1]);
codec/decoder/core/src/decode_slice.cpp+2−2
@@ -234,7 +234,7 @@ void_t WelsLumaDcDequantIdct (int16_t* pBlock, int32_t iQp) { · 233 unmodified lines
234234 #undef STRIDE
235235 }
236236
237−int32_t WelsMbIntraPredictionConstruction (PWelsDecoderContext pCtx, PDqLayer pCurLayer, bool_t bOutput) {
237+int32_t WelsMbIntraPredictionConstruction (PWelsDecoderContext pCtx, PDqLayer pCurLayer, bool bOutput) {
238238 //seems IPCM should not enter this path
239239 int32_t iMbXy = pCurLayer->iMbXyIndex;
240240
@@ -351,7 +351,7 @@ void_t WelsChromaDcIdct (int16_t* pBlock) { · 110 unmodified lines
351351 pBlk[iStride1] = (iE - iB) >> 1;
352352 }
353353
354−int32_t WelsDecodeSlice (PWelsDecoderContext pCtx, bool_t bFirstSliceInLayer, PNalUnit pNalCur) {
354+int32_t WelsDecodeSlice (PWelsDecoderContext pCtx, bool bFirstSliceInLayer, PNalUnit pNalCur) {
355355 PDqLayer pCurLayer = pCtx->pCurDqLayer;
356356 PFmo pFmo = pCtx->pFmo;
357357 int32_t i, iRet;
codec/decoder/core/src/decoder.cpp+4−4
@@ -177,11 +177,11 @@ void_t WelsDecoderDefaults (PWelsDecoderContext pCtx) { · 176 unmodified lines
177177 * get size of reference picture list in target layer incoming, = (iNumRefFrames x 2)
178178 */
179179 static inline int32_t GetTargetRefListSize (PWelsDecoderContext pCtx) {
180− bool_t* pSubsetSpsAvail = &pCtx->bSubspsAvailFlags[0];
181− bool_t* pSpsAvail = &pCtx->bSpsAvailFlags[0];
180+ bool* pSubsetSpsAvail = &pCtx->bSubspsAvailFlags[0];
181+ bool* pSpsAvail = &pCtx->bSpsAvailFlags[0];
182182 int32_t iSubsetIdx = -1;
183183 int32_t iSpsIdx = -1;
184− bool_t bExistSubsetSps = false;
184+ bool bExistSubsetSps = false;
185185 int32_t bExistSps = false;
186186 int32_t iPos = MAX_SPS_COUNT - 1;
187187 int32_t iNumRefFrames = 0;
@@ -238,7 +238,7 @@ int32_t WelsRequestMem (PWelsDecoderContext pCtx, const int32_t kiMbWidth, const · 50 unmodified lines
238238
239239 int32_t iListIdx = 0; //, mb_blocks = 0;
240240 int32_t iPicQueueSize = 0; // adaptive size of picture queue, = (pSps->iNumRefFrames x 2)
241− bool_t bNeedChangePicQueue = true;
241+ bool bNeedChangePicQueue = true;
242242
243243 WELS_VERIFY_RETURN_IF (ERR_INFO_INVALID_PARAM, (NULL == pCtx || kiPicWidth <= 0 || kiPicHeight <= 0))
244244
codec/decoder/core/src/decoder_core.cpp+19−19
@@ -105,7 +105,7 @@ static inline int32_t DecodeFrameConstruction (PWelsDecoderContext pCtx, uint8_t · 104 unmodified lines
105105 return 0;
106106 }
107107
108−inline bool_t CheckSliceNeedReconstruct (int16_t iCurDid, int16_t iCurQid, bool_t bStoreRefBasePicFlag,
108+inline bool CheckSliceNeedReconstruct (int16_t iCurDid, int16_t iCurQid, bool bStoreRefBasePicFlag,
109109 uint8_t uiDidMax, uint8_t uiLayerDqId, uint8_t uiTargetDqId) {
110110 return ((iCurDid == uiDidMax) && (iCurQid == BASE_QUALITY_ID) && (bStoreRefBasePicFlag)) // store base
111111 || (uiLayerDqId == uiTargetDqId); // target layer
@@ -201,7 +201,7 @@ int32_t ParseRefPicListReordering (PBitStringAux pBs, PSliceHeader pSh) { · 89 unmodified lines
201201 }
202202
203203 int32_t ParseDecRefPicMarking (PWelsDecoderContext pCtx, PBitStringAux pBs, PSliceHeader pSh, PSps pSps,
204− const bool_t kbIdrFlag) {
204+ const bool kbIdrFlag) {
205205 PRefPicMarking const kpRefMarking = &pSh->sRefMarking;
206206
207207 if (kbIdrFlag) {
@@ -238,7 +238,7 @@ int32_t ParseDecRefPicMarking (PWelsDecoderContext pCtx, PBitStringAux pBs, PSli · 30 unmodified lines
238238 return ERR_NONE;
239239 }
240240
241−bool_t FillDefaultSliceHeaderExt (PSliceHeaderExt pShExt, PNalUnitHeaderExt pNalExt) {
241+bool FillDefaultSliceHeaderExt (PSliceHeaderExt pShExt, PNalUnitHeaderExt pNalExt) {
242242 if (pShExt == NULL || pNalExt == NULL)
243243 return false;
244244
@@ -392,7 +392,7 @@ int32_t CheckPpsId (PWelsDecoderContext pCtx, PPps* ppPps, uint32_t uiPpsId) { · 147 unmodified lines
392392 }
393393
394394 int32_t CheckSpsId (PWelsDecoderContext pCtx, PSubsetSps* ppSubsetSps, PSps* ppSps, int32_t iSpsId,
395− bool_t bExtensionFlag) {
395+ bool bExtensionFlag) {
396396 PSps pSpsList = pCtx->sSpsBuffer;
397397 PSubsetSps pSubspsList = pCtx->sSubsetSpsBuffer;
398398
@@ -455,7 +455,7 @@ int32_t CheckSpsId (PWelsDecoderContext pCtx, PSubsetSps* ppSubsetSps, PSps* ppS · 56 unmodified lines
455455 * decode_slice_header_avc
456456 * Parse slice header of bitstream in avc for storing data structure
457457 */
458−int32_t ParseSliceHeaderSyntaxs (PWelsDecoderContext pCtx, PBitStringAux pBs, const bool_t kbExtensionFlag) {
458+int32_t ParseSliceHeaderSyntaxs (PWelsDecoderContext pCtx, PBitStringAux pBs, const bool kbExtensionFlag) {
459459 PNalUnit const kpCurNal = pCtx->pAccessUnitList->pNalUnitsList[pCtx->pAccessUnitList->uiAvailUnitsNum - 1];
460460
461461 PNalUnitHeaderExt pNalHeaderExt = NULL;
@@ -469,8 +469,8 @@ int32_t ParseSliceHeaderSyntaxs (PWelsDecoderContext pCtx, PBitStringAux pBs, co · 7 unmodified lines
469469 int32_t iRet = ERR_NONE;
470470 uint8_t uiSliceType = 0;
471471 uint8_t uiQualityId = BASE_QUALITY_ID;
472− bool_t bIdrFlag = false;
473− bool_t bSgChangeCycleInvolved = false; // involved slice group change cycle ?
472+ bool bIdrFlag = false;
473+ bool bSgChangeCycleInvolved = false; // involved slice group change cycle ?
474474
475475 if (kpCurNal == NULL) {
476476 return ERR_INFO_OUT_OF_MEMORY;
@@ -484,7 +484,7 @@ int32_t ParseSliceHeaderSyntaxs (PWelsDecoderContext pCtx, PBitStringAux pBs, co · 7 unmodified lines
484484
485485 if (pSliceHeadExt) {
486486 SRefBasePicMarking sBaseMarking;
487− const bool_t kbStoreRefBaseFlag = pSliceHeadExt->bStoreRefBasePicFlag;
487+ const bool kbStoreRefBaseFlag = pSliceHeadExt->bStoreRefBasePicFlag;
488488 memcpy (&sBaseMarking, &pSliceHeadExt->sRefBasePicMarking, sizeof (SRefBasePicMarking)); //confirmed_safe_unsafe_usage
489489 memset (pSliceHeadExt, 0, sizeof (SSliceHeaderExt));
490490 pSliceHeadExt->bStoreRefBasePicFlag = kbStoreRefBaseFlag;
@@ -619,7 +619,7 @@ int32_t ParseSliceHeaderSyntaxs (PWelsDecoderContext pCtx, PBitStringAux pBs, co · 128 unmodified lines
619619 if (kbExtensionFlag) {
620620 uiQualityId = pNalHeaderExt->uiQualityId;
621621 } else if (uiSliceType == P_SLICE || uiSliceType == SP_SLICE || uiSliceType == B_SLICE) {
622− const bool_t kbBipredFlag = (B_SLICE == uiSliceType);
622+ const bool kbBipredFlag = (B_SLICE == uiSliceType);
623623 if (kbBipredFlag) {
624624 WelsLog (pCtx, WELS_LOG_WARNING, "ParseSliceHeaderSyntaxs(): kbBipredFlag = 1 not supported.\n");
625625 return GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_UNSUPPORTED_BIPRED);
@@ -820,7 +820,7 @@ int32_t ParseSliceHeaderSyntaxs (PWelsDecoderContext pCtx, PBitStringAux pBs, co · 194 unmodified lines
820820 * pSrc: mark as decoded prefix NAL
821821 * ppDst: succeeded VCL NAL based AVC (I/P Slice)
822822 */
823−bool_t PrefetchNalHeaderExtSyntax (PWelsDecoderContext pCtx, PNalUnit const kppDst, PNalUnit const kpSrc) {
823+bool PrefetchNalHeaderExtSyntax (PWelsDecoderContext pCtx, PNalUnit const kppDst, PNalUnit const kpSrc) {
824824 PNalUnitHeaderExt pNalHdrExtD = NULL, pNalHdrExtS = NULL;
825825 PSliceHeaderExt pShExtD = NULL;
826826 PPrefixNalUnit pPrefixS = NULL;
@@ -1297,7 +1297,7 @@ void_t RefineIdxNoInterLayerPred (PAccessUnit pCurAu, int32_t* pIdxNoInterLayerP · 470 unmodified lines
12971297 int32_t iCurNalDependId, iCurNalQualityId, iCurNalTId, iCurNalFrameNum, iCurNalPoc, iCurNalFirstMb, iCurIdx,
12981298 iFinalIdxNoInterLayerPred;
12991299
1300− bool_t bMultiSliceFind = false;
1300+ bool bMultiSliceFind = false;
13011301
13021302 iFinalIdxNoInterLayerPred = 0;
13031303 iCurIdx = *pIdxNoInterLayerPred - 1;
@@ -1332,7 +1332,7 @@ void_t RefineIdxNoInterLayerPred (PAccessUnit pCurAu, int32_t* pIdxNoInterLayerP · 28 unmodified lines
13321332 }
13331333 }
13341334
1335−bool_t CheckPocOfCurValidNalUnits (PAccessUnit pCurAu, int32_t pIdxNoInterLayerPred) {
1335+bool CheckPocOfCurValidNalUnits (PAccessUnit pCurAu, int32_t pIdxNoInterLayerPred) {
13361336 int32_t iEndIdx = pCurAu->uiEndPos;
13371337 int32_t iCurAuPoc =
13381338 pCurAu->pNalUnitsList[pIdxNoInterLayerPred]->sNalData.sVclNal.sSliceHeaderExt.sSliceHeader.iPicOrderCntLsb;
@@ -1347,7 +1347,7 @@ bool_t CheckPocOfCurValidNalUnits (PAccessUnit pCurAu, int32_t pIdxNoInterLayerP · 8 unmodified lines
13471347 return true;
13481348 }
13491349
1350−bool_t CheckIntegrityNalUnitsList (PWelsDecoderContext pCtx) {
1350+bool CheckIntegrityNalUnitsList (PWelsDecoderContext pCtx) {
13511351 PAccessUnit pCurAu = pCtx->pAccessUnitList;
13521352 const int32_t kiEndPos = pCurAu->uiEndPos;
13531353 int32_t iIdxNoInterLayerPred = 0;
@@ -1391,7 +1391,7 @@ bool_t CheckIntegrityNalUnitsList (PWelsDecoderContext pCtx) { · 37 unmodified lines
13911391 pCurAu->pNalUnitsList[pCurAu->uiEndPos]->sNalData.sVclNal.sSliceHeaderExt.sSliceHeader.iMbHeight << 4;
13921392 } else { //P_SLICE
13931393 //step 1: search uiDependencyId equal to pCtx->cur_seq_interval_target_dependency_id
1394− bool_t bGetDependId = false;
1394+ bool bGetDependId = false;
13951395 int32_t iIdxDependId = 0;
13961396
13971397 iIdxDependId = kiEndPos;
@@ -1406,7 +1406,7 @@ bool_t CheckIntegrityNalUnitsList (PWelsDecoderContext pCtx) { · 8 unmodified lines
14061406
14071407 //step 2: switch according to whether or not find the index of pNalUnit whose uiDependencyId equal to iCurSeqIntervalTargetDependId
14081408 if (bGetDependId) { //get the index of pNalUnit whose uiDependencyId equal to iCurSeqIntervalTargetDependId
1409− bool_t bGetNoInterPredFront = false;
1409+ bool bGetNoInterPredFront = false;
14101410 //step 2a: search iNoInterLayerPredFlag [0....iIdxDependId]
14111411 iIdxNoInterLayerPred = iIdxDependId;
14121412 while (iIdxNoInterLayerPred >= 0) {
@@ -1650,7 +1650,7 @@ void_t WelsDqLayerDecodeStart (PWelsDecoderContext pCtx, PNalUnit pCurNal, PSps · 237 unmodified lines
16501650 }
16511651 }
16521652
1653−int32_t InitRefPicList (PWelsDecoderContext pCtx, const uint8_t kuiNRi, const bool_t kbFirstSlice, int32_t iPoc) {
1653+int32_t InitRefPicList (PWelsDecoderContext pCtx, const uint8_t kuiNRi, const bool kbFirstSlice, int32_t iPoc) {
16541654 int32_t iRet = ERR_NONE;
16551655 if (kbFirstSlice)
16561656 iRet = WelsInitRefList (pCtx, iPoc);
@@ -1718,7 +1718,7 @@ int32_t DecodeCurrentAccessUnit (PWelsDecoderContext pCtx, uint8_t** ppDst, int3 · 61 unmodified lines
17181718 int16_t iLastIdD = -1, iLastIdQ = -1;
17191719 int16_t iCurrIdD = 0, iCurrIdQ = 0;
17201720 uint8_t uiNalRefIdc = 0;
1721− bool_t bFreshSliceAvailable =
1721+ bool bFreshSliceAvailable =
17221722 true; // Another fresh slice comingup for given dq layer, for multiple slices in case of header parts of slices sometimes loss over error-prone channels, 8/14/2008
17231723 PPicture pStoreBasePic = NULL;
17241724
@@ -1774,7 +1774,7 @@ int32_t DecodeCurrentAccessUnit (PWelsDecoderContext pCtx, uint8_t** ppDst, int3 · 49 unmodified lines
17741774 * Loop decoding for slices (even FMO and/ multiple slices) within a dq layer
17751775 */
17761776 while (iIdx <= iEndIdx) {
1777− bool_t bReconstructSlice;
1777+ bool bReconstructSlice;
17781778 iCurrIdQ = pNalCur->sNalHeaderExt.uiQualityId;
17791779 iCurrIdD = pNalCur->sNalHeaderExt.uiDependencyId;
17801780 pSh = &pNalCur->sNalData.sVclNal.sSliceHeaderExt.sSliceHeader;
@@ -1823,7 +1823,7 @@ int32_t DecodeCurrentAccessUnit (PWelsDecoderContext pCtx, uint8_t** ppDst, int3 · 42 unmodified lines
18231823 InitDqLayerInfo (dq_cur, &pLayerInfo, pNalCur, pCtx->pDec);
18241824
18251825 if (!dq_cur->sLayerInfo.pSps->bGapsInFrameNumValueAllowedFlag) {
1826− const bool_t kbIdrFlag = dq_cur->sLayerInfo.sNalHeaderExt.bIdrFlag
1826+ const bool kbIdrFlag = dq_cur->sLayerInfo.sNalHeaderExt.bIdrFlag
18271827 || (dq_cur->sLayerInfo.sNalHeaderExt.sNalUnitHeader.eNalUnitType == NAL_UNIT_CODED_SLICE_IDR);
18281828 // Subclause 8.2.5.2 Decoding process for gaps in frame_num
18291829 if (!kbIdrFlag &&
codec/decoder/core/src/expand_pic.cpp+1−1
@@ -144,7 +144,7 @@ void_t ExpandReferencingPicture (PPicture pPic, PExpandPictureFunc pExpLuma, PEx · 143 unmodified lines
144144 pExpLuma (pPicY, pPic->iLinesize[0], kiWidthY, kiHeightY);
145145 if (kiWidthUV >= 16) {
146146 // fix coding picture size as 16x16 issues 7/27/2010
147− const bool_t kbChrAligned = /*(kiWidthUV >= 16) && */ ((kiWidthUV & 0x0F) == 0); // chroma planes: (16+kiWidthUV) & 15
147+ const bool kbChrAligned = /*(kiWidthUV >= 16) && */ ((kiWidthUV & 0x0F) == 0); // chroma planes: (16+kiWidthUV) & 15
148148 pExpChroma[kbChrAligned] (pPicCb, pPic->iLinesize[1], kiWidthUV, kiHeightUV);
149149 pExpChroma[kbChrAligned] (pPicCr, pPic->iLinesize[2], kiWidthUV, kiHeightUV);
150150 } else {
codec/decoder/core/src/fmo.cpp+4−4
@@ -119,7 +119,7 @@ static inline int32_t FmoGenerateSliceGroup (PFmo pFmo, const PPps kpPps, const · 118 unmodified lines
119119 const int32_t kiMbHeight) {
120120 int32_t iNumMb = 0;
121121 int32_t iErr = 0;
122− bool_t bResolutionChanged = false;
122+ bool bResolutionChanged = false;
123123
124124 // the cases we would not like
125125 WELS_VERIFY_RETURN_IF (1, (NULL == pFmo || NULL == kpPps))
@@ -238,7 +238,7 @@ void_t UninitFmoList (PFmo pFmo, const int32_t kiCnt, const int32_t kiAvail) { · 112 unmodified lines
238238 *
239239 * \return true - changed or not initialized yet; false - not change at all
240240 */
241−bool_t FmoParamSetsChanged (PFmo pFmo, const int32_t kiCountNumMb, const int32_t kiSliceGroupType,
241+bool FmoParamSetsChanged (PFmo pFmo, const int32_t kiCountNumMb, const int32_t kiSliceGroupType,
242242 const int32_t kiSliceGroupCount) {
243243 WELS_VERIFY_RETURN_IF (false, (NULL == pFmo))
244244
@@ -258,7 +258,7 @@ bool_t FmoParamSetsChanged (PFmo pFmo, const int32_t kiCountNumMb, const int32_t · 13 unmodified lines
258258 *
259259 * \return true - update/insert successfully; false - failed;
260260 */
261−bool_t FmoParamUpdate (PFmo pFmo, PSps pSps, PPps pPps, int32_t* pActiveFmoNum) {
261+bool FmoParamUpdate (PFmo pFmo, PSps pSps, PPps pPps, int32_t* pActiveFmoNum) {
262262 const uint32_t kuiMbWidth = pSps->iMbWidth;
263263 const uint32_t kuiMbHeight = pSps->iMbHeight;
264264
@@ -330,4 +330,4 @@ MB_XY_T FmoNextMb (PFmo pFmo, const MB_XY_T kiMbXy) { · 65 unmodified lines
330330 return iNextMb;
331331 }
332332
333−} // namespace WelsDec
333+} // namespace WelsDec
codec/decoder/core/src/get_intra_predictor.cpp+1−1
@@ -653,4 +653,4 @@ void_t WelsI16x16LumaPredDcNA_c (uint8_t* pPred, const int32_t kiStride) { · 652 unmodified lines
653653 } while (i-- > 0);
654654 }
655655
656−} // namespace WelsDec
656+} // namespace WelsDec
codec/decoder/core/src/manage_dec_ref.cpp+5−5
@@ -92,7 +92,7 @@ void_t WelsResetRefPic (PWelsDecoderContext pCtx) { · 91 unmodified lines
9292 */
9393 int32_t WelsInitRefList (PWelsDecoderContext pCtx, int32_t iPoc) {
9494 int32_t i, j, iCount = 0;
95− const bool_t kbUseRefBasePicFlag = pCtx->pCurDqLayer->bUseRefBasePicFlag;
95+ const bool kbUseRefBasePicFlag = pCtx->pCurDqLayer->bUseRefBasePicFlag;
9696 PPicture* ppShoreRefList = pCtx->sRefPic.pShortRefList[LIST_0];
9797 PPicture* ppLongRefList = pCtx->sRefPic.pLongRefList[LIST_0];
9898 memset (pCtx->sRefPic.pRefList[LIST_0], 0, MAX_REF_PIC_COUNT * sizeof (PPicture));
@@ -215,12 +215,12 @@ int32_t WelsReorderRefList (PWelsDecoderContext pCtx) { · 116 unmodified lines
215215 return ERR_NONE;
216216 }
217217
218−int32_t WelsMarkAsRef (PWelsDecoderContext pCtx, const bool_t kbRefBaseMarkingFlag) {
218+int32_t WelsMarkAsRef (PWelsDecoderContext pCtx, const bool kbRefBaseMarkingFlag) {
219219 PRefPic pRefPic = &pCtx->sRefPic;
220220 PRefPicMarking pRefPicMarking = pCtx->pCurDqLayer->pRefPicMarking;
221221 PRefBasePicMarking pRefPicBaseMarking = pCtx->pCurDqLayer->pRefPicBaseMarking;
222222 PAccessUnit pCurAU = pCtx->pAccessUnitList;
223− bool_t bIsIDRAU = FALSE;
223+ bool bIsIDRAU = FALSE;
224224 uint32_t j;
225225
226226 int32_t iRet = ERR_NONE;
@@ -322,7 +322,7 @@ static int32_t MMCO (PWelsDecoderContext pCtx, PRefPicMarking pRefPicMarking) { · 95 unmodified lines
322322
323323 return ERR_NONE;
324324 }
325−static int32_t MMCOProcess (PWelsDecoderContext pCtx, uint32_t uiMmcoType, bool_t bRefBasePic,
325+static int32_t MMCOProcess (PWelsDecoderContext pCtx, uint32_t uiMmcoType, bool bRefBasePic,
326326 int32_t iShortFrameNum, uint32_t uiLongTermPicNum , int32_t iLongTermFrameIdx, int32_t iMaxLongTermFrameIdx) {
327327 PRefPic pRefPic = &pCtx->sRefPic;
328328 PPicture pPic = NULL;
@@ -551,4 +551,4 @@ static int32_t MarkAsLongTerm (PRefPic pRefPic, int32_t iFrameNum, int32_t iLong · 222 unmodified lines
551551 return iRet;
552552 }
553553
554−} // namespace WelsDec
554+} // namespace WelsDec
codec/decoder/core/src/memmgr_nal_unit.cpp+1−1
@@ -143,4 +143,4 @@ PNalUnit MemGetNextNal (PAccessUnit* ppAu) { · 142 unmodified lines
143143 return pNu;
144144 }
145145
146−} // namespace WelsDec
146+} // namespace WelsDec
codec/decoder/core/src/mv_pred.cpp+2−2
@@ -44,7 +44,7 @@ · 43 unmodified lines
4444
4545 namespace WelsDec {
4646 void_t PredPSkipMvFromNeighbor (PDqLayer pCurLayer, int16_t iMvp[2]) {
47− bool_t bTopAvail, bLeftTopAvail, bRightTopAvail, bLeftAvail;
47+ bool bTopAvail, bLeftTopAvail, bRightTopAvail, bLeftAvail;
4848
4949 int32_t iCurSliceIdc, iTopSliceIdc, iLeftTopSliceIdc, iRightTopSliceIdc, iLeftSliceIdc;
5050 int32_t iLeftTopType, iRightTopType, iTopType, iLeftType;
@@ -369,4 +369,4 @@ void_t UpdateP8x16MotionInfo (PDqLayer pCurDqLayer, int16_t iMotionVector[LIST_A · 318 unmodified lines
369369 }
370370 }
371371
372−} // namespace WelsDec
372+} // namespace WelsDec
codec/decoder/core/src/parse_mb_syn_cavlc.cpp+6−6
@@ -398,7 +398,7 @@ int32_t CheckIntra16x16PredMode (uint8_t uiSampleAvail, int8_t* pMode) { · 397 unmodified lines
398398 *pMode = I16_PRED_DC_128;
399399 }
400400 } else {
401− bool_t bModeAvail = CHECK_I16_MODE (*pMode, iLeftAvail, iTopAvail, bLeftTopAvail);
401+ bool bModeAvail = CHECK_I16_MODE (*pMode, iLeftAvail, iTopAvail, bLeftTopAvail);
402402 if (0 == bModeAvail) {
403403 return ERR_INFO_INVALID_I16x16_PRED_MODE;
404404 }
@@ -423,7 +423,7 @@ int32_t CheckIntraChromaPredMode (uint8_t uiSampleAvail, int8_t* pMode) { · 18 unmodified lines
423423 *pMode = C_PRED_DC_128;
424424 }
425425 } else {
426− bool_t bModeAvail = CHECK_CHROMA_MODE (*pMode, iLeftAvail, iTopAvail, bLeftTopAvail);
426+ bool bModeAvail = CHECK_CHROMA_MODE (*pMode, iLeftAvail, iTopAvail, bLeftTopAvail);
427427 if (0 == bModeAvail) {
428428 return ERR_INFO_INVALID_I_CHROMA_PRED_MODE;
429429 }
@@ -455,7 +455,7 @@ int32_t CheckIntra4x4PredMode (int32_t* pSampleAvail, int8_t* pMode, int32_t iIn · 25 unmodified lines
455455 iFinalMode = I4_PRED_DC_128;
456456 }
457457 } else {
458− bool_t bModeAvail = CHECK_I4_MODE (*pMode, iLeftAvail, iTopAvail, bLeftTopAvail);
458+ bool bModeAvail = CHECK_I4_MODE (*pMode, iLeftAvail, iTopAvail, bLeftTopAvail);
459459 if (0 == bModeAvail) {
460460 return ERR_INVALID_INTRA4X4_MODE;
461461 }
@@ -486,7 +486,7 @@ void_t BsEndCavlc (PBitStringAux pBs) { · 24 unmodified lines
486486
487487 // return: used bits
488488 static int32_t CavlcGetTrailingOnesAndTotalCoeff (uint8_t& uiTotalCoeff, uint8_t& uiTrailingOnes,
489− SReadBitsCache* pBitsCache, SVlcTable* pVlcTable, bool_t bChromaDc, int8_t nC) {
489+ SReadBitsCache* pBitsCache, SVlcTable* pVlcTable, bool bChromaDc, int8_t nC) {
490490 const uint8_t* kpVlcTableMoreBitsCountList[3] = {g_kuiVlcTableMoreBitsCount0, g_kuiVlcTableMoreBitsCount1, g_kuiVlcTableMoreBitsCount2};
491491 int32_t iUsedBits = 0;
492492 int32_t iIndexVlc, iIndexValue, iNcMapIdx;
@@ -587,7 +587,7 @@ static int32_t CavlcGetLevelVal (int32_t iLevel[16], SReadBitsCache* pBitsCache, · 94 unmodified lines
587587 }
588588
589589 static int32_t CavlcGetTotalZeros (int32_t& iZerosLeft, SReadBitsCache* pBitsCache, uint8_t uiTotalCoeff,
590− SVlcTable* pVlcTable, bool_t bChromaDc) {
590+ SVlcTable* pVlcTable, bool bChromaDc) {
591591 int32_t iCount, iUsedBits = 0;
592592 const uint8_t* kpBitNumMap;
593593 uint32_t uiValue;
@@ -673,7 +673,7 @@ int32_t WelsResidualBlockCavlc (SVlcTable* pVlcTable, uint8_t* pNonZeroCountCach · 79 unmodified lines
673673 int32_t iUsedBits = 0;
674674 int32_t iCurIdx = pBs->iIndex;
675675 uint8_t* pBuf = ((uint8_t*)pBs->pStartBuf) + (iCurIdx >> 3);
676− bool_t bChromaDc = (CHROMA_DC == iResidualProperty);
676+ bool bChromaDc = (CHROMA_DC == iResidualProperty);
677677 uint8_t bChroma = (bChromaDc || CHROMA_AC == iResidualProperty);
678678 SReadBitsCache sReadBitsCache;
679679
codec/decoder/core/src/pic_queue.cpp+1−1
@@ -149,4 +149,4 @@ PPicture PrefetchPic (PPicBuff pPicBuf) { · 148 unmodified lines
149149 return pPic;
150150 }
151151
152−} // namespace WelsDec
152+} // namespace WelsDec
codec/decoder/core/src/rec_mb.cpp+2−2
@@ -44,7 +44,7 @@ · 43 unmodified lines
4444
4545 namespace WelsDec {
4646
47−void_t WelsFillRecNeededMbInfo (PWelsDecoderContext pCtx, bool_t bOutput, PDqLayer pCurLayer) {
47+void_t WelsFillRecNeededMbInfo (PWelsDecoderContext pCtx, bool bOutput, PDqLayer pCurLayer) {
4848 PPicture pCurPic = pCtx->pDec;
4949 int32_t iLumaStride = pCurPic->iLinesize[0];
5050 int32_t iChromaStride = pCurPic->iLinesize[1];
@@ -235,7 +235,7 @@ static inline void_t BaseMC (sMCRefMember* pMCRefMem, int32_t iXOffset, int32_t · 184 unmodified lines
235235 uint8_t* pDstY = pMCRefMem->pDstY;
236236 uint8_t* pDstU = pMCRefMem->pDstU;
237237 uint8_t* pDstV = pMCRefMem->pDstV;
238− bool_t bExpand = false;
238+ bool bExpand = false;
239239
240240 ENFORCE_STACK_ALIGN_1D (uint8_t, uiExpandBuf, (PADDING_LENGTH + 6) * (PADDING_LENGTH + 6), 16);
241241

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