ref: 2b77fe7f49297d35ec9b6f0d2457aa0e07f04dfd
parent: 17d7b5d72ec00aa5e901843b499371704f8a313e
author: Martin Storsjö <[email protected]>
date: Sat Feb 8 18:24:33 EST 2014
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.
--- a/codec/common/deblocking_common.cpp
+++ b/codec/common/deblocking_common.cpp
@@ -12,13 +12,13 @@
int32_t q0 = pPix[0];
int32_t q1 = pPix[iStrideX];
int32_t q2 = pPix[2 * iStrideX];
- bool_t bDetaP0Q0 = WELS_ABS (p0 - q0) < iAlpha;
- bool_t bDetaP1P0 = WELS_ABS (p1 - p0) < iBeta;
- bool_t bDetaQ1Q0 = WELS_ABS (q1 - q0) < iBeta;
+ bool bDetaP0Q0 = WELS_ABS (p0 - q0) < iAlpha;
+ bool bDetaP1P0 = WELS_ABS (p1 - p0) < iBeta;
+ bool bDetaQ1Q0 = WELS_ABS (q1 - q0) < iBeta;
int32_t iTc = iTc0;
if (bDetaP0Q0 && bDetaP1P0 && bDetaQ1Q0) {- bool_t bDetaP2P0 = WELS_ABS (p2 - p0) < iBeta;
- bool_t bDetaQ2Q0 = WELS_ABS (q2 - q0) < iBeta;
+ bool bDetaP2P0 = WELS_ABS (p2 - p0) < iBeta;
+ bool bDetaQ2Q0 = WELS_ABS (q2 - q0) < iBeta;
if (bDetaP2P0) {pPix[-2 * iStrideX] = p1 + WELS_CLIP3 ((p2 + ((p0 + q0 + 1) >> 1) - (p1 << 1)) >> 1, -iTc0, iTc0);
iTc++;
@@ -38,7 +38,7 @@
void_t DeblockLumaEq4_c (uint8_t* pPix, int32_t iStrideX, int32_t iStrideY, int32_t iAlpha, int32_t iBeta) {int32_t p0, p1, p2, q0, q1, q2;
int32_t iDetaP0Q0;
- bool_t bDetaP1P0, bDetaQ1Q0;
+ bool bDetaP1P0, bDetaQ1Q0;
for (int32_t i = 0; i < 16; i++) {p0 = pPix[-iStrideX];
p1 = pPix[-2 * iStrideX];
@@ -51,8 +51,8 @@
bDetaQ1Q0 = WELS_ABS (q1 - q0) < iBeta;
if ((iDetaP0Q0 < iAlpha) && bDetaP1P0 && bDetaQ1Q0) { if (iDetaP0Q0 < ((iAlpha >> 2) + 2)) {- bool_t bDetaP2P0 = WELS_ABS (p2 - p0) < iBeta;
- bool_t bDetaQ2Q0 = WELS_ABS (q2 - q0) < iBeta;
+ bool bDetaP2P0 = WELS_ABS (p2 - p0) < iBeta;
+ bool bDetaQ2Q0 = WELS_ABS (q2 - q0) < iBeta;
if (bDetaP2P0) {const int32_t p3 = pPix[-4 * iStrideX];
pPix[-iStrideX] = (p2 + (p1 << 1) + (p0 << 1) + (q0 << 1) + q1 + 4) >> 3; //p0
@@ -92,7 +92,7 @@
void_t DeblockChromaLt4_c (uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStrideX, int32_t iStrideY, int32_t iAlpha,
int32_t iBeta, int8_t* pTc) {int32_t p0, p1, q0, q1, iDeta;
- bool_t bDetaP0Q0, bDetaP1P0, bDetaQ1Q0;
+ bool bDetaP0Q0, bDetaP1P0, bDetaQ1Q0;
for (int32_t i = 0; i < 8; i++) {int32_t iTc0 = pTc[i >> 1];
@@ -134,7 +134,7 @@
void_t DeblockChromaEq4_c (uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStrideX, int32_t iStrideY, int32_t iAlpha,
int32_t iBeta) {int32_t p0, p1, q0, q1;
- bool_t bDetaP0Q0, bDetaP1P0, bDetaQ1Q0;
+ bool bDetaP0Q0, bDetaP1P0, bDetaQ1Q0;
for (int32_t i = 0; i < 8; i++) {//cb
p0 = pPixCb[-iStrideX];
--- a/codec/common/macros.h
+++ b/codec/common/macros.h
@@ -276,7 +276,7 @@
#define BUTTERFLY4x8(dw) (((uint64_t)(dw)<<32) | (dw))
#endif//BUTTERFLY4x8
-static inline bool_t WELS_POWER2_IF (uint32_t v) {+static inline bool WELS_POWER2_IF (uint32_t v) {return (v && ! (v & (v - 1)));
}
--- a/codec/common/typedefs.h
+++ b/codec/common/typedefs.h
@@ -69,8 +69,6 @@
#endif//EPSN
#define EPSN (0.000001f) // (1e-6) // desired float precision
-typedef bool bool_t;
-
#ifndef FALSE
#define FALSE ((int32_t)0)
#endif//FALSE
--- a/codec/console/enc/src/welsenc.cpp
+++ b/codec/console/enc/src/welsenc.cpp
@@ -255,7 +255,7 @@
while (!cRdLayerCfg.EndOfFile()) {long iLayerRd = cRdLayerCfg.ReadLine (&strTag[0]);
- bool_t bFound = false;
+ bool bFound = false;
if (iLayerRd > 0) {if (strTag[0].empty())
continue;
@@ -283,7 +283,7 @@
} else if (strTag[0].compare ("ProfileIdc") == 0) {pDLayer->uiProfileIdc = atoi (strTag[1].c_str());
} else if (strTag[0].compare ("FRExt") == 0) {-// pDLayer->frext_mode = (bool_t)atoi(strTag[1].c_str());
+// pDLayer->frext_mode = (bool)atoi(strTag[1].c_str());
} else if (strTag[0].compare ("SpatialBitrate") == 0) {pDLayer->iSpatialBitrate = 1000 * atoi (strTag[1].c_str());
if (pSvcParam.bEnableRc && pDLayer->iSpatialBitrate <= 0) {@@ -523,7 +523,7 @@
} else if (strTag[0].compare ("ProfileIdc") == 0) {pDLayer->uiProfileIdc = atoi (strTag[1].c_str());
} else if (strTag[0].compare ("FRExt") == 0) {-// pDLayer->frext_mode = (bool_t)atoi(strTag[1].c_str());
+// pDLayer->frext_mode = (bool)atoi(strTag[1].c_str());
} else if (strTag[0].compare ("SpatialBitrate") == 0) {pDLayer->iSpatialBitrate = 1000 * atoi (strTag[1].c_str());
} else if (strTag[0].compare ("InitialQP") == 0) {@@ -1040,8 +1040,8 @@
iFrameIdx = 0;
while (iFrameIdx < iTotalFrameMax && (((int32_t)sSvcParam.uiFrameToBeCoded <= 0)
|| (iFrameIdx < (int32_t)sSvcParam.uiFrameToBeCoded))) {- bool_t bOnePicAvailableAtLeast = false;
- bool_t bSomeSpatialUnavailable = false;
+ bool bOnePicAvailableAtLeast = false;
+ bool bSomeSpatialUnavailable = false;
#ifdef ONLY_ENC_FRAMES_NUM
// Only encoded some limited frames here
@@ -1057,7 +1057,7 @@
const int kiPicResSize = ((pDLayer->iActualWidth * pDLayer->iActualHeight) * 3) >> 1;
uint32_t uiSkipIdx = (1 << pDLayer->iTemporalResolution);
- bool_t bCanBeRead = false;
+ bool bCanBeRead = false;
if (iFrameIdx % uiSkipIdx == 0) { // such layer is enabled to encode indeedbCanBeRead = (fread (pYUV[iDlayerIdx], 1, kiPicResSize, pFileYUV[iDlayerIdx]) == kiPicResSize);
--- a/codec/decoder/core/inc/au_parser.h
+++ b/codec/decoder/core/inc/au_parser.h
@@ -92,8 +92,8 @@
void_t ParsePrefixNalUnit (PWelsDecoderContext pCtx, PBitStringAux pBs);
-bool_t CheckAccessUnitBoundary (const PNalUnit kpCurNal, const PNalUnit kpLastNal, const PSps kpSps);
-bool_t CheckAccessUnitBoundaryExt (PNalUnitHeaderExt pLastNalHdrExt, PNalUnitHeaderExt pCurNalHeaderExt,
+bool CheckAccessUnitBoundary (const PNalUnit kpCurNal, const PNalUnit kpLastNal, const PSps kpSps);
+bool CheckAccessUnitBoundaryExt (PNalUnitHeaderExt pLastNalHdrExt, PNalUnitHeaderExt pCurNalHeaderExt,
PSliceHeader pLastSliceHeader, PSliceHeader pCurSliceHeader);
/*!
*************************************************************************************
--- a/codec/decoder/core/inc/dec_frame.h
+++ b/codec/decoder/core/inc/dec_frame.h
@@ -107,14 +107,14 @@
PPicture pRef; // reference picture pointer
PPicture pDec; // reconstruction picture pointer for layer
- bool_t bStoreRefBasePicFlag; // iCurTid == 0 && iCurQid = 0 && bEncodeKeyPic = 1
- bool_t bTCoeffLevelPredFlag;
- bool_t bConstrainedIntraResamplingFlag;
+ bool bStoreRefBasePicFlag; // iCurTid == 0 && iCurQid = 0 && bEncodeKeyPic = 1
+ bool bTCoeffLevelPredFlag;
+ bool bConstrainedIntraResamplingFlag;
uint8_t uiRefLayerDqId;
uint8_t uiRefLayerChromaPhaseXPlus1Flag;
uint8_t uiRefLayerChromaPhaseYPlus1;
uint8_t uiLayerDqId; // dq_id of current layer
- bool_t bUseRefBasePicFlag; // whether reference pic or reference base pic is referred?
+ bool bUseRefBasePicFlag; // whether reference pic or reference base pic is referred?
};
typedef struct TagGpuAvcLayer {--- a/codec/decoder/core/inc/decode_slice.h
+++ b/codec/decoder/core/inc/decode_slice.h
@@ -48,12 +48,12 @@
int32_t WelsTargetSliceConstruction (PWelsDecoderContext pCtx); //construction based on slice
-int32_t WelsDecodeSlice (PWelsDecoderContext pCtx, bool_t bFirstSliceInLayer, PNalUnit pNalCur);
+int32_t WelsDecodeSlice (PWelsDecoderContext pCtx, bool bFirstSliceInLayer, PNalUnit pNalCur);
int32_t WelsTargetMbConstruction (PWelsDecoderContext pCtx);
-int32_t WelsMbIntraPredictionConstruction (PWelsDecoderContext pCtx, PDqLayer pCurLayer, bool_t bOutput);
+int32_t WelsMbIntraPredictionConstruction (PWelsDecoderContext pCtx, PDqLayer pCurLayer, bool bOutput);
int32_t WelsMbInterSampleConstruction (PWelsDecoderContext pCtx, PDqLayer pCurLayer,
uint8_t* pDstY, uint8_t* pDstU, uint8_t* pDstV, int32_t iStrideL, int32_t iStrideC);
int32_t WelsMbInterConstruction (PWelsDecoderContext pCtx, PDqLayer pCurLayer);
--- a/codec/decoder/core/inc/decoder_context.h
+++ b/codec/decoder/core/inc/decoder_context.h
@@ -180,8 +180,8 @@
int32_t iOutputColorFormat; // color space format to be outputed
VIDEO_BITSTREAM_TYPE eVideoType; //indicate the type of video to decide whether or not to do qp_delta error detection.
- bool_t bErrorResilienceFlag; // error resilience flag
- bool_t bHaveGotMemory; // global memory for decoder context related ever requested?
+ bool bErrorResilienceFlag; // error resilience flag
+ bool bHaveGotMemory; // global memory for decoder context related ever requested?
int32_t iImgWidthInPixel; // width of image in pixel reconstruction picture to be output
int32_t iImgHeightInPixel;// height of image in pixel reconstruction picture to be output
@@ -191,7 +191,7 @@
ESliceType eSliceType; // Slice type
int32_t iFrameNum;
int32_t iPrevFrameNum; // frame number of previous frame well decoded for non-truncated mode yet
- bool_t bLastHasMmco5; //
+ bool bLastHasMmco5; //
int32_t iErrorCode; // error code return while decoding in case packets lost
SFmo sFmoList[MAX_PPS_COUNT]; // list for FMO storage
PFmo pFmo; // current fmo context after parsed slice_header
@@ -270,25 +270,25 @@
int32_t iPicHeightReq; // picture height have requested the memory
uint8_t uiTargetDqId; // maximal DQ ID in current access unit, meaning target layer ID
- bool_t bAvcBasedFlag; // For decoding bitstream:
- bool_t bEndOfStreamFlag; // Flag on end of stream requested by external application layer
- bool_t bInitialDqLayersMem; // dq layers related memory is available?
+ bool bAvcBasedFlag; // For decoding bitstream:
+ bool bEndOfStreamFlag; // Flag on end of stream requested by external application layer
+ bool bInitialDqLayersMem; // dq layers related memory is available?
- bool_t bOnlyOneLayerInCurAuFlag; //only one layer in current AU: 1
+ bool bOnlyOneLayerInCurAuFlag; //only one layer in current AU: 1
// for EC parameter sets
- bool_t bSpsExistAheadFlag; // whether does SPS NAL exist ahead of sequence?
- bool_t bSubspsExistAheadFlag;// whether does Subset SPS NAL exist ahead of sequence?
- bool_t bPpsExistAheadFlag; // whether does PPS NAL exist ahead of sequence?
+ bool bSpsExistAheadFlag; // whether does SPS NAL exist ahead of sequence?
+ bool bSubspsExistAheadFlag;// whether does Subset SPS NAL exist ahead of sequence?
+ bool bPpsExistAheadFlag; // whether does PPS NAL exist ahead of sequence?
- bool_t bSpsAvailFlags[MAX_SPS_COUNT];
- bool_t bSubspsAvailFlags[MAX_SPS_COUNT];
- bool_t bPpsAvailFlags[MAX_PPS_COUNT];
- bool_t bReferenceLostAtT0Flag;
+ bool bSpsAvailFlags[MAX_SPS_COUNT];
+ bool bSubspsAvailFlags[MAX_SPS_COUNT];
+ bool bPpsAvailFlags[MAX_PPS_COUNT];
+ bool bReferenceLostAtT0Flag;
#ifdef LONG_TERM_REF
- bool_t bParamSetsLostFlag; //sps or pps do not exist or not correct
+ bool bParamSetsLostFlag; //sps or pps do not exist or not correct
- bool_t
+ bool
bCurAuContainLtrMarkSeFlag; //current AU has the LTR marking syntax element, mark the previous frame or self
int32_t iFrameNumOfAuMarkedLtr; //if bCurAuContainLtrMarkSeFlag==true, SHOULD set this variable
@@ -319,7 +319,7 @@
int32_t iFeedbackVclNalInAu;
int32_t iFeedbackTidInAu;
- bool_t bAuReadyFlag; // TRUE: one au is ready for decoding; FALSE: default value
+ bool bAuReadyFlag; // TRUE: one au is ready for decoding; FALSE: default value
//trace handle
void_t* pTraceHandle;
--- a/codec/decoder/core/inc/decoder_core.h
+++ b/codec/decoder/core/inc/decoder_core.h
@@ -89,13 +89,13 @@
* ParseSliceHeaderSyntaxs
* Parse slice header of bitstream
*/
-int32_t ParseSliceHeaderSyntaxs (PWelsDecoderContext pCtx, PBitStringAux pBs, const bool_t kbExtensionFlag);
+int32_t ParseSliceHeaderSyntaxs (PWelsDecoderContext pCtx, PBitStringAux pBs, const bool kbExtensionFlag);
/*
* Copy relative syntax elements of NALUnitHeaderExt, sRefPicBaseMarking and bStoreRefBasePicFlag in prefix nal unit.
* pSrc: mark as decoded prefix NAL
* pDst: succeeded VCL NAL based AVC (I/P Slice)
*/
-bool_t PrefetchNalHeaderExtSyntax (PWelsDecoderContext pCtx, PNalUnit const kpDst, PNalUnit const kpSrc);
+bool PrefetchNalHeaderExtSyntax (PWelsDecoderContext pCtx, PNalUnit const kpDst, PNalUnit const kpSrc);
/*
--- a/codec/decoder/core/inc/fmo.h
+++ b/codec/decoder/core/inc/fmo.h
@@ -58,7 +58,7 @@
int32_t iCountMbNum;
int32_t iSliceGroupCount;
int32_t iSliceGroupType;
-bool_t bActiveFlag;
+bool bActiveFlag;
uint8_t uiReserved[3]; // reserved padding bytes
} SFmo, *PFmo;
@@ -96,7 +96,7 @@
*
* \return true - update/insert successfully; false - failed;
*/
-bool_t FmoParamUpdate (PFmo pFmo, PSps pSps, PPps pPps, int32_t* pActiveFmoNum);
+bool FmoParamUpdate (PFmo pFmo, PSps pSps, PPps pPps, int32_t* pActiveFmoNum);
/*!
* \brief Get successive mb to be processed with given current mb_xy
--- a/codec/decoder/core/inc/manage_dec_ref.h
+++ b/codec/decoder/core/inc/manage_dec_ref.h
@@ -56,7 +56,7 @@
void_t WelsResetRefPic (PWelsDecoderContext pCtx);
int32_t WelsInitRefList (PWelsDecoderContext pCtx, int32_t iPoc);
int32_t WelsReorderRefList (PWelsDecoderContext pCtx);
-int32_t WelsMarkAsRef (PWelsDecoderContext pCtx, const bool_t kbRefBaseMarkingFlag);
+int32_t WelsMarkAsRef (PWelsDecoderContext pCtx, const bool kbRefBaseMarkingFlag);
static PPicture WelsDelShortFromList (PRefPic pRefPic, int32_t iFrameNum, ERemoveFlag eRemoveFlag);
static PPicture WelsDelLongFromList (PRefPic pRefPic, uint32_t uiLongTermFrameIdx, ERemoveFlag eRemoveFlag);
@@ -65,7 +65,7 @@
static int32_t MMCOBase (PWelsDecoderContext pCtx, PRefBasePicMarking pRefPicBaseMarking);
static int32_t MMCO (PWelsDecoderContext pCtx, PRefPicMarking pRefPicMarking);
-static int32_t MMCOProcess (PWelsDecoderContext pCtx, uint32_t uiMmcoType, bool_t bRefBasePic,
+static int32_t MMCOProcess (PWelsDecoderContext pCtx, uint32_t uiMmcoType, bool bRefBasePic,
int32_t iShortFrameNum, uint32_t uiLongTermPicNum, int32_t iLongTermFrameIdx, int32_t iMaxLongTermFrameIdx);
static int32_t SlidingWindow (PWelsDecoderContext pCtx);
--- a/codec/decoder/core/inc/nal_prefix.h
+++ b/codec/decoder/core/inc/nal_prefix.h
@@ -55,7 +55,7 @@
SNalUnitHeader sNalUnitHeader;
// uint8_t reserved_one_bit;
- bool_t bIdrFlag;
+ bool bIdrFlag;
uint8_t uiPriorityId;
int8_t iNoInterLayerPredFlag; // change as int8_t to support 3 values probably in encoder
uint8_t uiDependencyId;
@@ -62,22 +62,22 @@
uint8_t uiQualityId;
uint8_t uiTemporalId;
- bool_t bUseRefBasePicFlag;
- bool_t bDiscardableFlag;
+ bool bUseRefBasePicFlag;
+ bool bDiscardableFlag;
- bool_t bOutputFlag;
+ bool bOutputFlag;
uint8_t uiReservedThree2Bits;
// Derived variable(s)
uint8_t uiLayerDqId;
- bool_t bNalExtFlag;
+ bool bNalExtFlag;
} SNalUnitHeaderExt, *PNalUnitHeaderExt;
/* Prefix NAL Unix syntax, refer to Page 392 in JVT X201wcm */
typedef struct TagPrefixNalUnit {SRefBasePicMarking sRefPicBaseMarking;
- bool_t bStoreRefBasePicFlag;
- bool_t bPrefixNalUnitAdditionalExtFlag;
- bool_t bPrefixNalUnitExtFlag;
+ bool bStoreRefBasePicFlag;
+ bool bPrefixNalUnitAdditionalExtFlag;
+ bool bPrefixNalUnitExtFlag;
} SPrefixNalUnit, *PPrefixNalUnit;
} // namespace WelsDec
--- a/codec/decoder/core/inc/nalu.h
+++ b/codec/decoder/core/inc/nalu.h
@@ -53,7 +53,7 @@
SBitStringAux sSliceBitsRead;
uint8_t* pNalPos; // save the address of slice nal for GPU function
int32_t iNalLength; // save the nal length for GPU function
- bool_t bSliceHeaderExtFlag;
+ bool bSliceHeaderExtFlag;
} sVclNal;
SPrefixNalUnit sPrefixNal;
} sNalData;
@@ -71,7 +71,7 @@
uint32_t uiCountUnitsNum; // Count size number of malloced NAL Units in each AU list
uint32_t uiStartPos;
uint32_t uiEndPos;
-bool_t bCompletedAuFlag; // Indicate whether it is a completed AU
+bool bCompletedAuFlag; // Indicate whether it is a completed AU
} SAccessUnit, *PAccessUnit;
} // namespace WelsDec
--- a/codec/decoder/core/inc/parameter_sets.h
+++ b/codec/decoder/core/inc/parameter_sets.h
@@ -80,25 +80,25 @@
uint8_t uiBitDepthLuma;
uint8_t uiBitDepthChroma;
/* TO BE CONTINUE: POC type 1 */
-bool_t bDeltaPicOrderAlwaysZeroFlag;
-bool_t bGapsInFrameNumValueAllowedFlag;
+bool bDeltaPicOrderAlwaysZeroFlag;
+bool bGapsInFrameNumValueAllowedFlag;
-bool_t bFrameMbsOnlyFlag;
-bool_t bMbaffFlag; // MB Adapative Frame Field
-bool_t bDirect8x8InferenceFlag;
-bool_t bFrameCroppingFlag;
+bool bFrameMbsOnlyFlag;
+bool bMbaffFlag; // MB Adapative Frame Field
+bool bDirect8x8InferenceFlag;
+bool bFrameCroppingFlag;
-bool_t bVuiParamPresentFlag;
-// bool_t bTimingInfoPresentFlag;
-// bool_t bFixedFrameRateFlag;
-bool_t bConstraintSet0Flag;
-bool_t bConstraintSet1Flag;
-bool_t bConstraintSet2Flag;
-bool_t bConstraintSet3Flag;
-bool_t bSeparateColorPlaneFlag;
-bool_t bQpPrimeYZeroTransfBypassFlag;
-bool_t bSeqScalingMatrixPresentFlag;
-bool_t bSeqScalingListPresentFlag[12];
+bool bVuiParamPresentFlag;
+// bool bTimingInfoPresentFlag;
+// bool bFixedFrameRateFlag;
+bool bConstraintSet0Flag;
+bool bConstraintSet1Flag;
+bool bConstraintSet2Flag;
+bool bConstraintSet3Flag;
+bool bSeparateColorPlaneFlag;
+bool bQpPrimeYZeroTransfBypassFlag;
+bool bSeqScalingMatrixPresentFlag;
+bool bSeqScalingListPresentFlag[12];
const SLevelLimits *pSLevelLimits;
} SSps, *PSps;
@@ -111,8 +111,8 @@
// int32_t iAlphaTransparentValue;
// uint8_t uiBitDepthAux;
-// bool_t bAlphaIncrFlag;
-// bool_t bAdditionalExtFlag;
+// bool bAlphaIncrFlag;
+// bool bAdditionalExtFlag;
//}SSpsExt, *PSpsExt;
/* Sequence Parameter Set extension syntax, refer to Page 391 in JVT X201wcm */
@@ -124,10 +124,10 @@
uint8_t uiChromaPhaseYPlus1;
uint8_t uiSeqRefLayerChromaPhaseXPlus1Flag;
uint8_t uiSeqRefLayerChromaPhaseYPlus1;
-bool_t bInterLayerDeblockingFilterCtrlPresentFlag;
-bool_t bSeqTCoeffLevelPredFlag;
-bool_t bAdaptiveTCoeffLevelPredFlag;
-bool_t bSliceHeaderRestrictionFlag;
+bool bInterLayerDeblockingFilterCtrlPresentFlag;
+bool bSeqTCoeffLevelPredFlag;
+bool bAdaptiveTCoeffLevelPredFlag;
+bool bSliceHeaderRestrictionFlag;
} SSpsSvcExt, *PSpsSvcExt;
/* Subset sequence parameter set syntax, refer to Page 391 in JVT X201wcm */
@@ -134,9 +134,9 @@
typedef struct TagSubsetSps {SSps sSps;
SSpsSvcExt sSpsSvcExt;
-bool_t bSvcVuiParamPresentFlag;
-bool_t bAdditionalExtension2Flag;
-bool_t bAdditionalExtension2DataFlag;
+bool bSvcVuiParamPresentFlag;
+bool bAdditionalExtension2Flag;
+bool bAdditionalExtension2DataFlag;
} SSubsetSps, *PSubsetSps;
/* Picture parameter set syntax, refer to Page 59 in JVT X201wcm */
@@ -164,15 +164,15 @@
int32_t iPicInitQs;
int32_t iChromaQpIndexOffset;
-bool_t bEntropyCodingModeFlag;
-bool_t bPicOrderPresentFlag;
+bool bEntropyCodingModeFlag;
+bool bPicOrderPresentFlag;
/* slice_group_map_type = 3, 4 or 5 */
-bool_t bSliceGroupChangeDirectionFlag;
-bool_t bDeblockingFilterControlPresentFlag;
+bool bSliceGroupChangeDirectionFlag;
+bool bDeblockingFilterControlPresentFlag;
-bool_t bConstainedIntraPredFlag;
-bool_t bRedundantPicCntPresentFlag;
-bool_t bWeightedPredFlag;
+bool bConstainedIntraPredFlag;
+bool bRedundantPicCntPresentFlag;
+bool bWeightedPredFlag;
uint8_t uiWeightedBipredIdc;
} SPps, *PPps;
--- a/codec/decoder/core/inc/picture.h
+++ b/codec/decoder/core/inc/picture.h
@@ -58,16 +58,16 @@
int32_t iFramePoc; // frame POC
/*******************************sef_definition for misc use****************************/
-bool_t bUsedAsRef; //for ref pic management
-bool_t bIsLongRef; // long term reference frame flag //for ref pic management
+bool bUsedAsRef; //for ref pic management
+bool bIsLongRef; // long term reference frame flag //for ref pic management
uint8_t uiRefCount;
-bool_t bAvailableFlag; // indicate whether it is available in this picture memory block.
+bool bAvailableFlag; // indicate whether it is available in this picture memory block.
/*******************************for future use****************************/
uint8_t uiTemporalId;
uint8_t uiSpatialId;
uint8_t uiQualityId;
-bool_t bRefBaseFlag;
+bool bRefBaseFlag;
int32_t iFrameNum; // frame number //for ref pic management
int32_t iLongTermFrameIdx; //id for long term ref pic
--- a/codec/decoder/core/inc/rec_mb.h
+++ b/codec/decoder/core/inc/rec_mb.h
@@ -49,7 +49,7 @@
namespace WelsDec {-void_t WelsFillRecNeededMbInfo (PWelsDecoderContext pCtx, bool_t bOutput, PDqLayer pCurLayer);
+void_t WelsFillRecNeededMbInfo (PWelsDecoderContext pCtx, bool bOutput, PDqLayer pCurLayer);
int32_t RecI4x4Mb (int32_t iMBXY, PWelsDecoderContext pCtx, int16_t* pScoeffLevel, PDqLayer pDqLayer);
--- a/codec/decoder/core/inc/slice.h
+++ b/codec/decoder/core/inc/slice.h
@@ -51,7 +51,7 @@
uint16_t uiLongTermPicNum;
uint16_t uiReorderingOfPicNumsIdc;
} sReorderingSyn[LIST_A][MAX_REF_PIC_COUNT];
- bool_t bRefPicListReorderingFlag[LIST_A];
+ bool bRefPicListReorderingFlag[LIST_A];
} SRefPicListReorderSyn, *PRefPicListReorderSyn;
/*
@@ -65,8 +65,8 @@
int32_t iLumaOffset[MAX_REF_PIC_COUNT];
int32_t iChromaWeight[MAX_REF_PIC_COUNT][2];
int32_t iChromaOffset[MAX_REF_PIC_COUNT][2];
- bool_t bLumaWeightFlag;
- bool_t bChromaWeightFlag;
+ bool bLumaWeightFlag;
+ bool bChromaWeightFlag;
} sPredList[LIST_A];
} SPredWeightTabSyn;
@@ -81,9 +81,9 @@
int32_t iMaxLongTermFrameIdx;
} sMmcoRef[MAX_MMCO_COUNT];
- bool_t bNoOutputOfPriorPicsFlag;
- bool_t bLongTermRefFlag;
- bool_t bAdaptiveRefPicMarkingModeFlag;
+ bool bNoOutputOfPriorPicsFlag;
+ bool bLongTermRefFlag;
+ bool bAdaptiveRefPicMarkingModeFlag;
} SRefPicMarking, *PRefPicMarking;
/* Decode reference base picture marking syntax in Page 396 of JVT X201wcm */
@@ -95,7 +95,7 @@
uint32_t uiLongTermPicNum; //should uint32_t, cover larger range of iFrameNum.
} mmco_base[MAX_MMCO_COUNT]; // MAX_REF_PIC for reference picture based on frame
- bool_t bAdaptiveRefBasePicMarkingModeFlag;
+ bool bAdaptiveRefBasePicMarkingModeFlag;
} SRefBasePicMarking, *PRefBasePicMarking;
/* Header of slice syntax elements, refer to Page 63 in JVT X201wcm */
@@ -131,11 +131,11 @@
uint16_t uiIdrPicId;
ESliceType eSliceType;
- bool_t bNumRefIdxActiveOverrideFlag;
- bool_t bFieldPicFlag; //not supported in base profile
- bool_t bBottomFiledFlag; //not supported in base profile
+ bool bNumRefIdxActiveOverrideFlag;
+ bool bFieldPicFlag; //not supported in base profile
+ bool bBottomFiledFlag; //not supported in base profile
uint8_t uiPadding1Byte;
- bool_t bSpForSwitchFlag; // For SP/SI slices
+ bool bSpForSwitchFlag; // For SP/SI slices
int16_t iPadding2Bytes;
} SSliceHeader, *PSliceHeader;
@@ -155,18 +155,18 @@
int32_t iScaledRefLayerPicHeightInSampleLuma;
SRefBasePicMarking sRefBasePicMarking;
- bool_t bBasePredWeightTableFlag;
- bool_t bStoreRefBasePicFlag;
- bool_t bConstrainedIntraResamplingFlag;
- bool_t bSliceSkipFlag;
+ bool bBasePredWeightTableFlag;
+ bool bStoreRefBasePicFlag;
+ bool bConstrainedIntraResamplingFlag;
+ bool bSliceSkipFlag;
- bool_t bAdaptiveBaseModeFlag;
- bool_t bDefaultBaseModeFlag;
- bool_t bAdaptiveMotionPredFlag;
- bool_t bDefaultMotionPredFlag;
- bool_t bAdaptiveResidualPredFlag;
- bool_t bDefaultResidualPredFlag;
- bool_t bTCoeffLevelPredFlag;
+ bool bAdaptiveBaseModeFlag;
+ bool bDefaultBaseModeFlag;
+ bool bAdaptiveMotionPredFlag;
+ bool bDefaultMotionPredFlag;
+ bool bAdaptiveResidualPredFlag;
+ bool bDefaultResidualPredFlag;
+ bool bTCoeffLevelPredFlag;
uint8_t uiRefLayerChromaPhaseXPlus1Flag;
uint8_t uiRefLayerChromaPhaseYPlus1;
@@ -192,7 +192,7 @@
/*slice_data_ext() generate*/
/*******************************misc use****************************/
- bool_t bSliceHeaderExtFlag; // Indicate which slice header is used, avc or ext?
+ bool bSliceHeaderExtFlag; // Indicate which slice header is used, avc or ext?
/*************got from other layer for effiency if possible***************/
/*from lower layer: slice header*/
uint8_t eSliceType;
--- a/codec/decoder/core/src/au_parser.cpp
+++ b/codec/decoder/core/src/au_parser.cpp
@@ -108,7 +108,7 @@
uint8_t* pNal = pSrcRbsp;
int32_t iNalSize = iSrcRbspLen;
PBitStringAux pBs = NULL;
- bool_t bExtensionFlag = false;
+ bool bExtensionFlag = false;
int32_t iErr = ERR_NONE;
int32_t iBitSize = 0;
@@ -362,7 +362,7 @@
}
-bool_t CheckAccessUnitBoundaryExt (PNalUnitHeaderExt pLastNalHdrExt, PNalUnitHeaderExt pCurNalHeaderExt,
+bool CheckAccessUnitBoundaryExt (PNalUnitHeaderExt pLastNalHdrExt, PNalUnitHeaderExt pCurNalHeaderExt,
PSliceHeader pLastSliceHeader, PSliceHeader pCurSliceHeader) {const PSps kpSps = pCurSliceHeader->pSps;
@@ -421,7 +421,7 @@
}
-bool_t CheckAccessUnitBoundary (const PNalUnit kpCurNal, const PNalUnit kpLastNal, const PSps kpSps) {+bool CheckAccessUnitBoundary (const PNalUnit kpCurNal, const PNalUnit kpLastNal, const PSps kpSps) {const PNalUnitHeaderExt kpLastNalHeaderExt = &kpLastNal->sNalHeaderExt;
const PNalUnitHeaderExt kpCurNalHeaderExt = &kpCurNal->sNalHeaderExt;
const SSliceHeader* kpLastSliceHeader = &kpLastNal->sNalData.sVclNal.sSliceHeaderExt.sSliceHeader;
@@ -560,7 +560,7 @@
}
void_t ParseRefBasePicMarking (PBitStringAux pBs, PRefBasePicMarking pRefBasePicMarking) {- const bool_t kbAdaptiveMarkingModeFlag = !!BsGetOneBit (pBs);
+ const bool kbAdaptiveMarkingModeFlag = !!BsGetOneBit (pBs);
pRefBasePicMarking->bAdaptiveRefBasePicMarkingModeFlag = kbAdaptiveMarkingModeFlag;
if (kbAdaptiveMarkingModeFlag) {int32_t iIdx = 0;
@@ -670,7 +670,7 @@
{2073600, 36864, 184320, 240000, 240000, -2048, 2047, 2, 16} /* level 5.2 */};
-const SLevelLimits *GetLevelLimits(int32_t iLevelIdx, bool_t bConstraint3) {+const SLevelLimits *GetLevelLimits(int32_t iLevelIdx, bool bConstraint3) { switch (iLevelIdx) {case 10:
return &g_kSLevelLimits[0];
@@ -737,8 +737,8 @@
ProfileIdc uiProfileIdc;
uint8_t uiLevelIdc;
int32_t iSpsId;
- bool_t bConstraintSetFlags[6] = { false };- const bool_t kbUseSubsetFlag = IS_SUBSET_SPS_NAL (pNalHead->eNalUnitType);
+ bool bConstraintSetFlags[6] = { false };+ const bool kbUseSubsetFlag = IS_SUBSET_SPS_NAL (pNalHead->eNalUnitType);
if (kbUseSubsetFlag) { // SubsetSps--- a/codec/decoder/core/src/deblocking.cpp
+++ b/codec/decoder/core/src/deblocking.cpp
@@ -252,8 +252,8 @@
int32_t iMbY = pCurDqLayer->iMbY;
int32_t iMbX = pCurDqLayer->iMbX;
int32_t iMbXy = pCurDqLayer->iMbXyIndex;
- bool_t bLeftFlag = FALSE;
- bool_t bTopFlag = FALSE;
+ bool bLeftFlag = FALSE;
+ bool bTopFlag = FALSE;
if (2 == iFilterIdc) {bLeftFlag = (iMbX > 0) && (pCurDqLayer->pSliceIdc[iMbXy] == pCurDqLayer->pSliceIdc[iMbXy - 1]);
--- a/codec/decoder/core/src/decode_slice.cpp
+++ b/codec/decoder/core/src/decode_slice.cpp
@@ -234,7 +234,7 @@
#undef STRIDE
}
-int32_t WelsMbIntraPredictionConstruction (PWelsDecoderContext pCtx, PDqLayer pCurLayer, bool_t bOutput) {+int32_t WelsMbIntraPredictionConstruction (PWelsDecoderContext pCtx, PDqLayer pCurLayer, bool bOutput) {//seems IPCM should not enter this path
int32_t iMbXy = pCurLayer->iMbXyIndex;
@@ -351,7 +351,7 @@
pBlk[iStride1] = (iE - iB) >> 1;
}
-int32_t WelsDecodeSlice (PWelsDecoderContext pCtx, bool_t bFirstSliceInLayer, PNalUnit pNalCur) {+int32_t WelsDecodeSlice (PWelsDecoderContext pCtx, bool bFirstSliceInLayer, PNalUnit pNalCur) {PDqLayer pCurLayer = pCtx->pCurDqLayer;
PFmo pFmo = pCtx->pFmo;
int32_t i, iRet;
--- a/codec/decoder/core/src/decoder.cpp
+++ b/codec/decoder/core/src/decoder.cpp
@@ -177,11 +177,11 @@
* get size of reference picture list in target layer incoming, = (iNumRefFrames x 2)
*/
static inline int32_t GetTargetRefListSize (PWelsDecoderContext pCtx) {- bool_t* pSubsetSpsAvail = &pCtx->bSubspsAvailFlags[0];
- bool_t* pSpsAvail = &pCtx->bSpsAvailFlags[0];
+ bool* pSubsetSpsAvail = &pCtx->bSubspsAvailFlags[0];
+ bool* pSpsAvail = &pCtx->bSpsAvailFlags[0];
int32_t iSubsetIdx = -1;
int32_t iSpsIdx = -1;
- bool_t bExistSubsetSps = false;
+ bool bExistSubsetSps = false;
int32_t bExistSps = false;
int32_t iPos = MAX_SPS_COUNT - 1;
int32_t iNumRefFrames = 0;
@@ -238,7 +238,7 @@
int32_t iListIdx = 0; //, mb_blocks = 0;
int32_t iPicQueueSize = 0; // adaptive size of picture queue, = (pSps->iNumRefFrames x 2)
- bool_t bNeedChangePicQueue = true;
+ bool bNeedChangePicQueue = true;
WELS_VERIFY_RETURN_IF (ERR_INFO_INVALID_PARAM, (NULL == pCtx || kiPicWidth <= 0 || kiPicHeight <= 0))
--- a/codec/decoder/core/src/decoder_core.cpp
+++ b/codec/decoder/core/src/decoder_core.cpp
@@ -105,7 +105,7 @@
return 0;
}
-inline bool_t CheckSliceNeedReconstruct (int16_t iCurDid, int16_t iCurQid, bool_t bStoreRefBasePicFlag,
+inline bool CheckSliceNeedReconstruct (int16_t iCurDid, int16_t iCurQid, bool bStoreRefBasePicFlag,
uint8_t uiDidMax, uint8_t uiLayerDqId, uint8_t uiTargetDqId) {return ((iCurDid == uiDidMax) && (iCurQid == BASE_QUALITY_ID) && (bStoreRefBasePicFlag)) // store base
|| (uiLayerDqId == uiTargetDqId); // target layer
@@ -201,7 +201,7 @@
}
int32_t ParseDecRefPicMarking (PWelsDecoderContext pCtx, PBitStringAux pBs, PSliceHeader pSh, PSps pSps,
- const bool_t kbIdrFlag) {+ const bool kbIdrFlag) {PRefPicMarking const kpRefMarking = &pSh->sRefMarking;
if (kbIdrFlag) {@@ -238,7 +238,7 @@
return ERR_NONE;
}
-bool_t FillDefaultSliceHeaderExt (PSliceHeaderExt pShExt, PNalUnitHeaderExt pNalExt) {+bool FillDefaultSliceHeaderExt (PSliceHeaderExt pShExt, PNalUnitHeaderExt pNalExt) {if (pShExt == NULL || pNalExt == NULL)
return false;
@@ -392,7 +392,7 @@
}
int32_t CheckSpsId (PWelsDecoderContext pCtx, PSubsetSps* ppSubsetSps, PSps* ppSps, int32_t iSpsId,
- bool_t bExtensionFlag) {+ bool bExtensionFlag) {PSps pSpsList = pCtx->sSpsBuffer;
PSubsetSps pSubspsList = pCtx->sSubsetSpsBuffer;
@@ -455,7 +455,7 @@
* decode_slice_header_avc
* Parse slice header of bitstream in avc for storing data structure
*/
-int32_t ParseSliceHeaderSyntaxs (PWelsDecoderContext pCtx, PBitStringAux pBs, const bool_t kbExtensionFlag) {+int32_t ParseSliceHeaderSyntaxs (PWelsDecoderContext pCtx, PBitStringAux pBs, const bool kbExtensionFlag) {PNalUnit const kpCurNal = pCtx->pAccessUnitList->pNalUnitsList[pCtx->pAccessUnitList->uiAvailUnitsNum - 1];
PNalUnitHeaderExt pNalHeaderExt = NULL;
@@ -469,8 +469,8 @@
int32_t iRet = ERR_NONE;
uint8_t uiSliceType = 0;
uint8_t uiQualityId = BASE_QUALITY_ID;
- bool_t bIdrFlag = false;
- bool_t bSgChangeCycleInvolved = false; // involved slice group change cycle ?
+ bool bIdrFlag = false;
+ bool bSgChangeCycleInvolved = false; // involved slice group change cycle ?
if (kpCurNal == NULL) {return ERR_INFO_OUT_OF_MEMORY;
@@ -484,7 +484,7 @@
if (pSliceHeadExt) {SRefBasePicMarking sBaseMarking;
- const bool_t kbStoreRefBaseFlag = pSliceHeadExt->bStoreRefBasePicFlag;
+ const bool kbStoreRefBaseFlag = pSliceHeadExt->bStoreRefBasePicFlag;
memcpy (&sBaseMarking, &pSliceHeadExt->sRefBasePicMarking, sizeof (SRefBasePicMarking)); //confirmed_safe_unsafe_usage
memset (pSliceHeadExt, 0, sizeof (SSliceHeaderExt));
pSliceHeadExt->bStoreRefBasePicFlag = kbStoreRefBaseFlag;
@@ -619,7 +619,7 @@
if (kbExtensionFlag) {uiQualityId = pNalHeaderExt->uiQualityId;
} else if (uiSliceType == P_SLICE || uiSliceType == SP_SLICE || uiSliceType == B_SLICE) {- const bool_t kbBipredFlag = (B_SLICE == uiSliceType);
+ const bool kbBipredFlag = (B_SLICE == uiSliceType);
if (kbBipredFlag) {WelsLog (pCtx, WELS_LOG_WARNING, "ParseSliceHeaderSyntaxs(): kbBipredFlag = 1 not supported.\n");
return GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_UNSUPPORTED_BIPRED);
@@ -820,7 +820,7 @@
* pSrc: mark as decoded prefix NAL
* ppDst: succeeded VCL NAL based AVC (I/P Slice)
*/
-bool_t PrefetchNalHeaderExtSyntax (PWelsDecoderContext pCtx, PNalUnit const kppDst, PNalUnit const kpSrc) {+bool PrefetchNalHeaderExtSyntax (PWelsDecoderContext pCtx, PNalUnit const kppDst, PNalUnit const kpSrc) {PNalUnitHeaderExt pNalHdrExtD = NULL, pNalHdrExtS = NULL;
PSliceHeaderExt pShExtD = NULL;
PPrefixNalUnit pPrefixS = NULL;
@@ -1297,7 +1297,7 @@
int32_t iCurNalDependId, iCurNalQualityId, iCurNalTId, iCurNalFrameNum, iCurNalPoc, iCurNalFirstMb, iCurIdx,
iFinalIdxNoInterLayerPred;
- bool_t bMultiSliceFind = false;
+ bool bMultiSliceFind = false;
iFinalIdxNoInterLayerPred = 0;
iCurIdx = *pIdxNoInterLayerPred - 1;
@@ -1332,7 +1332,7 @@
}
}
-bool_t CheckPocOfCurValidNalUnits (PAccessUnit pCurAu, int32_t pIdxNoInterLayerPred) {+bool CheckPocOfCurValidNalUnits (PAccessUnit pCurAu, int32_t pIdxNoInterLayerPred) {int32_t iEndIdx = pCurAu->uiEndPos;
int32_t iCurAuPoc =
pCurAu->pNalUnitsList[pIdxNoInterLayerPred]->sNalData.sVclNal.sSliceHeaderExt.sSliceHeader.iPicOrderCntLsb;
@@ -1347,7 +1347,7 @@
return true;
}
-bool_t CheckIntegrityNalUnitsList (PWelsDecoderContext pCtx) {+bool CheckIntegrityNalUnitsList (PWelsDecoderContext pCtx) {PAccessUnit pCurAu = pCtx->pAccessUnitList;
const int32_t kiEndPos = pCurAu->uiEndPos;
int32_t iIdxNoInterLayerPred = 0;
@@ -1391,7 +1391,7 @@
pCurAu->pNalUnitsList[pCurAu->uiEndPos]->sNalData.sVclNal.sSliceHeaderExt.sSliceHeader.iMbHeight << 4;
} else { //P_SLICE//step 1: search uiDependencyId equal to pCtx->cur_seq_interval_target_dependency_id
- bool_t bGetDependId = false;
+ bool bGetDependId = false;
int32_t iIdxDependId = 0;
iIdxDependId = kiEndPos;
@@ -1406,7 +1406,7 @@
//step 2: switch according to whether or not find the index of pNalUnit whose uiDependencyId equal to iCurSeqIntervalTargetDependId
if (bGetDependId) { //get the index of pNalUnit whose uiDependencyId equal to iCurSeqIntervalTargetDependId- bool_t bGetNoInterPredFront = false;
+ bool bGetNoInterPredFront = false;
//step 2a: search iNoInterLayerPredFlag [0....iIdxDependId]
iIdxNoInterLayerPred = iIdxDependId;
while (iIdxNoInterLayerPred >= 0) {@@ -1650,7 +1650,7 @@
}
}
-int32_t InitRefPicList (PWelsDecoderContext pCtx, const uint8_t kuiNRi, const bool_t kbFirstSlice, int32_t iPoc) {+int32_t InitRefPicList (PWelsDecoderContext pCtx, const uint8_t kuiNRi, const bool kbFirstSlice, int32_t iPoc) {int32_t iRet = ERR_NONE;
if (kbFirstSlice)
iRet = WelsInitRefList (pCtx, iPoc);
@@ -1718,7 +1718,7 @@
int16_t iLastIdD = -1, iLastIdQ = -1;
int16_t iCurrIdD = 0, iCurrIdQ = 0;
uint8_t uiNalRefIdc = 0;
- bool_t bFreshSliceAvailable =
+ bool bFreshSliceAvailable =
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
PPicture pStoreBasePic = NULL;
@@ -1774,7 +1774,7 @@
* Loop decoding for slices (even FMO and/ multiple slices) within a dq layer
*/
while (iIdx <= iEndIdx) {- bool_t bReconstructSlice;
+ bool bReconstructSlice;
iCurrIdQ = pNalCur->sNalHeaderExt.uiQualityId;
iCurrIdD = pNalCur->sNalHeaderExt.uiDependencyId;
pSh = &pNalCur->sNalData.sVclNal.sSliceHeaderExt.sSliceHeader;
@@ -1823,7 +1823,7 @@
InitDqLayerInfo (dq_cur, &pLayerInfo, pNalCur, pCtx->pDec);
if (!dq_cur->sLayerInfo.pSps->bGapsInFrameNumValueAllowedFlag) {- const bool_t kbIdrFlag = dq_cur->sLayerInfo.sNalHeaderExt.bIdrFlag
+ const bool kbIdrFlag = dq_cur->sLayerInfo.sNalHeaderExt.bIdrFlag
|| (dq_cur->sLayerInfo.sNalHeaderExt.sNalUnitHeader.eNalUnitType == NAL_UNIT_CODED_SLICE_IDR);
// Subclause 8.2.5.2 Decoding process for gaps in frame_num
if (!kbIdrFlag &&
--- a/codec/decoder/core/src/expand_pic.cpp
+++ b/codec/decoder/core/src/expand_pic.cpp
@@ -144,7 +144,7 @@
pExpLuma (pPicY, pPic->iLinesize[0], kiWidthY, kiHeightY);
if (kiWidthUV >= 16) {// fix coding picture size as 16x16 issues 7/27/2010
- const bool_t kbChrAligned = /*(kiWidthUV >= 16) && */ ((kiWidthUV & 0x0F) == 0); // chroma planes: (16+kiWidthUV) & 15
+ const bool kbChrAligned = /*(kiWidthUV >= 16) && */ ((kiWidthUV & 0x0F) == 0); // chroma planes: (16+kiWidthUV) & 15
pExpChroma[kbChrAligned] (pPicCb, pPic->iLinesize[1], kiWidthUV, kiHeightUV);
pExpChroma[kbChrAligned] (pPicCr, pPic->iLinesize[2], kiWidthUV, kiHeightUV);
} else {--- a/codec/decoder/core/src/fmo.cpp
+++ b/codec/decoder/core/src/fmo.cpp
@@ -119,7 +119,7 @@
const int32_t kiMbHeight) {int32_t iNumMb = 0;
int32_t iErr = 0;
- bool_t bResolutionChanged = false;
+ bool bResolutionChanged = false;
// the cases we would not like
WELS_VERIFY_RETURN_IF (1, (NULL == pFmo || NULL == kpPps))
@@ -238,7 +238,7 @@
*
* \return true - changed or not initialized yet; false - not change at all
*/
-bool_t FmoParamSetsChanged (PFmo pFmo, const int32_t kiCountNumMb, const int32_t kiSliceGroupType,
+bool FmoParamSetsChanged (PFmo pFmo, const int32_t kiCountNumMb, const int32_t kiSliceGroupType,
const int32_t kiSliceGroupCount) {WELS_VERIFY_RETURN_IF (false, (NULL == pFmo))
@@ -258,7 +258,7 @@
*
* \return true - update/insert successfully; false - failed;
*/
-bool_t FmoParamUpdate (PFmo pFmo, PSps pSps, PPps pPps, int32_t* pActiveFmoNum) {+bool FmoParamUpdate (PFmo pFmo, PSps pSps, PPps pPps, int32_t* pActiveFmoNum) {const uint32_t kuiMbWidth = pSps->iMbWidth;
const uint32_t kuiMbHeight = pSps->iMbHeight;
@@ -330,4 +330,4 @@
return iNextMb;
}
-} // namespace WelsDec
\ No newline at end of file
+} // namespace WelsDec
--- a/codec/decoder/core/src/get_intra_predictor.cpp
+++ b/codec/decoder/core/src/get_intra_predictor.cpp
@@ -653,4 +653,4 @@
} while (i-- > 0);
}
-} // namespace WelsDec
\ No newline at end of file
+} // namespace WelsDec
--- a/codec/decoder/core/src/manage_dec_ref.cpp
+++ b/codec/decoder/core/src/manage_dec_ref.cpp
@@ -92,7 +92,7 @@
*/
int32_t WelsInitRefList (PWelsDecoderContext pCtx, int32_t iPoc) {int32_t i, j, iCount = 0;
- const bool_t kbUseRefBasePicFlag = pCtx->pCurDqLayer->bUseRefBasePicFlag;
+ const bool kbUseRefBasePicFlag = pCtx->pCurDqLayer->bUseRefBasePicFlag;
PPicture* ppShoreRefList = pCtx->sRefPic.pShortRefList[LIST_0];
PPicture* ppLongRefList = pCtx->sRefPic.pLongRefList[LIST_0];
memset (pCtx->sRefPic.pRefList[LIST_0], 0, MAX_REF_PIC_COUNT * sizeof (PPicture));
@@ -215,12 +215,12 @@
return ERR_NONE;
}
-int32_t WelsMarkAsRef (PWelsDecoderContext pCtx, const bool_t kbRefBaseMarkingFlag) {+int32_t WelsMarkAsRef (PWelsDecoderContext pCtx, const bool kbRefBaseMarkingFlag) {PRefPic pRefPic = &pCtx->sRefPic;
PRefPicMarking pRefPicMarking = pCtx->pCurDqLayer->pRefPicMarking;
PRefBasePicMarking pRefPicBaseMarking = pCtx->pCurDqLayer->pRefPicBaseMarking;
PAccessUnit pCurAU = pCtx->pAccessUnitList;
- bool_t bIsIDRAU = FALSE;
+ bool bIsIDRAU = FALSE;
uint32_t j;
int32_t iRet = ERR_NONE;
@@ -322,7 +322,7 @@
return ERR_NONE;
}
-static int32_t MMCOProcess (PWelsDecoderContext pCtx, uint32_t uiMmcoType, bool_t bRefBasePic,
+static int32_t MMCOProcess (PWelsDecoderContext pCtx, uint32_t uiMmcoType, bool bRefBasePic,
int32_t iShortFrameNum, uint32_t uiLongTermPicNum , int32_t iLongTermFrameIdx, int32_t iMaxLongTermFrameIdx) {PRefPic pRefPic = &pCtx->sRefPic;
PPicture pPic = NULL;
@@ -551,4 +551,4 @@
return iRet;
}
-} // namespace WelsDec
\ No newline at end of file
+} // namespace WelsDec
--- a/codec/decoder/core/src/memmgr_nal_unit.cpp
+++ b/codec/decoder/core/src/memmgr_nal_unit.cpp
@@ -143,4 +143,4 @@
return pNu;
}
-} // namespace WelsDec
\ No newline at end of file
+} // namespace WelsDec
--- a/codec/decoder/core/src/mv_pred.cpp
+++ b/codec/decoder/core/src/mv_pred.cpp
@@ -44,7 +44,7 @@
namespace WelsDec { void_t PredPSkipMvFromNeighbor (PDqLayer pCurLayer, int16_t iMvp[2]) {- bool_t bTopAvail, bLeftTopAvail, bRightTopAvail, bLeftAvail;
+ bool bTopAvail, bLeftTopAvail, bRightTopAvail, bLeftAvail;
int32_t iCurSliceIdc, iTopSliceIdc, iLeftTopSliceIdc, iRightTopSliceIdc, iLeftSliceIdc;
int32_t iLeftTopType, iRightTopType, iTopType, iLeftType;
@@ -369,4 +369,4 @@
}
}
-} // namespace WelsDec
\ No newline at end of file
+} // namespace WelsDec
--- a/codec/decoder/core/src/parse_mb_syn_cavlc.cpp
+++ b/codec/decoder/core/src/parse_mb_syn_cavlc.cpp
@@ -398,7 +398,7 @@
*pMode = I16_PRED_DC_128;
}
} else {- bool_t bModeAvail = CHECK_I16_MODE (*pMode, iLeftAvail, iTopAvail, bLeftTopAvail);
+ bool bModeAvail = CHECK_I16_MODE (*pMode, iLeftAvail, iTopAvail, bLeftTopAvail);
if (0 == bModeAvail) {return ERR_INFO_INVALID_I16x16_PRED_MODE;
}
@@ -423,7 +423,7 @@
*pMode = C_PRED_DC_128;
}
} else {- bool_t bModeAvail = CHECK_CHROMA_MODE (*pMode, iLeftAvail, iTopAvail, bLeftTopAvail);
+ bool bModeAvail = CHECK_CHROMA_MODE (*pMode, iLeftAvail, iTopAvail, bLeftTopAvail);
if (0 == bModeAvail) {return ERR_INFO_INVALID_I_CHROMA_PRED_MODE;
}
@@ -455,7 +455,7 @@
iFinalMode = I4_PRED_DC_128;
}
} else {- bool_t bModeAvail = CHECK_I4_MODE (*pMode, iLeftAvail, iTopAvail, bLeftTopAvail);
+ bool bModeAvail = CHECK_I4_MODE (*pMode, iLeftAvail, iTopAvail, bLeftTopAvail);
if (0 == bModeAvail) {return ERR_INVALID_INTRA4X4_MODE;
}
@@ -486,7 +486,7 @@
// return: used bits
static int32_t CavlcGetTrailingOnesAndTotalCoeff (uint8_t& uiTotalCoeff, uint8_t& uiTrailingOnes,
- SReadBitsCache* pBitsCache, SVlcTable* pVlcTable, bool_t bChromaDc, int8_t nC) {+ SReadBitsCache* pBitsCache, SVlcTable* pVlcTable, bool bChromaDc, int8_t nC) { const uint8_t* kpVlcTableMoreBitsCountList[3] = {g_kuiVlcTableMoreBitsCount0, g_kuiVlcTableMoreBitsCount1, g_kuiVlcTableMoreBitsCount2};int32_t iUsedBits = 0;
int32_t iIndexVlc, iIndexValue, iNcMapIdx;
@@ -587,7 +587,7 @@
}
static int32_t CavlcGetTotalZeros (int32_t& iZerosLeft, SReadBitsCache* pBitsCache, uint8_t uiTotalCoeff,
- SVlcTable* pVlcTable, bool_t bChromaDc) {+ SVlcTable* pVlcTable, bool bChromaDc) {int32_t iCount, iUsedBits = 0;
const uint8_t* kpBitNumMap;
uint32_t uiValue;
@@ -673,7 +673,7 @@
int32_t iUsedBits = 0;
int32_t iCurIdx = pBs->iIndex;
uint8_t* pBuf = ((uint8_t*)pBs->pStartBuf) + (iCurIdx >> 3);
- bool_t bChromaDc = (CHROMA_DC == iResidualProperty);
+ bool bChromaDc = (CHROMA_DC == iResidualProperty);
uint8_t bChroma = (bChromaDc || CHROMA_AC == iResidualProperty);
SReadBitsCache sReadBitsCache;
--- a/codec/decoder/core/src/pic_queue.cpp
+++ b/codec/decoder/core/src/pic_queue.cpp
@@ -149,4 +149,4 @@
return pPic;
}
-} // namespace WelsDec
\ No newline at end of file
+} // namespace WelsDec
--- a/codec/decoder/core/src/rec_mb.cpp
+++ b/codec/decoder/core/src/rec_mb.cpp
@@ -44,7 +44,7 @@
namespace WelsDec {-void_t WelsFillRecNeededMbInfo (PWelsDecoderContext pCtx, bool_t bOutput, PDqLayer pCurLayer) {+void_t WelsFillRecNeededMbInfo (PWelsDecoderContext pCtx, bool bOutput, PDqLayer pCurLayer) {PPicture pCurPic = pCtx->pDec;
int32_t iLumaStride = pCurPic->iLinesize[0];
int32_t iChromaStride = pCurPic->iLinesize[1];
@@ -235,7 +235,7 @@
uint8_t* pDstY = pMCRefMem->pDstY;
uint8_t* pDstU = pMCRefMem->pDstU;
uint8_t* pDstV = pMCRefMem->pDstV;
- bool_t bExpand = false;
+ bool bExpand = false;
ENFORCE_STACK_ALIGN_1D (uint8_t, uiExpandBuf, (PADDING_LENGTH + 6) * (PADDING_LENGTH + 6), 16);
--- a/codec/encoder/core/inc/au_set.h
+++ b/codec/encoder/core/inc/au_set.h
@@ -105,7 +105,7 @@
*/
int32_t WelsInitSps (SWelsSPS* pSps, SDLayerParam* pLayerParam, const uint32_t kuiIntraPeriod,
const int32_t kiNumRefFrame,
- const uint32_t kiSpsId, const bool_t kbEnableFrameCropping, bool_t bEnableRc);
+ const uint32_t kiSpsId, const bool kbEnableFrameCropping, bool bEnableRc);
/*!
* \brief initialize subset pSps based on configurable parameters in svc
@@ -117,7 +117,7 @@
*/
int32_t WelsInitSubsetSps (SSubsetSps* pSubsetSps, SDLayerParam* pLayerParam, const uint32_t kuiIntraPeriod,
const int32_t kiNumRefFrame,
- const uint32_t kiSpsId, const bool_t kbEnableFrameCropping, bool_t bEnableRc);
+ const uint32_t kiSpsId, const bool kbEnableFrameCropping, bool bEnableRc);
/*!
* \brief initialize pPps based on configurable parameters and pSps(subset pSps) in svc
@@ -124,9 +124,9 @@
* \param pPps SWelsPPS*
* \param pSps SWelsSPS*
* \param pSubsetSps SSubsetSps*
- * \param kbDeblockingFilterPresentFlag bool_t
+ * \param kbDeblockingFilterPresentFlag bool
* \param kiPpsId PPS Id
- * \param kbUsingSubsetSps bool_t
+ * \param kbUsingSubsetSps bool
* \return 0 - successful
* 1 - failed
*/
@@ -134,8 +134,8 @@
SWelsSPS* pSps,
SSubsetSps* pSubsetSps,
const uint32_t kuiPpsId,
- const bool_t kbDeblockingFilterPresentFlag,
- const bool_t kbUsingSubsetSps);
+ const bool kbDeblockingFilterPresentFlag,
+ const bool kbUsingSubsetSps);
}
#endif//WELS_ACCESS_UNIT_PARSER_H__
--- a/codec/encoder/core/inc/bundleloader.h
+++ b/codec/encoder/core/inc/bundleloader.h
@@ -134,4 +134,4 @@
}
#endif
-#endif
\ No newline at end of file
+#endif
--- a/codec/encoder/core/inc/encoder_context.h
+++ b/codec/encoder/core/inc/encoder_context.h
@@ -92,9 +92,9 @@
int32_t iLastLtrIdx;
uint32_t uiLtrMarkInterval;// the interval from the last int32_t term pRef mark
- bool_t bLTRMarkingFlag; //decide whether current frame marked as LTR
- bool_t bLTRMarkEnable; //when LTR is confirmed and the interval is no smaller than the marking period
- bool_t bReceivedT0LostFlag; // indicate whether a t0 lost feedback is recieved, for LTR recovery
+ bool bLTRMarkingFlag; //decide whether current frame marked as LTR
+ bool bLTRMarkEnable; //when LTR is confirmed and the interval is no smaller than the marking period
+ bool bReceivedT0LostFlag; // indicate whether a t0 lost feedback is recieved, for LTR recovery
} SLTRState;
typedef struct TagSpatialPicIndex {@@ -162,8 +162,8 @@
uint8_t uiDependencyId; // Idc of dependecy layer to be coded
uint8_t uiTemporalId; // Idc of temporal layer to be coded
- bool_t bNeedPrefixNalFlag; // whether add prefix nal
- bool_t bEncCurFrmAsIdrFlag;
+ bool bNeedPrefixNalFlag; // whether add prefix nal
+ bool bEncCurFrmAsIdrFlag;
// Rate control routine
SWelsSvcRc* pWelsSvcRc;
@@ -198,7 +198,7 @@
uint8_t uiSpatialLayersInTemporal[MAX_DEPENDENCY_LAYER];
uint8_t uiSpatialPicNum[MAX_DEPENDENCY_LAYER];
- bool_t bLongTermRefFlag[MAX_DEPENDENCY_LAYER][MAX_TEMPORAL_LEVEL + 1/*+LONG_TERM_REF_NUM*/];
+ bool bLongTermRefFlag[MAX_DEPENDENCY_LAYER][MAX_TEMPORAL_LEVEL + 1/*+LONG_TERM_REF_NUM*/];
int16_t iMaxSliceCount;// maximal count number of slices for all layers observation
int16_t iActiveThreadsNum; // number of threads active so far
--- a/codec/encoder/core/inc/mb_cache.h
+++ b/codec/encoder/core/inc/mb_cache.h
@@ -106,14 +106,14 @@
uint8_t* pBufferInterPredMe; // [4][400] is enough because only h&v or v&hv or h&hv. but if both h&v&hv is needed when 8 quart pixel, future we have to use [5][400].
//no scan4[] order, just as memory order to store
-//ALIGNED_DECLARE(bool_t, pPrevIntra4x4PredModeFlag[16], 16);//if 1, means no rem_intra4x4_pred_mode; if 0, means rem_intra4x4_pred_mode != 0
-bool_t* pPrevIntra4x4PredModeFlag;
+//ALIGNED_DECLARE(bool, pPrevIntra4x4PredModeFlag[16], 16);//if 1, means no rem_intra4x4_pred_mode; if 0, means rem_intra4x4_pred_mode != 0
+bool* pPrevIntra4x4PredModeFlag;
//ALIGNED_DECLARE(int8_t, pRemIntra4x4PredModeFlag[16], 16);//-1 as default; if pPrevIntra4x4PredModeFlag==0,
//pRemIntra4x4PredModeFlag or added by 1 is the best pred_mode
int8_t* pRemIntra4x4PredModeFlag;
int32_t iSadCostSkip[4]; //avail 1; unavail 0
-bool_t bMbTypeSkip[4]; //1: skip; 0: non-skip
+bool bMbTypeSkip[4]; //1: skip; 0: non-skip
int32_t* pEncSad;
//for residual encoding at the side of Encoder
@@ -123,7 +123,7 @@
uint8_t uiLumaI16x16Mode;
uint8_t uiChmaI8x8Mode;
-bool_t bCollocatedPredFlag;//denote if current MB is collocated predicted (MV==0).
+bool bCollocatedPredFlag;//denote if current MB is collocated predicted (MV==0).
uint32_t uiRefMbType;
struct {--- a/codec/encoder/core/inc/md.h
+++ b/codec/encoder/core/inc/md.h
@@ -83,7 +83,7 @@
int32_t iSadPredMb;
uint8_t uiRef; //uiRefIndex appointed by Encoder, used for MC
-bool_t bMdUsingSad;
+bool bMdUsingSad;
uint16_t uiReserved;
int32_t iCostSkipMb;
@@ -114,7 +114,7 @@
static void md_intra_init (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SMB* pCurMb);
static void md_inter_init (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SMB* pCurMb);
-void FillNeighborCacheIntra (SMbCache* pMbCache, SMB* pCurMb, int32_t iMbWidth/*, bool_t constrained_intra_pred_flag*/);
+void FillNeighborCacheIntra (SMbCache* pMbCache, SMB* pCurMb, int32_t iMbWidth/*, bool constrained_intra_pred_flag*/);
void FillNeighborCacheInterWithoutBGD (SMbCache* pMbCache, SMB* pCurMb, int32_t iMbWidth,
int8_t* pVaaBgMbFlag); //BGD spatial func
void FillNeighborCacheInterWithBGD (SMbCache* pMbCache, SMB* pCurMb, int32_t iMbWidth, int8_t* pVaaBgMbFlag);
@@ -125,12 +125,12 @@
void PredictSad (int8_t* pRefIndexCache, int32_t* pSadCostCache, int32_t uiRef, int32_t* pSadPred);
-void PredictSadSkip (int8_t* pRefIndexCache, bool_t* pMbSkipCache, int32_t* pSadCostCache, int32_t uiRef,
+void PredictSadSkip (int8_t* pRefIndexCache, bool* pMbSkipCache, int32_t* pSadCostCache, int32_t uiRef,
int32_t* iSadPredSkip);
// for pfGetVarianceFromIntraVaa function ptr adaptive by CPU features, 6/7/2010
void InitIntraAnalysisVaaInfo (SWelsFuncPtrList* pFuncList, const uint32_t kuiCpuFlag);
-bool_t MdIntraAnalysisVaaInfo (sWelsEncCtx* pEncCtx, uint8_t* pEncMb);
+bool MdIntraAnalysisVaaInfo (sWelsEncCtx* pEncCtx, uint8_t* pEncMb);
uint8_t MdInterAnalysisVaaInfo_c (int32_t* pSad8x8);
--- a/codec/encoder/core/inc/nal_encap.h
+++ b/codec/encoder/core/inc/nal_encap.h
@@ -73,7 +73,7 @@
// SVC: num_sps (MAX_D) + num_pps (MAX_D) + num_vcl (MAX_D * MAX_Q)
int32_t iNalIndex; // coding NAL currently, 0 based
-// bool_t bAnnexBFlag; // annexeb flag, to figure it pOut the packetization mode whether need 4 bytes (0 0 0 1) of start code prefix
+// bool bAnnexBFlag; // annexeb flag, to figure it pOut the packetization mode whether need 4 bytes (0 0 0 1) of start code prefix
} SWelsEncoderOutput;
//#define MT_DEBUG_BS_WR 0 // for MT debugging if needed
@@ -91,9 +91,9 @@
int32_t iNalLen[2];
int32_t iNalIndex; // coding NAL currently, 0 based
-// bool_t bAnnexBFlag; // annexeb flag, to figure it pOut the packetization mode whether need 4 bytes (0 0 0 1) of start code prefix
+// bool bAnnexBFlag; // annexeb flag, to figure it pOut the packetization mode whether need 4 bytes (0 0 0 1) of start code prefix
#if MT_DEBUG_BS_WR
-bool_t bSliceCodedFlag;
+bool bSliceCodedFlag;
#endif//MT_DEBUG_BS_WR
} SWelsSliceBs;
@@ -145,6 +145,6 @@
/*!
* \brief write prefix nal
*/
-int32_t WelsWriteSVCPrefixNal (SBitStringAux* pBitStringAux, const int32_t keNalRefIdc, const bool_t kbIdrFlag);
+int32_t WelsWriteSVCPrefixNal (SBitStringAux* pBitStringAux, const int32_t keNalRefIdc, const bool kbIdrFlag);
}
#endif//WELS_NAL_UNIT_ENCAPSULATION_H__
--- a/codec/encoder/core/inc/nal_prefix.h
+++ b/codec/encoder/core/inc/nal_prefix.h
@@ -53,10 +53,10 @@
typedef struct TagNalUnitHeaderExt {SNalUnitHeader sNalHeader;
- bool_t bIdrFlag;
+ bool bIdrFlag;
uint8_t uiDependencyId;
uint8_t uiTemporalId;
- bool_t bDiscardableFlag;
+ bool bDiscardableFlag;
} SNalUnitHeaderExt, *PNalUnitHeaderExt;
--- a/codec/encoder/core/inc/param_svc.h
+++ b/codec/encoder/core/inc/param_svc.h
@@ -140,12 +140,12 @@
int32_t iLTRRefNum;
uint32_t uiLtrMarkPeriod; //the min distance of two int32_t references
-bool_t bDeblockingParallelFlag; // deblocking filter parallelization control flag
-bool_t bMgsT0OnlyStrategy; //MGS_T0_only_strategy
-bool_t bEnableSSEI;
-bool_t bEnableFrameCroppingFlag; // enable frame cropping flag: TRUE alwayse in application
+bool bDeblockingParallelFlag; // deblocking filter parallelization control flag
+bool bMgsT0OnlyStrategy; //MGS_T0_only_strategy
+bool bEnableSSEI;
+bool bEnableFrameCroppingFlag; // enable frame cropping flag: TRUE alwayse in application
-bool_t bEnableCropPic; // enable cropping source picture. , 8/25/2010
+bool bEnableCropPic; // enable cropping source picture. , 8/25/2010
// FALSE: Streaming Video Sharing; TRUE: Video Conferencing Meeting;
int8_t iDecompStages; // GOP size dependency
@@ -159,27 +159,27 @@
int8_t iInterLayerLoopFilterBetaOffset; // InterLayerLoopFilterBetaOffset
/* Rate Control */
-bool_t bEnableRc;
+bool bEnableRc;
int8_t iRCMode;
int8_t iPaddingFlag;
/* denoise control */
-bool_t bEnableDenoise;
+bool bEnableDenoise;
/* scene change detection control */
-bool_t bEnableSceneChangeDetect;
+bool bEnableSceneChangeDetect;
// background detection control
-bool_t bEnableBackgroundDetection;
+bool bEnableBackgroundDetection;
/* adaptive quantization control */
-bool_t bEnableAdaptiveQuant;
+bool bEnableAdaptiveQuant;
/* frame skipping */
-bool_t bEnableFrameSkip;
+bool bEnableFrameSkip;
/* long term reference control */
-bool_t bEnableLongTermReference;
+bool bEnableLongTermReference;
/* pSps pPps id addition control */
-bool_t bEnableSpsPpsIdAddition;
+bool bEnableSpsPpsIdAddition;
/* Layer definition */
-bool_t bPrefixNalAddingCtrl;
+bool bPrefixNalAddingCtrl;
int8_t iNumDependencyLayer; // number of dependency(Spatial/CGS) layers used to be encoded
int8_t iNumTemporalLayer; // number of temporal layer specified
@@ -186,12 +186,12 @@
public:
-TagWelsSvcCodingParam (const bool_t kbEnableRc = true) {+TagWelsSvcCodingParam (const bool kbEnableRc = true) {FillDefault (kbEnableRc);
}
~TagWelsSvcCodingParam() {}-void FillDefault (const bool_t kbEnableRc) {+void FillDefault (const bool kbEnableRc) {uiGopSize = 1; // GOP size (at maximal frame rate: 16)
uiIntraPeriod = 0; // intra period (multiple of GOP size as desired)
iNumRefFrame = MIN_REF_PIC_COUNT; // number of reference frame used
@@ -257,7 +257,7 @@
memset(sDependencyLayers,0,sizeof(SDLayerParam)*MAX_DEPENDENCY_LAYER);
}
-int32_t ParamTranscode (SVCEncodingParam& pCodingParam, const bool_t kbEnableRc = true) {+int32_t ParamTranscode (SVCEncodingParam& pCodingParam, const bool kbEnableRc = true) {pCodingParam.fFrameRate = WELS_CLIP3 (pCodingParam.fFrameRate, MIN_FRAME_RATE, MAX_FRAME_RATE);
iInputCsp = pCodingParam.iInputCsp; // color space of input sequence
uiFrameToBeCoded = (uint32_t) -
--- a/codec/encoder/core/inc/parameter_sets.h
+++ b/codec/encoder/core/inc/parameter_sets.h
@@ -67,24 +67,24 @@
// uint8_t uiBitDepthLuma; //=8, only used in decoder, encoder in general_***; it can be removed when removed general up_sample
// uint8_t uiBitDepthChroma; //=8
/* TO BE CONTINUE: POC type 1 */
-// bool_t bDeltaPicOrderAlwaysZeroFlag;
-// bool_t bGapsInFrameNumValueAllowedFlag; //=true
+// bool bDeltaPicOrderAlwaysZeroFlag;
+// bool bGapsInFrameNumValueAllowedFlag; //=true
-// bool_t bFrameMbsOnlyFlag;
-// bool_t bMbaffFlag; // MB Adapative Frame Field
-// bool_t bDirect8x8InferenceFlag;
-bool_t bFrameCroppingFlag;
+// bool bFrameMbsOnlyFlag;
+// bool bMbaffFlag; // MB Adapative Frame Field
+// bool bDirect8x8InferenceFlag;
+bool bFrameCroppingFlag;
-// bool_t bVuiParamPresentFlag;
-// bool_t bTimingInfoPresentFlag;
-// bool_t bFixedFrameRateFlag;
+// bool bVuiParamPresentFlag;
+// bool bTimingInfoPresentFlag;
+// bool bFixedFrameRateFlag;
-bool_t bConstraintSet0Flag;
-bool_t bConstraintSet1Flag;
-bool_t bConstraintSet2Flag;
+bool bConstraintSet0Flag;
+bool bConstraintSet1Flag;
+bool bConstraintSet2Flag;
-// bool_t bConstraintSet3Flag; // reintroduce constrain_set3_flag instead of reserved filling bytes here
-// bool_t bSeparateColorPlaneFlag; // =false,: only used in decoder, encoder in general_***; it can be removed when removed general up_sample
+// bool bConstraintSet3Flag; // reintroduce constrain_set3_flag instead of reserved filling bytes here
+// bool bSeparateColorPlaneFlag; // =false,: only used in decoder, encoder in general_***; it can be removed when removed general up_sample
} SWelsSPS, *PWelsSPS;
@@ -98,10 +98,10 @@
// uint8_t uiChromaPhaseYPlus1;
// uint8_t uiSeqRefLayerChromaPhaseXPlus1Flag;
// uint8_t uiSeqRefLayerChromaPhaseYPlus1;
-// bool_t bInterLayerDeblockingFilterCtrlPresentFlag;
-bool_t bSeqTcoeffLevelPredFlag;
-bool_t bAdaptiveTcoeffLevelPredFlag;
-bool_t bSliceHeaderRestrictionFlag;
+// bool bInterLayerDeblockingFilterCtrlPresentFlag;
+bool bSeqTcoeffLevelPredFlag;
+bool bAdaptiveTcoeffLevelPredFlag;
+bool bSliceHeaderRestrictionFlag;
} SSpsSvcExt, *PSpsSvcExt;
/* Subset sequence parameter set syntax, refer to Page 391 in JVT X201wcm */
@@ -109,9 +109,9 @@
SWelsSPS pSps;
SSpsSvcExt sSpsSvcExt;
-// bool_t bSvcVuiParamPresentFlag;
-// bool_t bAdditionalExtension2Flag;
-// bool_t bAdditionalExtension2DataFlag;
+// bool bSvcVuiParamPresentFlag;
+// bool bAdditionalExtension2Flag;
+// bool bAdditionalExtension2DataFlag;
} SSubsetSps, *PSubsetSps;
/* Picture parameter set syntax, refer to Page 59 in JVT X201wcm */
@@ -129,7 +129,7 @@
uint32_t uiBottomRight[MAX_SLICEGROUP_IDS];
/* uiSliceGroupMapType = 3, 4 or 5 */
/* uiSliceGroupMapType = 3, 4 or 5 */
-bool_t bSliceGroupChangeDirectionFlag;
+bool bSliceGroupChangeDirectionFlag;
uint32_t uiSliceGroupChangeRate;
/* uiSliceGroupMapType = 6 */
uint32_t uiPicSizeInMapUnits;
@@ -147,13 +147,13 @@
// int32_t iSecondChromaQpIndexOffset;
// /* potential application for High profile */
-// bool_t bPicOrderPresentFlag;
+// bool bPicOrderPresentFlag;
-bool_t bDeblockingFilterControlPresentFlag;
+bool bDeblockingFilterControlPresentFlag;
-// bool_t bConstainedIntraPredFlag;
-// bool_t bRedundantPicCntPresentFlag;
-// bool_t bWeightedPredFlag;
+// bool bConstainedIntraPredFlag;
+// bool bRedundantPicCntPresentFlag;
+// bool bWeightedPredFlag;
// uint8_t uiWeightedBiPredIdc;
} SWelsPPS, *PWelsPPPS;
--- a/codec/encoder/core/inc/picture.h
+++ b/codec/encoder/core/inc/picture.h
@@ -72,8 +72,8 @@
int32_t iMarkFrameNum;
int32_t iLongTermPicNum;
- bool_t bUsedAsRef; //for pRef pic management
- bool_t bIsLongRef; // long term reference frame flag //for pRef pic management
+ bool bUsedAsRef; //for pRef pic management
+ bool bIsLongRef; // long term reference frame flag //for pRef pic management
uint8_t uiRecieveConfirmed;
uint8_t uiTemporalId;
uint8_t uiSpatialId;
--- a/codec/encoder/core/inc/picture_handle.h
+++ b/codec/encoder/core/inc/picture_handle.h
@@ -52,7 +52,7 @@
* \pram need_expand need borders expanding
* \return successful if effective picture pointer returned, otherwise failed with NULL
*/
-SPicture* AllocPicture (CMemoryAlign* pMa, const int32_t kiWidth, const int32_t kiHeight, bool_t bNeedMbInfo);
+SPicture* AllocPicture (CMemoryAlign* pMa, const int32_t kiWidth, const int32_t kiHeight, bool bNeedMbInfo);
/*!
* \brief free picture pData planes
--- a/codec/encoder/core/inc/ref_list_mgr_svc.h
+++ b/codec/encoder/core/inc/ref_list_mgr_svc.h
@@ -77,11 +77,11 @@
/*
* update reference picture list
*/
-bool_t WelsUpdateRefList (sWelsEncCtx* pCtx);
+bool WelsUpdateRefList (sWelsEncCtx* pCtx);
/*
* build reference picture list
*/
-bool_t WelsBuildRefList (sWelsEncCtx* pCtx, const int32_t kiPOC);
+bool WelsBuildRefList (sWelsEncCtx* pCtx, const int32_t kiPOC);
/*
* update syntax for reference base related
@@ -92,7 +92,7 @@
/*
* check current mark iFrameNum used in LTR list or not
*/
-bool_t CheckCurMarkFrameNumUsed (sWelsEncCtx* pCtx);
+bool CheckCurMarkFrameNumUsed (sWelsEncCtx* pCtx);
/*
* decide whether current frame include long term reference mark and update long term reference mark syntax
*/
--- a/codec/encoder/core/inc/slice.h
+++ b/codec/encoder/core/inc/slice.h
@@ -75,9 +75,9 @@
// int32_t mmco_index;
uint8_t uiMmcoCount;
- bool_t bNoOutputOfPriorPicsFlag;
- bool_t bLongTermRefFlag;
- bool_t bAdaptiveRefPicMarkingModeFlag;
+ bool bNoOutputOfPriorPicsFlag;
+ bool bLongTermRefFlag;
+ bool bAdaptiveRefPicMarkingModeFlag;
} SRefPicMarking;
@@ -118,9 +118,9 @@
uint16_t uiIdrPicId;
// uint8_t color_plane_id;//from?
- bool_t bNumRefIdxActiveOverrideFlag;
-// bool_t field_pic_flag; //not supported in base profile
-// bool_t bottom_field_flag; //not supported in base profile
+ bool bNumRefIdxActiveOverrideFlag;
+// bool field_pic_flag; //not supported in base profile
+// bool bottom_field_flag; //not supported in base profile
uint8_t uiPadding1Bytes;
SRefPicMarking sRefMarking; // Decoded reference picture marking syntaxs
@@ -137,18 +137,18 @@
uint32_t uiNumMbsInSlice;
- bool_t bStoreRefBasePicFlag;
- bool_t bConstrainedIntraResamplingFlag;
- bool_t bSliceSkipFlag;
+ bool bStoreRefBasePicFlag;
+ bool bConstrainedIntraResamplingFlag;
+ bool bSliceSkipFlag;
- bool_t bAdaptiveBaseModeFlag;
- bool_t bDefaultBaseModeFlag;
- bool_t bAdaptiveMotionPredFlag;
- bool_t bDefaultMotionPredFlag;
+ bool bAdaptiveBaseModeFlag;
+ bool bDefaultBaseModeFlag;
+ bool bAdaptiveMotionPredFlag;
+ bool bDefaultMotionPredFlag;
- bool_t bAdaptiveResidualPredFlag;
- bool_t bDefaultResidualPredFlag;
- bool_t bTcoeffLevelPredFlag;
+ bool bAdaptiveResidualPredFlag;
+ bool bDefaultResidualPredFlag;
+ bool bTcoeffLevelPredFlag;
uint8_t uiDisableInterLayerDeblockingFilterIdc;
} SSliceHeaderExt, *PSliceHeaderExt;
@@ -170,10 +170,10 @@
uint8_t sScaleShift;
uint8_t uiSliceIdx;
- bool_t bSliceHeaderExtFlag; // Indicate which slice header is used, avc or ext?
+ bool bSliceHeaderExtFlag; // Indicate which slice header is used, avc or ext?
uint8_t uiLastMbQp; // stored qp for last mb coded, maybe more efficient for mb skip detection etc.
- bool_t bDynamicSlicingSliceSizeCtrlFlag;
+ bool bDynamicSlicingSliceSizeCtrlFlag;
uint8_t uiAssumeLog2BytePerMb;
uint8_t uiReservedFillByte; // reserved to meet 4 bytes alignment
} SSlice, *PSlice;
--- a/codec/encoder/core/inc/slice_multi_threading.h
+++ b/codec/encoder/core/inc/slice_multi_threading.h
@@ -98,10 +98,10 @@
#ifdef _WIN32
int32_t FiredSliceThreads (SSliceThreadPrivateData* pPriData, WELS_EVENT* pEventsList, SLayerBSInfo* pLayerBsInfo,
- const uint32_t kuiNumThreads/*, int32_t *iLayerNum*/, SSliceCtx* pSliceCtx, const bool_t kbIsDynamicSlicingMode);
+ const uint32_t kuiNumThreads/*, int32_t *iLayerNum*/, SSliceCtx* pSliceCtx, const bool kbIsDynamicSlicingMode);
#else
int32_t FiredSliceThreads (SSliceThreadPrivateData* pPriData, WELS_EVENT** ppEventsList, SLayerBSInfo* pLayerBsInfo,
- const uint32_t kuiNumThreads/*, int32_t *iLayerNum*/, SSliceCtx* pSliceCtx, const bool_t kbIsDynamicSlicingMode);
+ const uint32_t kuiNumThreads/*, int32_t *iLayerNum*/, SSliceCtx* pSliceCtx, const bool kbIsDynamicSlicingMode);
#endif//_WIN32
int32_t DynamicDetectCpuCores();
--- a/codec/encoder/core/inc/svc_base_layer_md.h
+++ b/codec/encoder/core/inc/svc_base_layer_md.h
@@ -56,8 +56,8 @@
void WelsMdIntraMb (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SMB* pCurMb, SMbCache* pMbCache);
-void WelsMdBackgroundMbEnc (void* pEnc, void* pMd, SMB* pCurMb, SMbCache* pMbCache, SSlice* pSlice, bool_t bSkipMbFlag);
-bool_t WelsMdPSkipEnc (void* pEnc, void* pMd, SMB* pCurMb, SMbCache* pMbCache);
+void WelsMdBackgroundMbEnc (void* pEnc, void* pMd, SMB* pCurMb, SMbCache* pMbCache, SSlice* pSlice, bool bSkipMbFlag);
+bool WelsMdPSkipEnc (void* pEnc, void* pMd, SMB* pCurMb, SMbCache* pMbCache);
int32_t WelsMdP16x16 (SWelsFuncPtrList* pFunc, SDqLayer* pCurDqLayer, SWelsMD* pWelsMd, SSlice* pSlice, SMB* pCurMb);
int32_t WelsMdP16x8 (SWelsFuncPtrList* pFunc, SDqLayer* pCurDqLayer, SWelsMD* pWelsMd, SSlice* pSlice);
@@ -67,25 +67,25 @@
/*static*/ void WelsMdInterFinePartition (void* pEnc, void* pMd, SSlice* pSlice, SMB* pCurMb, int32_t bestCost);
/*static*/ void WelsMdInterFinePartitionVaa (void* pEnc, void* pMd, SSlice* pSlice, SMB* pCurMb, int32_t bestCost);
void WelsMdInterMbRefinement (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SMB* pCurMb, SMbCache* pMbCache);
-bool_t WelsMdFirstIntraMode (void* pEnc, void* pMd, SMB* pCurMb, SMbCache* pMbCache);
-//bool_t svc_md_first_intra_mode_constrained(void* pEnc, void* pMd, SMB* pCurMb, SMbCache *pMbCache);
+bool WelsMdFirstIntraMode (void* pEnc, void* pMd, SMB* pCurMb, SMbCache* pMbCache);
+//bool svc_md_first_intra_mode_constrained(void* pEnc, void* pMd, SMB* pCurMb, SMbCache *pMbCache);
void WelsMdInterMb (void* pEncCtx, void* pWelsMd, SSlice* pSlice, SMB* pCurMb, SMbCache* pUnused);
//both used in BL and EL
-//void wels_md_inter_init ( SWelsMD* pMd, const uint8_t ref_idx, const bool_t is_highest_dlayer_flag );
+//void wels_md_inter_init ( SWelsMD* pMd, const uint8_t ref_idx, const bool is_highest_dlayer_flag );
-bool_t WelsMdInterJudgeBGDPskip (void* pEnc, void* pMd, SSlice* pSlice, SMB* pCurMb, SMbCache* pMbCache,
- bool_t* bKeepSkip);
-bool_t WelsMdInterJudgeBGDPskipFalse (void* pEnc, void* pMd, SSlice* pSlice, SMB* pCurMb, SMbCache* pMbCache,
- bool_t* bKeepSkip);
+bool WelsMdInterJudgeBGDPskip (void* pEnc, void* pMd, SSlice* pSlice, SMB* pCurMb, SMbCache* pMbCache,
+ bool* bKeepSkip);
+bool WelsMdInterJudgeBGDPskipFalse (void* pEnc, void* pMd, SSlice* pSlice, SMB* pCurMb, SMbCache* pMbCache,
+ bool* bKeepSkip);
-void WelsMdInterUpdateBGDInfo (SDqLayer* pCurLayer, SMB* pCurMb, const bool_t kbCollocatedPredFlag,
+void WelsMdInterUpdateBGDInfo (SDqLayer* pCurLayer, SMB* pCurMb, const bool kbCollocatedPredFlag,
const int32_t kiRefPictureType);
-void WelsMdInterUpdateBGDInfoNULL (SDqLayer* pCurLayer, SMB* pCurMb, const bool_t kbCollocatedPredFlag,
+void WelsMdInterUpdateBGDInfoNULL (SDqLayer* pCurLayer, SMB* pCurMb, const bool kbCollocatedPredFlag,
const int32_t kiRefPictureType);
-bool_t WelsMdInterJudgePskip (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SSlice* pSlice, SMB* pCurMb, SMbCache* pMbCache,
- bool_t bTrySkip);
+bool WelsMdInterJudgePskip (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SSlice* pSlice, SMB* pCurMb, SMbCache* pMbCache,
+ bool bTrySkip);
void WelsMdInterUpdatePskip (SDqLayer* pCurDqLayer, SSlice* pSlice, SMB* pCurMb, SMbCache* pMbCache);
void WelsMdInterDecidedPskip (sWelsEncCtx* pEncCtx, SSlice* pSlice, SMB* pCurMb, SMbCache* pMbCache);
@@ -96,7 +96,7 @@
const SWelsMD* kpMd);
void WelsMdInterSecondaryModesEnc (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SSlice* pSlice, SMB* pCurMb,
- SMbCache* pMbCache, const bool_t kbSkip);
+ SMbCache* pMbCache, const bool kbSkip);
void WelsMdIntraSecondaryModesEnc (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SMB* pCurMb, SMbCache* pMbCache);
//end of: both used in BL and EL
--- a/codec/encoder/core/inc/svc_enc_frame.h
+++ b/codec/encoder/core/inc/svc_enc_frame.h
@@ -84,7 +84,7 @@
int16_t iMbWidth; // MB width of this picture, equal to pSps.iMbWidth
int16_t iMbHeight; // MB height of this picture, equal to pSps.iMbHeight;
- bool_t bBaseLayerAvailableFlag; // whether base layer is available for prediction?
+ bool bBaseLayerAvailableFlag; // whether base layer is available for prediction?
uint8_t iLoopFilterDisableIdc; // 0: on, 1: off, 2: on except for slice boundaries
int8_t iLoopFilterAlphaC0Offset;// AlphaOffset: valid range [-6, 6], default 0
int8_t iLoopFilterBetaOffset; // BetaOffset: valid range [-6, 6], default 0
@@ -91,7 +91,7 @@
uint8_t uiDisableInterLayerDeblockingFilterIdc;
int8_t iInterLayerSliceAlphaC0Offset;
int8_t iInterLayerSliceBetaOffset;
- bool_t bDeblockingParallelFlag; //parallel_deblocking_flag
+ bool bDeblockingParallelFlag; //parallel_deblocking_flag
SPicture* pRefPic; // reference picture pointer
SPicture* pDecPic; // reconstruction picture pointer for layer
--- a/codec/encoder/core/inc/svc_enc_golomb.h
+++ b/codec/encoder/core/inc/svc_enc_golomb.h
@@ -231,7 +231,7 @@
}
-static inline bool_t BsCheckByteAlign (SBitStringAux* pBs) {+static inline bool BsCheckByteAlign (SBitStringAux* pBs) {return ! (pBs->iLeftBits & 0x7);
}
--- a/codec/encoder/core/inc/svc_enc_slice_segment.h
+++ b/codec/encoder/core/inc/svc_enc_slice_segment.h
@@ -136,7 +136,7 @@
*/
int32_t InitSlicePEncCtx (SSliceCtx* pSliceCtx,
CMemoryAlign* pMa,
- bool_t bFmoUseFlag,
+ bool bFmoUseFlag,
int32_t iMbWidth,
int32_t iMbHeight,
SMulSliceOption* pMulSliceOption,
@@ -212,9 +212,9 @@
//checking valid para
int32_t DynamicMaxSliceNumConstraint (uint32_t uiMaximumNum, int32_t uiConsumedNum, uint32_t uiDulplicateTimes);
-bool_t CheckFixedSliceNumMultiSliceSetting (const int32_t kiMbNumInFrame, SSliceArgument* pSliceArg);
-bool_t CheckRasterMultiSliceSetting (const int32_t kiMbNumInFrame, SSliceArgument* pSliceArg);
-bool_t CheckRowMbMultiSliceSetting (const int32_t kiMbWidth, SSliceArgument* pSliceArg);
+bool CheckFixedSliceNumMultiSliceSetting (const int32_t kiMbNumInFrame, SSliceArgument* pSliceArg);
+bool CheckRasterMultiSliceSetting (const int32_t kiMbNumInFrame, SSliceArgument* pSliceArg);
+bool CheckRowMbMultiSliceSetting (const int32_t kiMbWidth, SSliceArgument* pSliceArg);
void GomValidCheckSliceNum (const int32_t kiMbWidth, const int32_t kiMbHeight, int32_t* pSliceNum);
void GomValidCheckSliceMbNum (const int32_t kiMbWidth, const int32_t kiMbHeight, SSliceArgument* pSliceArg);
--- a/codec/encoder/core/inc/svc_encode_mb.h
+++ b/codec/encoder/core/inc/svc_encode_mb.h
@@ -57,8 +57,8 @@
void WelsEncRecUV (SWelsFuncPtrList* func, SMB* pCurMb, SMbCache* pMbCache, int16_t* pRs, int32_t iUV);
void WelsRecPskip (SDqLayer* pCurDq, SWelsFuncPtrList* pFunc, SMB* pCurMb, SMbCache* pMbCache);
-bool_t WelsTryPYskip (sWelsEncCtx* pEncCtx, SMB* pCurMb, SMbCache* pMbCache);
-bool_t WelsTryPUVskip (sWelsEncCtx* pEncCtx, SMB* pCurMb, SMbCache* pMbCache, int32_t iUV);
+bool WelsTryPYskip (sWelsEncCtx* pEncCtx, SMB* pCurMb, SMbCache* pMbCache);
+bool WelsTryPUVskip (sWelsEncCtx* pEncCtx, SMB* pCurMb, SMbCache* pMbCache, int32_t iUV);
}
#endif
--- a/codec/encoder/core/inc/svc_encode_slice.h
+++ b/codec/encoder/core/inc/svc_encode_slice.h
@@ -72,8 +72,8 @@
//===================MB-level encode====================//
//encapsulation func: store base rec, highest Dependency Layer(only one quality) rec, single layer rec
-void WelsPSliceMdEnc (sWelsEncCtx* pEncCtx, SSlice* pSlice, const bool_t kbIsHighestDlayerFlag);
-void WelsPSliceMdEncDynamic (sWelsEncCtx* pEncCtx, SSlice* pSlice, const bool_t kbIsHighestDlayerFlag);
+void WelsPSliceMdEnc (sWelsEncCtx* pEncCtx, SSlice* pSlice, const bool kbIsHighestDlayerFlag);
+void WelsPSliceMdEncDynamic (sWelsEncCtx* pEncCtx, SSlice* pSlice, const bool kbIsHighestDlayerFlag);
//encapsulation func: store base rec, highest Dependency Layer(only one quality) rec, single layer rec
void WelsISliceMdEnc (sWelsEncCtx* pEncCtx, SSlice* pSlice); // for intra non-dynamic slice
@@ -83,7 +83,7 @@
void WelsCodePOverDynamicSlice (sWelsEncCtx* pEncCtx, SSlice* pSlice);
void WelsCodeOneSlice (sWelsEncCtx* pEncCtx, const int32_t kiSliceIdx,
- const int32_t/*EWelsNalUnitType*/ keNalType/*, bool_t bNewLayer*/);
+ const int32_t/*EWelsNalUnitType*/ keNalType/*, bool bNewLayer*/);
void WelsInitSliceEncodingFuncs (uint32_t uiCpuFlag);
@@ -99,7 +99,7 @@
const int32_t kiSliceFirstMbXY); // for inter dynamic slice
-bool_t DynSlcJudgeSliceBoundaryStepBack (void* pEncCtx, void* pSlice, SSliceCtx* pSliceCtx, SMB* pCurMb,
+bool DynSlcJudgeSliceBoundaryStepBack (void* pEncCtx, void* pSlice, SSliceCtx* pSliceCtx, SMB* pCurMb,
SDynamicSlicingStack* pDss);
}
#endif //SVC_ENCODE_SLICE_H__
--- a/codec/encoder/core/inc/svc_motion_estimate.h
+++ b/codec/encoder/core/inc/svc_motion_estimate.h
@@ -127,7 +127,7 @@
void WelsMotionEstimateIterativeSearch (SWelsFuncPtrList* pFuncList, SWelsME* pMe, const int32_t kiStrideEnc,
const int32_t kiStrideRef, uint8_t* pRef);
-bool_t WelsMeSadCostSelect (int32_t* pSadCost, const uint16_t* kpMvdCost, int32_t* pBestCost, const int32_t kiDx,
+bool WelsMeSadCostSelect (int32_t* pSadCost, const uint16_t* kpMvdCost, int32_t* pBestCost, const int32_t kiDx,
const int32_t kiDy, int32_t* pIx, int32_t* pIy);
}
--- a/codec/encoder/core/inc/wels_common_basis.h
+++ b/codec/encoder/core/inc/wels_common_basis.h
@@ -199,7 +199,7 @@
typedef struct TagParaSetOffsetVariable {int32_t iParaSetIdDelta[MAX_DQ_LAYER_NUM/*+1*/]; //mark delta between SPS_ID_in_bs and sps_id_in_encoder, can be minus, for each dq-layer
//need not extra +1 due no MGS and FMO case so far
-bool_t bUsedParaSetIdInBs[MAX_PPS_COUNT]; //mark the used SPS_ID with 1
+bool bUsedParaSetIdInBs[MAX_PPS_COUNT]; //mark the used SPS_ID with 1
uint32_t uiNextParaSetIdToUseInBs; //mark the next SPS_ID_in_bs, for all layers
} SParaSetOffsetVariable;
@@ -208,12 +208,12 @@
SParaSetOffsetVariable
sParaSetOffsetVariable[PARA_SET_TYPE]; //PARA_SET_TYPE=3; paraset_type = 0: AVC_SPS; =1: Subset_SPS; =2: PPS
//in PSO design, "bPpsIdMappingIntoSubsetsps" uses the current para of current IDR period
-bool_t
+bool
bPpsIdMappingIntoSubsetsps[MAX_DQ_LAYER_NUM/*+1*/]; // need not extra +1 due no MGS and FMO case so far
uint16_t
uiIdrPicId; // IDR picture id: [0, 65535], this one is used for LTR!! Can we just NOT put this into the SParaSetOffset structure?!!
#if _DEBUG
-bool_t bEnableSpsPpsIdAddition;
+bool bEnableSpsPpsIdAddition;
#endif
} SParaSetOffset;
--- a/codec/encoder/core/inc/wels_func_ptr_def.h
+++ b/codec/encoder/core/inc/wels_func_ptr_def.h
@@ -110,7 +110,7 @@
typedef int32_t (*PIntraFineMdFunc) (void* pEncCtx, void* pWelsMd, SMB* pCurMb, SMbCache* pMbCache);
typedef void (*PInterFineMdFunc) (void* pEncCtx, void* pWelsMd, SSlice* slice, SMB* pCurMb, int32_t bestCost);
-typedef bool_t (*PInterMdFirstIntraModeFunc) (void* pEncCtx, void* pWelsMd, SMB* pCurMb, SMbCache* pMbCache);
+typedef bool (*PInterMdFirstIntraModeFunc) (void* pEncCtx, void* pWelsMd, SMB* pCurMb, SMbCache* pMbCache);
typedef void (*PMotionSearchFunc) (SWelsFuncPtrList* pFuncList, void* pCurDqLayer, void* pMe,
void* pSlice); // here after reset all function pointers, will set as right parameter type
@@ -117,12 +117,12 @@
typedef void (*PFillInterNeighborCacheFunc) (SMbCache* pMbCache, SMB* pCurMb, int32_t iMbWidth, int8_t* pVaaBgMbFlag);
typedef void (*PAccumulateSadFunc) (uint32_t* pSumDiff, int32_t* pGomForegroundBlockNum, int32_t* iSad8x8,
int8_t* pVaaBgMbFlag);//for RC
-typedef bool_t (*PDynamicSlicingStepBackFunc) (void* pEncCtx, void* pSlice, SSliceCtx* pSliceCtx, SMB* pCurMb,
+typedef bool (*PDynamicSlicingStepBackFunc) (void* pEncCtx, void* pSlice, SSliceCtx* pSliceCtx, SMB* pCurMb,
SDynamicSlicingStack* pDynamicSlicingStack); // 2010.8.17
-typedef bool_t (*PInterMdBackgroundDecisionFunc) (void* pEncCtx, void* pWelsMd, SSlice* slice, SMB* pCurMb,
- SMbCache* pMbCache, bool_t* pKeepPskip);
-typedef void (*PInterMdBackgroundInfoUpdateFunc) (SDqLayer* pCurLayer, SMB* pCurMb, const bool_t bFlag,
+typedef bool (*PInterMdBackgroundDecisionFunc) (void* pEncCtx, void* pWelsMd, SSlice* slice, SMB* pCurMb,
+ SMbCache* pMbCache, bool* pKeepPskip);
+typedef void (*PInterMdBackgroundInfoUpdateFunc) (SDqLayer* pCurLayer, SMB* pCurMb, const bool bFlag,
const int32_t kiRefPictureType);
typedef void (*PInterMdFunc) (void* pEncCtx, void* pWelsMd, SSlice* slice, SMB* pCurMb, SMbCache* pMbCache);
--- a/codec/encoder/core/inc/wels_preprocess.h
+++ b/codec/encoder/core/inc/wels_preprocess.h
@@ -79,8 +79,8 @@
uint8_t uiValidLongTermPicIdx;
uint8_t uiMarkLongTermPicIdx;
- bool_t bSceneChangeFlag;
- bool_t bIdrPeriodFlag;
+ bool bSceneChangeFlag;
+ bool bIdrPeriodFlag;
} SVAAFrameInfo;
class CWelsLib {@@ -119,16 +119,16 @@
int32_t MultiLayerPreprocess (void* pEncCtx, const SSourcePicture** kppSrcPicList, const int32_t kiSpatialNum);
void BilateralDenoising (SPicture* pSrc, const int32_t iWidth, const int32_t iHeight);
- bool_t DetectSceneChange (SPicture* pCurPicture, SPicture* pRefPicture);
+ bool DetectSceneChange (SPicture* pCurPicture, SPicture* pRefPicture);
int32_t DownsamplePadding (SPicture* pSrc, SPicture* pDstPic, int32_t iSrcWidth, int32_t iSrcHeight,
int32_t iShrinkWidth, int32_t iShrinkHeight, int32_t iTargetWidth, int32_t iTargetHeight);
- void VaaCalculation (SVAAFrameInfo* pVaaInfo, SPicture* pCurPicture, SPicture* pRefPicture, bool_t bCalculateSQDiff,
- bool_t bCalculateVar, bool_t bCalculateBGD);
- void BackgroundDetection (SVAAFrameInfo* pVaaInfo, SPicture* pCurPicture, SPicture* pRefPicture, bool_t bDetectFlag);
+ void VaaCalculation (SVAAFrameInfo* pVaaInfo, SPicture* pCurPicture, SPicture* pRefPicture, bool bCalculateSQDiff,
+ bool bCalculateVar, bool bCalculateBGD);
+ void BackgroundDetection (SVAAFrameInfo* pVaaInfo, SPicture* pCurPicture, SPicture* pRefPicture, bool bDetectFlag);
void AdaptiveQuantCalculation (SVAAFrameInfo* pVaaInfo, SPicture* pCurPicture, SPicture* pRefPicture);
void AnalyzePictureComplexity (void* pCtx, SPicture* pCurPicture, SPicture* pRefPicture,
- const int32_t kiDependencyId, const bool_t kbCalculateBGD);
+ const int32_t kiDependencyId, const bool kbCalculateBGD);
void Padding (uint8_t* pSrcY, uint8_t* pSrcU, uint8_t* pSrcV, int32_t iStrideY, int32_t iStrideUV,
int32_t iActualWidth, int32_t iPaddingWidth, int32_t iActualHeight, int32_t iPaddingHeight);
void SetRefMbType (void* pCtx, uint32_t** pRefMbTypeArray, int32_t iRefPicType);
@@ -144,8 +144,8 @@
IWelsVP* m_pInterfaceVp;
CWelsLib* m_pEncLib;
void* m_pEncCtx;
- bool_t m_bInitDone;
- bool_t m_bOfficialBranch;
+ bool m_bInitDone;
+ bool m_bOfficialBranch;
};
}
--- a/codec/encoder/core/src/au_set.cpp
+++ b/codec/encoder/core/src/au_set.cpp
@@ -262,7 +262,7 @@
int32_t WelsWritePpsSyntax (SWelsPPS* pPps, SBitStringAux* pBitStringAux, SParaSetOffset* sPSOVector) {SBitStringAux* pLocalBitStringAux = pBitStringAux;
- bool_t bUsedSubset = sPSOVector->bPpsIdMappingIntoSubsetsps[pPps->iPpsId];
+ bool bUsedSubset = sPSOVector->bPpsIdMappingIntoSubsetsps[pPps->iPpsId];
int32_t iParameterSetType = (bUsedSubset ? PARA_SET_TYPE_SUBSETSPS : PARA_SET_TYPE_AVCSPS);
BsWriteUE (pLocalBitStringAux, pPps->iPpsId +
@@ -348,7 +348,7 @@
return 0;
}
-static inline bool_t WelsGetPaddingOffset (int32_t iActualWidth, int32_t iActualHeight, int32_t iWidth,
+static inline bool WelsGetPaddingOffset (int32_t iActualWidth, int32_t iActualHeight, int32_t iWidth,
int32_t iHeight, SCropOffset& pOffset) {if ((iWidth < iActualWidth) || (iHeight < iActualHeight))
return false;
@@ -367,7 +367,7 @@
int32_t WelsInitSps (SWelsSPS* pSps, SDLayerParam* pLayerParam, const uint32_t kuiIntraPeriod,
const int32_t kiNumRefFrame,
- const uint32_t kuiSpsId, const bool_t kbEnableFrameCropping, bool_t bEnableRc) {+ const uint32_t kuiSpsId, const bool kbEnableFrameCropping, bool bEnableRc) {memset (pSps, 0, sizeof (SWelsSPS));
pSps->uiSpsId = kuiSpsId;
@@ -409,7 +409,7 @@
int32_t WelsInitSubsetSps (SSubsetSps* pSubsetSps, SDLayerParam* pLayerParam, const uint32_t kuiIntraPeriod,
const int32_t kiNumRefFrame,
- const uint32_t kuiSpsId, const bool_t kbEnableFrameCropping, bool_t bEnableRc) {+ const uint32_t kuiSpsId, const bool kbEnableFrameCropping, bool bEnableRc) {SWelsSPS* pSps = &pSubsetSps->pSps;
memset (pSubsetSps, 0, sizeof (SSubsetSps));
@@ -431,8 +431,8 @@
SWelsSPS* pSps,
SSubsetSps* pSubsetSps,
const uint32_t kuiPpsId,
- const bool_t kbDeblockingFilterPresentFlag,
- const bool_t kbUsingSubsetSps) {+ const bool kbDeblockingFilterPresentFlag,
+ const bool kbUsingSubsetSps) {SWelsSPS* pUsedSps = NULL;
if (pPps == NULL || (pSps == NULL && pSubsetSps == NULL))
return 1;
--- a/codec/encoder/core/src/deblocking.cpp
+++ b/codec/encoder/core/src/deblocking.cpp
@@ -396,8 +396,8 @@
int32_t iMbX = pCurMb->iMbX;
int32_t iMbY = pCurMb->iMbY;
- bool_t bLeftBsValid[2] = { (iMbX > 0), ((iMbX > 0) && (pCurMb->uiSliceIdc == (pCurMb - 1)->uiSliceIdc))};- bool_t bTopBsValid[2] = { (iMbY > 0), ((iMbY > 0) && (pCurMb->uiSliceIdc == (pCurMb - iMbStride)->uiSliceIdc))};+ bool bLeftBsValid[2] = { (iMbX > 0), ((iMbX > 0) && (pCurMb->uiSliceIdc == (pCurMb - 1)->uiSliceIdc))};+ bool bTopBsValid[2] = { (iMbY > 0), ((iMbY > 0) && (pCurMb->uiSliceIdc == (pCurMb - iMbStride)->uiSliceIdc))};int32_t iLeftFlag = bLeftBsValid[pFilter->uiFilterIdc];
int32_t iTopFlag = bTopBsValid[pFilter->uiFilterIdc];
@@ -482,8 +482,8 @@
int32_t iMbX = pCurMb->iMbX;
int32_t iMbY = pCurMb->iMbY;
- bool_t bLeftBsValid[2] = { (iMbX > 0), ((iMbX > 0) && (pCurMb->uiSliceIdc == (pCurMb - 1)->uiSliceIdc))};- bool_t bTopBsValid[2] = { (iMbY > 0), ((iMbY > 0) && (pCurMb->uiSliceIdc == (pCurMb - iMbStride)->uiSliceIdc))};+ bool bLeftBsValid[2] = { (iMbX > 0), ((iMbX > 0) && (pCurMb->uiSliceIdc == (pCurMb - 1)->uiSliceIdc))};+ bool bTopBsValid[2] = { (iMbY > 0), ((iMbY > 0) && (pCurMb->uiSliceIdc == (pCurMb - iMbStride)->uiSliceIdc))};int32_t iLeftFlag = bLeftBsValid[pFilter->uiFilterIdc];
int32_t iTopFlag = bTopBsValid[pFilter->uiFilterIdc];
@@ -537,8 +537,8 @@
int32_t iMbX = pCurMb->iMbX;
int32_t iMbY = pCurMb->iMbY;
- bool_t bLeftBsValid[2] = { (iMbX > 0), ((iMbX > 0) && (pCurMb->uiSliceIdc == (pCurMb - 1)->uiSliceIdc))};- bool_t bTopBsValid[2] = { (iMbY > 0), ((iMbY > 0) && (pCurMb->uiSliceIdc == (pCurMb - iMbStride)->uiSliceIdc))};+ bool bLeftBsValid[2] = { (iMbX > 0), ((iMbX > 0) && (pCurMb->uiSliceIdc == (pCurMb - 1)->uiSliceIdc))};+ bool bTopBsValid[2] = { (iMbY > 0), ((iMbY > 0) && (pCurMb->uiSliceIdc == (pCurMb - iMbStride)->uiSliceIdc))};int32_t iLeftFlag = bLeftBsValid[pFilter->uiFilterIdc];
int32_t iTopFlag = bTopBsValid[pFilter->uiFilterIdc];
@@ -593,8 +593,8 @@
int32_t iMbX = pCurMb->iMbX;
int32_t iMbY = pCurMb->iMbY;
- bool_t bLeftBsValid[2] = { (iMbX > 0), ((iMbX > 0) && (pCurMb->uiSliceIdc == (pCurMb - 1)->uiSliceIdc))};- bool_t bTopBsValid[2] = { (iMbY > 0), ((iMbY > 0) && (pCurMb->uiSliceIdc == (pCurMb - iMbStride)->uiSliceIdc))};+ bool bLeftBsValid[2] = { (iMbX > 0), ((iMbX > 0) && (pCurMb->uiSliceIdc == (pCurMb - 1)->uiSliceIdc))};+ bool bTopBsValid[2] = { (iMbY > 0), ((iMbY > 0) && (pCurMb->uiSliceIdc == (pCurMb - iMbStride)->uiSliceIdc))};int32_t iLeftFlag = bLeftBsValid[pFilter->uiFilterIdc];
int32_t iTopFlag = bTopBsValid[pFilter->uiFilterIdc];
--- a/codec/encoder/core/src/encoder.cpp
+++ b/codec/encoder/core/src/encoder.cpp
@@ -135,7 +135,7 @@
}
-void WelsInitBGDFunc (SWelsFuncPtrList* pFuncList, const bool_t kbEnableBackgroundDetection) {+void WelsInitBGDFunc (SWelsFuncPtrList* pFuncList, const bool kbEnableBackgroundDetection) { if (kbEnableBackgroundDetection) {pFuncList->pfInterMdBackgroundDecision = WelsMdInterJudgeBGDPskip;
pFuncList->pfInterMdBackgroundInfoUpdate = WelsMdInterUpdateBGDInfo;
@@ -283,7 +283,7 @@
EFrameType DecideFrameType (sWelsEncCtx* pEncCtx, const int8_t kiSpatialNum) {SWelsSvcCodingParam* pSvcParam = pEncCtx->pSvcParam;
EFrameType iFrameType = WELS_FRAME_TYPE_AUTO;
- bool_t bSceneChangeFlag = false;
+ bool bSceneChangeFlag = false;
// perform scene change detection
if ((!pSvcParam->bEnableSceneChangeDetect) || pEncCtx->pVaa->bIdrPeriodFlag ||
@@ -316,7 +316,7 @@
extern "C" void DumpDependencyRec (SPicture* pCurPicture, const str_t* kpFileName, const int8_t kiDid) {WelsFileHandle* pDumpRecFile = NULL;
- static bool_t bDependencyRecFlag[MAX_DEPENDENCY_LAYER] = {0};+ static bool bDependencyRecFlag[MAX_DEPENDENCY_LAYER] = {0};int32_t iWrittenSize = 0;
if (NULL == pCurPicture || NULL == kpFileName || kiDid >= MAX_DEPENDENCY_LAYER)
@@ -384,7 +384,7 @@
void DumpRecFrame (SPicture* pCurPicture, const str_t* kpFileName) {WelsFileHandle* pDumpRecFile = NULL;
- static bool_t bRecFlag = false;
+ static bool bRecFlag = false;
int32_t iWrittenSize = 0;
if (NULL == pCurPicture || NULL == kpFileName)
--- a/codec/encoder/core/src/encoder_ext.cpp
+++ b/codec/encoder/core/src/encoder_ext.cpp
@@ -636,10 +636,10 @@
&pEnc->pRefIndexBlock4x4[MB_BLOCK8x8_NUM * kiOffset]);
for (iIdx = 0; iIdx < iMbNum; iIdx++) {- bool_t bLeft;
- bool_t bTop;
- bool_t bLeftTop;
- bool_t bRightTop;
+ bool bLeft;
+ bool bTop;
+ bool bLeftTop;
+ bool bRightTop;
int32_t iLeftXY, iTopXY, iLeftTopXY, iRightTopXY;
uint8_t uiSliceIdc;
@@ -740,7 +740,7 @@
WELS_VERIFY_RETURN_IF (1, (NULL == pMbCache->pMemPredBlk4));
pMbCache->pBufferInterPredMe = (uint8_t*)pMa->WelsMalloc (4 * 640 * sizeof (uint8_t), "pMbCache->pBufferInterPredMe");
WELS_VERIFY_RETURN_IF (1, (NULL == pMbCache->pBufferInterPredMe));
- pMbCache->pPrevIntra4x4PredModeFlag = (bool_t*)pMa->WelsMalloc (16 * sizeof (bool_t),
+ pMbCache->pPrevIntra4x4PredModeFlag = (bool*)pMa->WelsMalloc (16 * sizeof (bool),
"pMbCache->pPrevIntra4x4PredModeFlag");
WELS_VERIFY_RETURN_IF (1, (NULL == pMbCache->pPrevIntra4x4PredModeFlag));
pMbCache->pRemIntra4x4PredModeFlag = (int8_t*)pMa->WelsMalloc (16 * sizeof (int8_t),
@@ -1000,7 +1000,7 @@
iDlayerIndex = 0;
while (iDlayerIndex < iDlayerCount) {SDqIdc* pDqIdc = & (*ppCtx)->pDqIdcMap[iDlayerIndex];
- const bool_t bUseSubsetSps = (iDlayerIndex > BASE_DEPENDENCY_ID);
+ const bool bUseSubsetSps = (iDlayerIndex > BASE_DEPENDENCY_ID);
SDLayerParam* pDlayerParam = &pParam->sDependencyLayers[iDlayerIndex];
pDqIdc->uiSpatialId = iDlayerIndex;
@@ -1120,7 +1120,7 @@
// Adaptive size_cs, size_fdec by implementation dependency
iTemporalIdx = 0;
while (iTemporalIdx < iCntTid) {- const bool_t kbBaseTemporalFlag = (iTemporalIdx == 0);
+ const bool kbBaseTemporalFlag = (iTemporalIdx == 0);
iSpatialIdx = 0;
while (iSpatialIdx < kiNumSpatialLayers) {@@ -1153,7 +1153,7 @@
iTemporalIdx = 0;
while (iTemporalIdx < iCntTid) {- const bool_t kbBaseTemporalFlag = (iTemporalIdx == 0);
+ const bool kbBaseTemporalFlag = (iTemporalIdx == 0);
iSpatialIdx = 0;
while (iSpatialIdx < iCountLayersNeedCs[kbBaseTemporalFlag]) {@@ -1172,13 +1172,13 @@
}
iTemporalIdx = 0;
while (iTemporalIdx < iCntTid) {- const bool_t kbBaseTemporalFlag = (iTemporalIdx == 0);
+ const bool kbBaseTemporalFlag = (iTemporalIdx == 0);
iSpatialIdx = 0;
while (iSpatialIdx < kiNumSpatialLayers) {int32_t iMatchIndex = 0;
- bool_t bInMap = false;
- bool_t bMatchFlag = false;
+ bool bInMap = false;
+ bool bMatchFlag = false;
i = 0;
while (i < iCountLayersNeedCs[kbBaseTemporalFlag]) {@@ -1667,7 +1667,7 @@
while (ilayer < pParam->iNumDependencyLayer) {SDqLayer* pDq = pCtx->ppDqLayerList[ilayer];
SDLayerParam* pDlp = &pCtx->pSvcParam->sDependencyLayers[ilayer];
- const bool_t kbIsDynamicSlicing = (SM_DYN_SLICE == pDlp->sMso.uiSliceMode);
+ const bool kbIsDynamicSlicing = (SM_DYN_SLICE == pDlp->sMso.uiSliceMode);
// pDq layers
if (NULL != pDq) {@@ -2312,10 +2312,10 @@
const int32_t kiMbXY = pMb->iMbXY;
const int32_t kiMbX = pMb->iMbX;
const int32_t kiMbY = pMb->iMbY;
- bool_t bLeft;
- bool_t bTop;
- bool_t bLeftTop;
- bool_t bRightTop;
+ bool bLeft;
+ bool bTop;
+ bool bLeftTop;
+ bool bRightTop;
int32_t uiSliceIdc;
int32_t iLeftXY, iTopXY, iLeftTopXY, iRightTopXY;
@@ -2550,7 +2550,7 @@
SSlice* pBaseSlice = &pCurDq->sLayerInfo.pSliceInLayer[0];
SSlice* pSlice = NULL;
const uint8_t kiCurDid = pCtx->uiDependencyId;
- const bool_t kbUseSubsetSpsFlag = (kiCurDid > BASE_DEPENDENCY_ID);
+ const bool kbUseSubsetSpsFlag = (kiCurDid > BASE_DEPENDENCY_ID);
SDLayerParam* fDlp = &pParam->sDependencyLayers[kiCurDid];
SNalUnitHeaderExt* pNalHdExt = &pCurDq->sLayerInfo.sNalHeaderExt;
SNalUnitHeader* pNalHd = &pNalHdExt->sNalHeader;
@@ -2638,7 +2638,7 @@
void PreprocessSliceCoding (sWelsEncCtx* pCtx) {SDqLayer* pCurLayer = pCtx->pCurDqLayer;
- const bool_t kbBaseAvail = pCurLayer->bBaseLayerAvailableFlag;
+ const bool kbBaseAvail = pCurLayer->bBaseLayerAvailableFlag;
/* function pointers conditional assignment under sWelsEncCtx, layer_mb_enc_rec (in stack) is exclusive */
@@ -2766,7 +2766,7 @@
const int32_t kiEncId = kiCurEncoderParaSetId;
const uint32_t kuiPrevIdInBs = sParaSetOffsetVariable->iParaSetIdDelta[kiEncId] + kiEncId;//mark current_id
- const bool_t* kpUsedIdPointer = &sParaSetOffsetVariable->bUsedParaSetIdInBs[0];
+ const bool* kpUsedIdPointer = &sParaSetOffsetVariable->bUsedParaSetIdInBs[0];
uint32_t uiNextIdInBs = sParaSetOffsetVariable->uiNextParaSetIdToUseInBs;
#if _DEBUG
@@ -2817,7 +2817,7 @@
while (iIdx < pCtx->iSpsNum) {SDqIdc* pDqIdc = &pCtx->pDqIdcMap[iIdx];
const int32_t kiDid = pDqIdc->uiSpatialId;
- const bool_t kbUsingSubsetSps = (kiDid > BASE_DEPENDENCY_ID);
+ const bool kbUsingSubsetSps = (kiDid > BASE_DEPENDENCY_ID);
iNal = pCtx->pOut->iNalIndex;
@@ -3009,7 +3009,7 @@
// uiSliceIdx: 0 1 2 3 4 5 6 7 8 9 10
iCheckingIdx = 0;
while (true) {- bool_t bMatchFlag = false;
+ bool bMatchFlag = false;
iPartitionIdx = 0;
while (iPartitionIdx < kiPartitionCnt) {const int32_t coded_slice_cnt = pCurDq->pNumSliceCodedOfPartition[iPartitionIdx];
@@ -3124,7 +3124,7 @@
EWelsNalRefIdc eNalRefIdc = NRI_PRI_LOWEST;
int8_t iCurDid = 0;
int8_t iCurTid = 0;
- bool_t bAvcBased = false;
+ bool bAvcBased = false;
#if defined(ENABLE_PSNR_CALC)
float snr_y = .0f, snr_u = .0f, snr_v = .0f;
#endif//ENABLE_PSNR_CALC
@@ -3531,7 +3531,7 @@
} else // for non-dynamic-slicing mode single threading branch..
#endif//MT_ENABLED
{- const bool_t bNeedPrefix = pCtx->bNeedPrefixNalFlag;
+ const bool bNeedPrefix = pCtx->bNeedPrefixNalFlag;
int32_t iSliceIdx = 0;
iSliceCount = GetCurrentSliceNum (pCtx->pCurDqLayer->pSliceEncCtx);
@@ -3810,7 +3810,7 @@
SWelsSvcCodingParam* pOldParam = NULL;
int32_t iReturn = 0;
int8_t iIndexD = 0;
- bool_t bNeedReset = false;
+ bool bNeedReset = false;
if (NULL == ppCtx || NULL == *ppCtx || NULL == pNewParam) return 1;
@@ -4006,7 +4006,7 @@
int32_t iAnyMbLeftInPartition = iEndMbInPartition - iFirstMbInPartition;
const EWelsNalUnitType keNalType = pCtx->eNalType;
const EWelsNalRefIdc keNalRefIdc = pCtx->eNalPriority;
- const bool_t kbNeedPrefix = pCtx->bNeedPrefixNalFlag;
+ const bool kbNeedPrefix = pCtx->bNeedPrefixNalFlag;
//init
{--- a/codec/encoder/core/src/expand_pic.cpp
+++ b/codec/encoder/core/src/expand_pic.cpp
@@ -147,7 +147,7 @@
pExpLuma (pPicY, pPic->iLineSize[0], kiWidthY, kiHeightY);
if (kiWidthUV >= 16) {// fix coding picture size as 16x16
- const bool_t kbChrAligned = /*(iWidthUV >= 16) && */ ((kiWidthUV & 0x0F) == 0); // chroma planes: (16+iWidthUV) & 15
+ const bool kbChrAligned = /*(iWidthUV >= 16) && */ ((kiWidthUV & 0x0F) == 0); // chroma planes: (16+iWidthUV) & 15
pExpChrom[kbChrAligned] (pPicCb, pPic->iLineSize[1], kiWidthUV, kiHeightUV);
pExpChrom[kbChrAligned] (pPicCr, pPic->iLineSize[2], kiWidthUV, kiHeightUV);
} else {--- a/codec/encoder/core/src/md.cpp
+++ b/codec/encoder/core/src/md.cpp
@@ -494,7 +494,7 @@
#endif//X86_ASM
}
-bool_t MdIntraAnalysisVaaInfo (sWelsEncCtx* pEncCtx, uint8_t* pEncMb) {+bool MdIntraAnalysisVaaInfo (sWelsEncCtx* pEncCtx, uint8_t* pEncMb) {SDqLayer* pCurDqLayer = pEncCtx->pCurDqLayer;
const int32_t kiLineSize = pCurDqLayer->iEncStride[0];
@@ -878,7 +878,7 @@
}
-void PredictSadSkip (int8_t* pRefIndexCache, bool_t* pMbSkipCache, int32_t* pSadCostCache, int32_t uiRef,
+void PredictSadSkip (int8_t* pRefIndexCache, bool* pMbSkipCache, int32_t* pSadCostCache, int32_t uiRef,
int32_t* iSadPredSkip) {const int32_t kiRefB = pRefIndexCache[1];//top g_uiCache12_8x8RefIdx[0] - 4
int32_t iRefC = pRefIndexCache[5];//top-right g_uiCache12_8x8RefIdx[0] - 2
--- a/codec/encoder/core/src/nal_encap.cpp
+++ b/codec/encoder/core/src/nal_encap.cpp
@@ -222,7 +222,7 @@
* \brief write prefix nal
*/
int32_t WelsWriteSVCPrefixNal (SBitStringAux* pBitStringAux, const int32_t kiNalRefIdc,
- const bool_t kbIdrFlag) {+ const bool kbIdrFlag) { if (0 < kiNalRefIdc) {BsWriteOneBit (pBitStringAux, false/*bStoreRefBasePicFlag*/);
BsWriteOneBit (pBitStringAux, false);
--- a/codec/encoder/core/src/picture_handle.cpp
+++ b/codec/encoder/core/src/picture_handle.cpp
@@ -47,7 +47,7 @@
* \pram need_expand need borders expanding
* \return successful if effective picture pointer returned, otherwise failed with NULL
*/
-SPicture* AllocPicture (CMemoryAlign* pMa, const int32_t kiWidth , const int32_t kiHeight, bool_t bNeedMbInfo) {+SPicture* AllocPicture (CMemoryAlign* pMa, const int32_t kiWidth , const int32_t kiHeight, bool bNeedMbInfo) {SPicture* pPic = NULL;
int32_t iPicWidth = 0;
int32_t iPicHeight = 0;
--- a/codec/encoder/core/src/ratectl.cpp
+++ b/codec/encoder/core/src/ratectl.cpp
@@ -108,7 +108,7 @@
int32_t j = 0;
int32_t iMbWidth = 0;
- bool_t bMultiSliceMode = FALSE;
+ bool bMultiSliceMode = FALSE;
int32_t iGomRowMode0 = 1, iGomRowMode1 = 1;
#ifdef _TEST_TEMP_RC_
fp_test_rc = fopen ("testRC.dat", "w");@@ -293,7 +293,7 @@
RcInitVGop (pEncCtx);
}
-bool_t RcJudgeBitrateFpsUpdate (sWelsEncCtx* pEncCtx) {+bool RcJudgeBitrateFpsUpdate (sWelsEncCtx* pEncCtx) {int32_t iCurDid = pEncCtx->uiDependencyId;
SWelsSvcRc* pWelsSvcRc = &pEncCtx->pWelsSvcRc[iCurDid];
SDLayerParam* pDLayerParam = &pEncCtx->pSvcParam->sDependencyLayers[iCurDid];
--- a/codec/encoder/core/src/ref_list_mgr_svc.cpp
+++ b/codec/encoder/core/src/ref_list_mgr_svc.cpp
@@ -254,7 +254,7 @@
int32_t iMaxFrameNumPlus1 = (1 << pCtx->pSps->uiLog2MaxFrameNum);
int32_t i = 0;
int32_t j = 0;
- bool_t bMoveLtrFromShortToLong = false;
+ bool bMoveLtrFromShortToLong = false;
if (pCtx->eSliceType == I_SLICE) {i = 0;
@@ -324,7 +324,7 @@
/*
* update reference picture list
*/
-bool_t WelsUpdateRefList (sWelsEncCtx* pCtx) {+bool WelsUpdateRefList (sWelsEncCtx* pCtx) {SRefList* pRefList = pCtx->ppRefPicListExt[pCtx->uiDependencyId];
SLTRState* pLtr = &pCtx->pLtr[pCtx->uiDependencyId];
SDLayerParam* pParamD = &pCtx->pSvcParam->sDependencyLayers[pCtx->uiDependencyId];
@@ -405,7 +405,7 @@
return TRUE;
}
-bool_t CheckCurMarkFrameNumUsed (sWelsEncCtx* pCtx) {+bool CheckCurMarkFrameNumUsed (sWelsEncCtx* pCtx) {SLTRState* pLtr = &pCtx->pLtr[pCtx->uiDependencyId];
SRefList* pRefList = pCtx->ppRefPicListExt[pCtx->uiDependencyId];
SPicture** pLongRefList = pRefList->pLongRefList;
@@ -532,7 +532,7 @@
/*
* build reference picture list
*/
-bool_t WelsBuildRefList (sWelsEncCtx* pCtx, const int32_t iPOC) {+bool WelsBuildRefList (sWelsEncCtx* pCtx, const int32_t iPOC) {SRefList* pRefList = pCtx->ppRefPicListExt[pCtx->uiDependencyId];
SLTRState* pLtr = &pCtx->pLtr[pCtx->uiDependencyId];
const int32_t kiNumRef = pCtx->pSvcParam->iNumRefFrame;
--- a/codec/encoder/core/src/slice_multi_threading.cpp
+++ b/codec/encoder/core/src/slice_multi_threading.cpp
@@ -81,10 +81,10 @@
const int32_t kiMbXY = pMb->iMbXY;
const int32_t kiMbX = pMb->iMbX;
const int32_t kiMbY = pMb->iMbY;
- bool_t bLeft;
- bool_t bTop;
- bool_t bLeftTop;
- bool_t bRightTop;
+ bool bLeft;
+ bool bTop;
+ bool bLeftTop;
+ bool bRightTop;
int32_t iLeftXY, iTopXY, iLeftTopXY, iRightTopXY;
iLeftXY = kiMbXY - 1;
@@ -688,7 +688,7 @@
SWelsSvcCodingParam* pCodingParam = pCtx->pSvcParam;
SDLayerParam* pDlp = &pCodingParam->sDependencyLayers[pCtx->uiDependencyId];
SWelsSliceBs* pSliceBs = NULL;
- const bool_t kbIsDynamicSlicingMode = (pDlp->sMso.uiSliceMode == SM_DYN_SLICE);
+ const bool kbIsDynamicSlicingMode = (pDlp->sMso.uiSliceMode == SM_DYN_SLICE);
int32_t iLayerSize = 0;
int32_t iNalIdxBase = pLbi->iNalCount;
int32_t iSliceIdx = 0;
@@ -897,7 +897,7 @@
int32_t iSliceIdx = -1;
int32_t iThreadIdx = -1;
int32_t iEventIdx = -1;
- bool_t bNeedPrefix = false;
+ bool bNeedPrefix = false;
EWelsNalUnitType eNalType = NAL_UNIT_UNSPEC_0;
EWelsNalRefIdc eNalRefIdc = NRI_PRI_LOWEST;
@@ -946,7 +946,7 @@
if (pParamD->sMso.uiSliceMode != SM_DYN_SLICE) {int64_t iSliceStart = 0;
- bool_t bDsaFlag = false;
+ bool bDsaFlag = false;
iSliceIdx = pPrivateData->iSliceIndex;
pSlice = &pCurDq->sLayerInfo.pSliceInLayer[iSliceIdx];
pSliceBs = &pEncPEncCtx->pSliceBs[iSliceIdx];
@@ -1252,10 +1252,10 @@
#ifdef _WIN32
int32_t FiredSliceThreads (SSliceThreadPrivateData* pPriData, WELS_EVENT* pEventsList, SLayerBSInfo* pLbi,
- const uint32_t uiNumThreads, SSliceCtx* pSliceCtx, const bool_t bIsDynamicSlicingMode)
+ const uint32_t uiNumThreads, SSliceCtx* pSliceCtx, const bool bIsDynamicSlicingMode)
#else
int32_t FiredSliceThreads (SSliceThreadPrivateData* pPriData, WELS_EVENT** pEventsList, SLayerBSInfo* pLbi,
- const uint32_t uiNumThreads, SSliceCtx* pSliceCtx, const bool_t bIsDynamicSlicingMode)
+ const uint32_t uiNumThreads, SSliceCtx* pSliceCtx, const bool bIsDynamicSlicingMode)
#endif//WIN32
{int32_t iEndMbIdx = 0;
@@ -1376,7 +1376,7 @@
int32_t iNeedAdj = 1;
// uiSliceMode of referencing spatial should be SM_FIXEDSLCNUM_SLICE
// if using spatial base layer for complexity estimation
- const bool_t kbModelingFromSpatial = (pCtx->pCurDqLayer->pRefLayer != NULL && iCurDid > 0)
+ const bool kbModelingFromSpatial = (pCtx->pCurDqLayer->pRefLayer != NULL && iCurDid > 0)
&& (pCtx->pSvcParam->sDependencyLayers[iCurDid - 1].sMso.uiSliceMode == SM_FIXEDSLCNUM_SLICE
&& pCtx->pSvcParam->iMultipleThreadIdc >= pCtx->pSvcParam->sDependencyLayers[iCurDid -
1].sMso.sSliceArgument.iSliceNum);
--- a/codec/encoder/core/src/svc_base_layer_md.cpp
+++ b/codec/encoder/core/src/svc_base_layer_md.cpp
@@ -446,7 +446,7 @@
const uint8_t* kpAvailMode;
int32_t i, j, iCoordinateX, iCoordinateY, iIdxStrideEnc, iIdxStrideDec;
int32_t lambda[2] = {iLambda << 2, iLambda};- bool_t* pPrevIntra4x4PredModeFlag = pMbCache->pPrevIntra4x4PredModeFlag;
+ bool* pPrevIntra4x4PredModeFlag = pMbCache->pPrevIntra4x4PredModeFlag;
int8_t* pRemIntra4x4PredModeFlag = pMbCache->pRemIntra4x4PredModeFlag;
const uint8_t* kpIntra4x4AvailCount = &g_kiIntra4AvailCount[0];
const uint8_t* kpCache48CountScan4 = &g_kuiCache48CountScan4Idx[0];
@@ -578,7 +578,7 @@
int32_t i, j, iCoordinateX, iCoordinateY, iIdxStrideEnc, iIdxStrideDec;
int32_t iCostH, iCostV, iCostVR, iCostHD, iCostVL, iCostHU, iBestModeFake;
int32_t lambda[2] = {iLambda << 2, iLambda};- bool_t* pPrevIntra4x4PredModeFlag = pMbCache->pPrevIntra4x4PredModeFlag;
+ bool* pPrevIntra4x4PredModeFlag = pMbCache->pPrevIntra4x4PredModeFlag;
int8_t* pRemIntra4x4PredModeFlag = pMbCache->pRemIntra4x4PredModeFlag;
const uint8_t* kpIntra4x4AvailCount = &g_kiIntra4AvailCount[0];
const uint8_t* kpCache48CountScan4 = &g_kuiCache48CountScan4Idx[0];
@@ -1235,7 +1235,7 @@
}
void WelsMdBackgroundMbEnc (void* pEnc, void* pMd, SMB* pCurMb, SMbCache* pMbCache, SSlice* pSlice,
- bool_t bSkipMbFlag) {+ bool bSkipMbFlag) {sWelsEncCtx* pEncCtx = (sWelsEncCtx*)pEnc;
SDqLayer* pCurDqLayer = pEncCtx->pCurDqLayer;
SWelsMD* pWelsMd = (SWelsMD*)pMd;
@@ -1307,7 +1307,7 @@
pFunc->pfCopy8x8Aligned (pMbCache->SPicData.pCsMb[2], pCurDqLayer->iCsStride[1], pMbCache->pMemPredChroma + 64, 8);
}
-bool_t WelsMdPSkipEnc (void* pEnc, void* pMd, SMB* pCurMb, SMbCache* pMbCache) {+bool WelsMdPSkipEnc (void* pEnc, void* pMd, SMB* pCurMb, SMbCache* pMbCache) {sWelsEncCtx* pEncCtx = (sWelsEncCtx*)pEnc;
SDqLayer* pCurLayer = pEncCtx->pCurDqLayer;
SWelsMD* pWelsMd = (SWelsMD*)pMd;
@@ -1586,7 +1586,7 @@
pWelsMd->iCostLuma = iBestSatdCost;
}
-bool_t WelsMdFirstIntraMode (void* pEnc, void* pMd, SMB* pCurMb, SMbCache* pMbCache) {+bool WelsMdFirstIntraMode (void* pEnc, void* pMd, SMB* pCurMb, SMbCache* pMbCache) {sWelsEncCtx* pEncCtx = (sWelsEncCtx*)pEnc;
SWelsFuncPtrList* pFunc = pEncCtx->pFuncList;
SWelsMD* pWelsMd = (SWelsMD*)pMd;
@@ -1625,13 +1625,13 @@
const uint32_t kuiNeighborAvail = pCurMb->uiNeighborAvail;
const int32_t kiMbWidth = pCurDqLayer->iMbWidth;
const SMB* top_mb = pCurMb - kiMbWidth;
- const bool_t bMbLeftAvailPskip = ((kuiNeighborAvail & LEFT_MB_POS) ? IS_SKIP ((pCurMb - 1)->uiMbType) : false);
- const bool_t bMbTopAvailPskip = ((kuiNeighborAvail & TOP_MB_POS) ? IS_SKIP (top_mb->uiMbType) : false);
- const bool_t bMbTopLeftAvailPskip = ((kuiNeighborAvail & TOPLEFT_MB_POS) ? IS_SKIP ((top_mb - 1)->uiMbType) : false);
- const bool_t bMbTopRightAvailPskip = ((kuiNeighborAvail & TOPRIGHT_MB_POS) ? IS_SKIP ((top_mb + 1)->uiMbType) : false);
- bool_t bTrySkip = bMbLeftAvailPskip || bMbTopAvailPskip || bMbTopLeftAvailPskip || bMbTopRightAvailPskip;
- bool_t bKeepSkip = bMbLeftAvailPskip && bMbTopAvailPskip && bMbTopRightAvailPskip;
- bool_t bSkip = FALSE;
+ const bool bMbLeftAvailPskip = ((kuiNeighborAvail & LEFT_MB_POS) ? IS_SKIP ((pCurMb - 1)->uiMbType) : false);
+ const bool bMbTopAvailPskip = ((kuiNeighborAvail & TOP_MB_POS) ? IS_SKIP (top_mb->uiMbType) : false);
+ const bool bMbTopLeftAvailPskip = ((kuiNeighborAvail & TOPLEFT_MB_POS) ? IS_SKIP ((top_mb - 1)->uiMbType) : false);
+ const bool bMbTopRightAvailPskip = ((kuiNeighborAvail & TOPRIGHT_MB_POS) ? IS_SKIP ((top_mb + 1)->uiMbType) : false);
+ bool bTrySkip = bMbLeftAvailPskip || bMbTopAvailPskip || bMbTopLeftAvailPskip || bMbTopRightAvailPskip;
+ bool bKeepSkip = bMbLeftAvailPskip && bMbTopAvailPskip && bMbTopRightAvailPskip;
+ bool bSkip = FALSE;
if (pEncCtx->pFuncList->pfInterMdBackgroundDecision (pEncCtx, pWelsMd, pSlice, pCurMb, pMbCache, &bKeepSkip)) {return;
@@ -1661,9 +1661,9 @@
//////
// try the ordinary Pskip
//////
-bool_t WelsMdInterJudgePskip (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SSlice* pSlice, SMB* pCurMb, SMbCache* pMbCache,
- bool_t bTrySkip) {- bool_t bRet = true;
+bool WelsMdInterJudgePskip (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SSlice* pSlice, SMB* pCurMb, SMbCache* pMbCache,
+ bool bTrySkip) {+ bool bRet = true;
if (((pEncCtx->pRefPic->iPictureType == P_SLICE) && (pMbCache->uiRefMbType == MB_TYPE_SKIP
|| pMbCache->uiRefMbType == MB_TYPE_BACKGROUND)) ||
bTrySkip) {@@ -1743,8 +1743,8 @@
//////
// try the BGD Pskip
//////
-bool_t WelsMdInterJudgeBGDPskip (void* pCtx, void* pMd, SSlice* pSlice, SMB* pCurMb, SMbCache* pMbCache,
- bool_t* bKeepSkip) {+bool WelsMdInterJudgeBGDPskip (void* pCtx, void* pMd, SSlice* pSlice, SMB* pCurMb, SMbCache* pMbCache,
+ bool* bKeepSkip) {sWelsEncCtx* pEncCtx = (sWelsEncCtx*)pCtx;
SWelsMD* pWelsMd = (SWelsMD*)pMd;
@@ -1775,8 +1775,8 @@
return false;
}
-bool_t WelsMdInterJudgeBGDPskipFalse (void* pCtx, void* pMd, SSlice* pSlice, SMB* pCurMb, SMbCache* pMbCache,
- bool_t* bKeepSkip) {+bool WelsMdInterJudgeBGDPskipFalse (void* pCtx, void* pMd, SSlice* pSlice, SMB* pCurMb, SMbCache* pMbCache,
+ bool* bKeepSkip) {return false;
}
@@ -1785,7 +1785,7 @@
//////
// update BGD related info
//////
-void WelsMdInterUpdateBGDInfo (SDqLayer* pCurLayer, SMB* pCurMb, const bool_t bCollocatedPredFlag,
+void WelsMdInterUpdateBGDInfo (SDqLayer* pCurLayer, SMB* pCurMb, const bool bCollocatedPredFlag,
const int32_t iRefPictureType) {uint8_t* pTargetRefMbQpList = (pCurLayer->pDecPic->pRefMbQp);
const int32_t kiMbXY = pCurMb->iMbXY;
@@ -1802,7 +1802,7 @@
}
}
-void WelsMdInterUpdateBGDInfoNULL (SDqLayer* pCurLayer, SMB* pCurMb, const bool_t bCollocatedPredFlag,
+void WelsMdInterUpdateBGDInfoNULL (SDqLayer* pCurLayer, SMB* pCurMb, const bool bCollocatedPredFlag,
const int32_t iRefPictureType) {}
@@ -1820,9 +1820,9 @@
}
void WelsMdInterSecondaryModesEnc (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SSlice* pSlice, SMB* pCurMb,
- SMbCache* pMbCache, const bool_t bSkip) {+ SMbCache* pMbCache, const bool bSkip) {//step 2: Intra
- const bool_t kbTrySkip = pEncCtx->pFuncList->pfFirstIntraMode (pEncCtx, pWelsMd, pCurMb, pMbCache);
+ const bool kbTrySkip = pEncCtx->pFuncList->pfFirstIntraMode (pEncCtx, pWelsMd, pCurMb, pMbCache);
if (kbTrySkip)
return;
--- a/codec/encoder/core/src/svc_enc_slice_segment.cpp
+++ b/codec/encoder/core/src/svc_enc_slice_segment.cpp
@@ -121,7 +121,7 @@
*/
//slice parameter check for SM_FIXEDSLCNUM_SLICE
-bool_t CheckFixedSliceNumMultiSliceSetting (const int32_t kiMbNumInFrame, SSliceArgument* pSliceArg) {+bool CheckFixedSliceNumMultiSliceSetting (const int32_t kiMbNumInFrame, SSliceArgument* pSliceArg) {int32_t* pSlicesAssignList = (int32_t*) & (pSliceArg->uiSliceMbNum[0]);
const uint32_t kuiSliceNum = pSliceArg->iSliceNum;
uint32_t uiSliceIdx = 0;
@@ -141,7 +141,7 @@
}
//slice parameter check for SM_ROWMB_SLICE
-bool_t CheckRowMbMultiSliceSetting (const int32_t kiMbWidth, SSliceArgument* pSliceArg) {+bool CheckRowMbMultiSliceSetting (const int32_t kiMbWidth, SSliceArgument* pSliceArg) {int32_t* pSlicesAssignList = (int32_t*) & (pSliceArg->uiSliceMbNum[0]);
const uint32_t kuiSliceNum = pSliceArg->iSliceNum;
uint32_t uiSliceIdx = 0;
@@ -157,7 +157,7 @@
}
//slice parameter check for SM_RASTER_SLICE
-bool_t CheckRasterMultiSliceSetting (const int32_t kiMbNumInFrame, SSliceArgument* pSliceArg) {+bool CheckRasterMultiSliceSetting (const int32_t kiMbNumInFrame, SSliceArgument* pSliceArg) {int32_t* pSlicesAssignList = (int32_t*) & (pSliceArg->uiSliceMbNum[0]);
int32_t iActualSliceCount = 0;
@@ -494,7 +494,7 @@
*/
int32_t InitSlicePEncCtx (SSliceCtx* pSliceCtx,
CMemoryAlign* pMa,
- bool_t bFmoUseFlag,
+ bool bFmoUseFlag,
int32_t iMbWidth,
int32_t iMbHeight,
SMulSliceOption* pMso,
--- a/codec/encoder/core/src/svc_encode_mb.cpp
+++ b/codec/encoder/core/src/svc_encode_mb.cpp
@@ -325,7 +325,7 @@
pFuncList->pfSetMemZeroSize8 (pCurMb->pNonZeroCount, 24);
}
-bool_t WelsTryPYskip (sWelsEncCtx* pEncCtx, SMB* pCurMb, SMbCache* pMbCache) {+bool WelsTryPYskip (sWelsEncCtx* pEncCtx, SMB* pCurMb, SMbCache* pMbCache) {int32_t iSingleCtrMb = 0;
int16_t* pRes = pMbCache->pCoeffLevel;
const uint8_t kuiQp = pCurMb->uiLumaQp;
@@ -352,7 +352,7 @@
return TRUE;
}
-bool_t WelsTryPUVskip (sWelsEncCtx* pEncCtx, SMB* pCurMb, SMbCache* pMbCache, int32_t iUV) {+bool WelsTryPUVskip (sWelsEncCtx* pEncCtx, SMB* pCurMb, SMbCache* pMbCache, int32_t iUV) {int16_t* pRes = ((iUV == 1) ? & (pMbCache->pCoeffLevel[256]) : & (pMbCache->pCoeffLevel[256 + 64]));
const uint8_t kuiQp = g_kuiChromaQpTable[CLIP3_QP_0_51 (pCurMb->uiLumaQp +
--- a/codec/encoder/core/src/svc_encode_slice.cpp
+++ b/codec/encoder/core/src/svc_encode_slice.cpp
@@ -598,7 +598,7 @@
//encapsulate two kinds of reconstruction:
// first. store base or highest Dependency Layer with only one quality (without CS RS reconstruction)
// second. lower than highest Dependency Layer, and for every Dependency Layer with one quality layer(single layer)
-void WelsPSliceMdEnc (sWelsEncCtx* pEncCtx, SSlice* pSlice, const bool_t kbIsHighestDlayerFlag) { //pMd + encoding+void WelsPSliceMdEnc (sWelsEncCtx* pEncCtx, SSlice* pSlice, const bool kbIsHighestDlayerFlag) { //pMd + encodingconst SSliceHeaderExt* kpShExt = &pSlice->sSliceHeaderExt;
const SSliceHeader* kpSh = &kpShExt->sSliceHeader;
const int32_t kiSliceFirstMbXY = kpSh->iFirstMbInSlice;
@@ -613,7 +613,7 @@
WelsMdInterMbLoop (pEncCtx, pSlice, &sMd, kiSliceFirstMbXY);
}
-void WelsPSliceMdEncDynamic (sWelsEncCtx* pEncCtx, SSlice* pSlice, const bool_t kbIsHighestDlayerFlag) {+void WelsPSliceMdEncDynamic (sWelsEncCtx* pEncCtx, SSlice* pSlice, const bool kbIsHighestDlayerFlag) {const SSliceHeaderExt* kpShExt = &pSlice->sSliceHeaderExt;
const SSliceHeader* kpSh = &kpShExt->sSliceHeader;
const int32_t kiSliceFirstMbXY = kpSh->iFirstMbInSlice;
@@ -631,8 +631,8 @@
void WelsCodePSlice (sWelsEncCtx* pEncCtx, SSlice* pSlice) {//pSlice-level init should be outside and before this function
SDqLayer* pCurLayer = pEncCtx->pCurDqLayer;
- const bool_t kbBaseAvail = pCurLayer->bBaseLayerAvailableFlag;
- const bool_t kbHighestSpatial = pEncCtx->pSvcParam->iNumDependencyLayer ==
+ const bool kbBaseAvail = pCurLayer->bBaseLayerAvailableFlag;
+ const bool kbHighestSpatial = pEncCtx->pSvcParam->iNumDependencyLayer ==
(pCurLayer->sLayerInfo.sNalHeaderExt.uiDependencyId + 1);
//MD switch
@@ -649,8 +649,8 @@
void WelsCodePOverDynamicSlice (sWelsEncCtx* pEncCtx, SSlice* pSlice) {//pSlice-level init should be outside and before this function
SDqLayer* pCurLayer = pEncCtx->pCurDqLayer;
- const bool_t kbBaseAvail = pCurLayer->bBaseLayerAvailableFlag;
- const bool_t kbHighestSpatial = pEncCtx->pSvcParam->iNumDependencyLayer ==
+ const bool kbBaseAvail = pCurLayer->bBaseLayerAvailableFlag;
+ const bool kbHighestSpatial = pEncCtx->pSvcParam->iNumDependencyLayer ==
(pCurLayer->sLayerInfo.sNalHeaderExt.uiDependencyId + 1);
//MD switch
@@ -738,10 +738,10 @@
const int32_t kiMbXY = pMb->iMbXY;
const int32_t kiMbX = pMb->iMbX;
const int32_t kiMbY = pMb->iMbY;
- bool_t bLeft;
- bool_t bTop;
- bool_t bLeftTop;
- bool_t bRightTop;
+ bool bLeft;
+ bool bTop;
+ bool bLeftTop;
+ bool bRightTop;
int32_t iLeftXY, iTopXY, iLeftTopXY, iRightTopXY;
const uint8_t kuiSliceIdc = WelsMbToSliceIdc (pSliceCtx, kiMbXY);
@@ -819,7 +819,7 @@
UpdateMbNeighbourInfoForNextSlice (pSliceCtx, pMbList, iFirstMbIdxOfNextSlice, kiLastMbIdxInPartition);
}
-bool_t DynSlcJudgeSliceBoundaryStepBack (void* pCtx, void* pSlice, SSliceCtx* pSliceCtx, SMB* pCurMb,
+bool DynSlcJudgeSliceBoundaryStepBack (void* pCtx, void* pSlice, SSliceCtx* pSliceCtx, SMB* pCurMb,
SDynamicSlicingStack* pDss) {sWelsEncCtx* pEncCtx = (sWelsEncCtx*)pCtx;
SSlice* pCurSlice = (SSlice*)pSlice;
@@ -830,12 +830,12 @@
const int32_t kiPartitaionId = pCurSlice->uiSliceIdx % kiActiveThreadsNum;
const int32_t kiLastMbIdxInPartition = pEncCtx->pCurDqLayer->pLastMbIdxOfPartition[kiPartitaionId];
- const bool_t kbCurMbNotFirstMbOfCurSlice = (pSliceCtx->pOverallMbMap[iCurMbIdx] ==
+ const bool kbCurMbNotFirstMbOfCurSlice = (pSliceCtx->pOverallMbMap[iCurMbIdx] ==
pSliceCtx->pOverallMbMap[iCurMbIdx - 1]);
- const bool_t kbCurMbNotLastMbOfCurPartition = iCurMbIdx < kiLastMbIdxInPartition;
- const bool_t kbSliceNumNotExceedConstraint = pSliceCtx->iSliceNumInFrame <
+ const bool kbCurMbNotLastMbOfCurPartition = iCurMbIdx < kiLastMbIdxInPartition;
+ const bool kbSliceNumNotExceedConstraint = pSliceCtx->iSliceNumInFrame <
pSliceCtx->iMaxSliceNumConstraint; /*tmp choice to avoid complex memory operation, 100520, to be modify*/
- const bool_t kbSliceNumReachConstraint = (pSliceCtx->iSliceNumInFrame ==
+ const bool kbSliceNumReachConstraint = (pSliceCtx->iSliceNumInFrame ==
pSliceCtx->iMaxSliceNumConstraint);
if (pCurSlice->bDynamicSlicingSliceSizeCtrlFlag)
--- a/codec/encoder/core/src/svc_mode_decision.cpp
+++ b/codec/encoder/core/src/svc_mode_decision.cpp
@@ -55,15 +55,15 @@
const uint32_t kuiNeighborAvail = pCurMb->uiNeighborAvail;
const int32_t kiMbWidth = pCurDqLayer->iMbWidth;
const SMB* kpTopMb = pCurMb - kiMbWidth;
- const bool_t kbMbLeftAvailPskip = ((kuiNeighborAvail & LEFT_MB_POS) ? IS_SKIP ((pCurMb - 1)->uiMbType) : false);
- const bool_t kbMbTopAvailPskip = ((kuiNeighborAvail & TOP_MB_POS) ? IS_SKIP (kpTopMb->uiMbType) : false);
- const bool_t kbMbTopLeftAvailPskip = ((kuiNeighborAvail & TOPLEFT_MB_POS) ? IS_SKIP ((kpTopMb - 1)->uiMbType) : false);
- const bool_t kbMbTopRightAvailPskip = ((kuiNeighborAvail & TOPRIGHT_MB_POS) ? IS_SKIP ((
+ const bool kbMbLeftAvailPskip = ((kuiNeighborAvail & LEFT_MB_POS) ? IS_SKIP ((pCurMb - 1)->uiMbType) : false);
+ const bool kbMbTopAvailPskip = ((kuiNeighborAvail & TOP_MB_POS) ? IS_SKIP (kpTopMb->uiMbType) : false);
+ const bool kbMbTopLeftAvailPskip = ((kuiNeighborAvail & TOPLEFT_MB_POS) ? IS_SKIP ((kpTopMb - 1)->uiMbType) : false);
+ const bool kbMbTopRightAvailPskip = ((kuiNeighborAvail & TOPRIGHT_MB_POS) ? IS_SKIP ((
kpTopMb + 1)->uiMbType) : false);
- bool_t bTrySkip = kbMbLeftAvailPskip | kbMbTopAvailPskip | kbMbTopLeftAvailPskip | kbMbTopRightAvailPskip;
- bool_t bKeepSkip = kbMbLeftAvailPskip & kbMbTopAvailPskip & kbMbTopRightAvailPskip;
- bool_t bSkip = FALSE;
+ bool bTrySkip = kbMbLeftAvailPskip | kbMbTopAvailPskip | kbMbTopLeftAvailPskip | kbMbTopRightAvailPskip;
+ bool bKeepSkip = kbMbLeftAvailPskip & kbMbTopAvailPskip & kbMbTopRightAvailPskip;
+ bool bSkip = FALSE;
if (pEncCtx->pFuncList->pfInterMdBackgroundDecision (pEncCtx, pWelsMd, pSlice, pCurMb, pMbCache, &bKeepSkip)) {return;
--- a/codec/encoder/core/src/svc_motion_estimate.cpp
+++ b/codec/encoder/core/src/svc_motion_estimate.cpp
@@ -155,7 +155,7 @@
}
}
-bool_t WelsMeSadCostSelect (int32_t* iSadCost, const uint16_t* kpMvdCost, int32_t* pBestCost, const int32_t kiDx,
+bool WelsMeSadCostSelect (int32_t* iSadCost, const uint16_t* kpMvdCost, int32_t* pBestCost, const int32_t kiDx,
const int32_t kiDy, int32_t* pIx, int32_t* pIy) {int32_t iTempSadCost[4];
int32_t iInputSadCost = *pBestCost;
@@ -213,7 +213,7 @@
int32_t iX, iY;
- const bool_t kbIsBestCostWorse = WelsMeSadCostSelect (iSadCosts, kpMvdCost, &iBestCost, iMvDx, iMvDy, &iX, &iY);
+ const bool kbIsBestCostWorse = WelsMeSadCostSelect (iSadCosts, kpMvdCost, &iBestCost, iMvDx, iMvDy, &iX, &iY);
if (kbIsBestCostWorse)
break;
--- a/codec/encoder/core/src/svc_set_mb_syn_cavlc.cpp
+++ b/codec/encoder/core/src/svc_set_mb_syn_cavlc.cpp
@@ -68,7 +68,7 @@
int32_t i = 0;
SMVUnitXY sMvd[2];
- bool_t* pPredFlag;
+ bool* pPredFlag;
int8_t* pRemMode;
int32_t iMbOffset = 0;
@@ -176,7 +176,7 @@
int32_t iNumRefIdxl0ActiveMinus1 = pSliceHeadExt->sSliceHeader.uiNumRefIdxL0Active - 1;
int32_t i;
- bool_t bSubRef0 = false;
+ bool bSubRef0 = false;
const uint8_t* kpScan4 = & (g_kuiMbCountScan4Idx[0]);
/* mb type */
--- a/codec/encoder/core/src/utils.cpp
+++ b/codec/encoder/core/src/utils.cpp
@@ -89,7 +89,7 @@
static inline str_t* GetLogTag (const int32_t kiLevel, int32_t* pBit) {int32_t iShift = 0;
int32_t iVal = 0;
- bool_t bFound = false;
+ bool bFound = false;
if (kiLevel <= 0 || kiLevel > (1 << (WELS_LOG_LEVEL_COUNT - 1)) || NULL == pBit)
return NULL;
--- a/codec/encoder/core/src/wels_preprocess.cpp
+++ b/codec/encoder/core/src/wels_preprocess.cpp
@@ -60,7 +60,7 @@
typedef EResult (WELSAPI* pfnDestroyVpInterface) (void*, int);
int32_t WelsInitScaledPic (SWelsSvcCodingParam* pParam, Scaled_Picture* pScaledPic, CMemoryAlign* pMemoryAlign);
-bool_t JudgeNeedOfScaling (SWelsSvcCodingParam* pParam, Scaled_Picture* pScaledPic);
+bool JudgeNeedOfScaling (SWelsSvcCodingParam* pParam, Scaled_Picture* pScaledPic);
void FreeScaledPic (Scaled_Picture* pScaledPic, CMemoryAlign* pMemoryAlign);
//******* table definition ***********************************************************************//
@@ -313,8 +313,8 @@
int32_t CWelsPreProcess::WelsPreprocessStep3 (void* pCtx, const int32_t kiDidx) {sWelsEncCtx* pEncCtx = (sWelsEncCtx*)pCtx;
SWelsSvcCodingParam* pSvcParam = pEncCtx->pSvcParam;
- bool_t bNeededMbAq = (pSvcParam->bEnableAdaptiveQuant && (pEncCtx->eSliceType == P_SLICE));
- bool_t bCalculateBGD = (pEncCtx->eSliceType == P_SLICE && pSvcParam->bEnableBackgroundDetection);
+ bool bNeededMbAq = (pSvcParam->bEnableAdaptiveQuant && (pEncCtx->eSliceType == P_SLICE));
+ bool bCalculateBGD = (pEncCtx->eSliceType == P_SLICE && pSvcParam->bEnableBackgroundDetection);
int32_t iCurTemporalIdx = pEncCtx->uiSpatialLayersInTemporal[kiDidx] - 1;
@@ -327,8 +327,8 @@
SPicture* pRefPic = pEncCtx->pSpatialPic[kiDidx][iRefTemporalIdx];
{SPicture* pLastPic = m_pLastSpatialPicture[kiDidx][0];
- bool_t bCalculateSQDiff = ((pLastPic->pData[0] == pRefPic->pData[0]) && bNeededMbAq);
- bool_t bCalculateVar = (pSvcParam->iRCMode == RC_MODE1 && pEncCtx->eSliceType == I_SLICE);
+ bool bCalculateSQDiff = ((pLastPic->pData[0] == pRefPic->pData[0]) && bNeededMbAq);
+ bool bCalculateVar = (pSvcParam->iRCMode == RC_MODE1 && pEncCtx->eSliceType == I_SLICE);
VaaCalculation (pEncCtx->pVaa, pCurPic, pRefPic, bCalculateSQDiff, bCalculateVar, bCalculateBGD);
}
@@ -517,12 +517,12 @@
/*!
* \brief Whether input picture need be scaled?
*/
-bool_t JudgeNeedOfScaling (SWelsSvcCodingParam* pParam, Scaled_Picture* pScaledPicture) {+bool JudgeNeedOfScaling (SWelsSvcCodingParam* pParam, Scaled_Picture* pScaledPicture) {const int32_t kiInputPicWidth = pParam->SUsedPicRect.iWidth;
const int32_t kiInputPicHeight = pParam->SUsedPicRect.iHeight;
const int32_t kiDstPicWidth = pParam->sDependencyLayers[pParam->iNumDependencyLayer - 1].iActualWidth;
const int32_t kiDstPicHeight = pParam->sDependencyLayers[pParam->iNumDependencyLayer - 1].iActualHeight;
- bool_t bNeedDownsampling = true;
+ bool bNeedDownsampling = true;
int32_t iSpatialIdx = pParam->iNumDependencyLayer - 1;
@@ -551,7 +551,7 @@
}
int32_t WelsInitScaledPic (SWelsSvcCodingParam* pParam, Scaled_Picture* pScaledPicture, CMemoryAlign* pMemoryAlign) {- bool_t bInputPicNeedScaling = JudgeNeedOfScaling (pParam, pScaledPicture);
+ bool bInputPicNeedScaling = JudgeNeedOfScaling (pParam, pScaledPicture);
if (bInputPicNeedScaling) {pScaledPicture->pScaledInputPicture = AllocPicture (pMemoryAlign, pParam->SUsedPicRect.iWidth,
pParam->SUsedPicRect.iHeight, false);
@@ -611,8 +611,8 @@
m_pInterfaceVp->Process (iMethodIdx, &sSrcPixMap, NULL);
}
-bool_t CWelsPreProcess::DetectSceneChange (SPicture* pCurPicture, SPicture* pRefPicture) {- bool_t bSceneChangeFlag = false;
+bool CWelsPreProcess::DetectSceneChange (SPicture* pCurPicture, SPicture* pRefPicture) {+ bool bSceneChangeFlag = false;
int32_t iMethodIdx = METHOD_SCENE_CHANGE_DETECTION;
SSceneChangeResult sSceneChangeDetectResult = {0}; SPixMap sSrcPixMap = {0};@@ -688,7 +688,7 @@
//*********************************************************************************************************/
void CWelsPreProcess::VaaCalculation (SVAAFrameInfo* pVaaInfo, SPicture* pCurPicture, SPicture* pRefPicture,
- bool_t bCalculateSQDiff, bool_t bCalculateVar, bool_t bCalculateBGD) {+ bool bCalculateSQDiff, bool bCalculateVar, bool bCalculateBGD) {pVaaInfo->sVaaCalcInfo.pCurY = pCurPicture->pData[0];
pVaaInfo->sVaaCalcInfo.pRefY = pRefPicture->pData[0];
{@@ -722,7 +722,7 @@
}
void CWelsPreProcess::BackgroundDetection (SVAAFrameInfo* pVaaInfo, SPicture* pCurPicture, SPicture* pRefPicture,
- bool_t bDetectFlag) {+ bool bDetectFlag) { if (bDetectFlag) {pVaaInfo->iPicWidth = pCurPicture->iWidthInPixel;
pVaaInfo->iPicHeight = pCurPicture->iHeightInPixel;
@@ -834,7 +834,7 @@
void CWelsPreProcess::AnalyzePictureComplexity (void* pCtx, SPicture* pCurPicture, SPicture* pRefPicture,
- const int32_t kiDependencyId, const bool_t bCalculateBGD) {+ const int32_t kiDependencyId, const bool bCalculateBGD) {sWelsEncCtx* pEncCtx = (sWelsEncCtx*)pCtx;
SWelsSvcCodingParam* pSvcParam = pEncCtx->pSvcParam;
SVAAFrameInfo* pVaaInfo = pEncCtx->pVaa;
--- a/codec/encoder/plus/inc/welsEncoderExt.h
+++ b/codec/encoder/plus/inc/welsEncoderExt.h
@@ -114,12 +114,12 @@
int32_t m_iMaxPicHeight;
int32_t m_iCspInternal;
- bool_t m_bInitialFlag;
+ bool m_bInitialFlag;
#ifdef OUTPUT_BIT_STREAM
FILE* m_pFileBs;
FILE* m_pFileBsSize;
- bool_t m_bSwitch;
+ bool m_bSwitch;
int32_t m_iSwitchTimes;
#endif//OUTPUT_BIT_STREAM
--- a/codec/encoder/plus/src/welsEncoderExt.cpp
+++ b/codec/encoder/plus/src/welsEncoderExt.cpp
@@ -887,7 +887,7 @@
}
break;
case ENCODER_OPTION_ENABLE_SSEI: {- bool_t iValue = * ((bool_t*)pOption);
+ bool iValue = * ((bool*)pOption);
m_pEncContext->pSvcParam->bEnableSSEI = iValue;
WelsLog (m_pEncContext, WELS_LOG_INFO, " CWelsH264SVCEncoder::SetOption enable SSEI = %d \n",
m_pEncContext->pSvcParam->bEnableSSEI);
@@ -894,7 +894,7 @@
}
break;
case ENCODER_OPTION_ENABLE_PREFIX_NAL_ADDING: {- bool_t iValue = * ((bool_t*)pOption);
+ bool iValue = * ((bool*)pOption);
m_pEncContext->pSvcParam->bPrefixNalAddingCtrl = iValue;
WelsLog (m_pEncContext, WELS_LOG_INFO, " CWelsH264SVCEncoder::SetOption bPrefixNalAddingCtrl = %d \n",
m_pEncContext->pSvcParam->bPrefixNalAddingCtrl);
@@ -901,7 +901,7 @@
}
break;
case ENCODER_OPTION_ENABLE_SPS_PPS_ID_ADDITION: {- bool_t iValue = * ((bool_t*)pOption);
+ bool iValue = * ((bool*)pOption);
m_pEncContext->pSvcParam->bEnableSpsPpsIdAddition = iValue;
WelsLog (m_pEncContext, WELS_LOG_INFO, " CWelsH264SVCEncoder::SetOption enable SPS/PPS ID = %d \n",
--- a/codec/processing/src/backgrounddetection/BackgroundDetection.cpp
+++ b/codec/processing/src/backgrounddetection/BackgroundDetection.cpp
@@ -201,7 +201,7 @@
return WELS_ABS (ASD);
}
-inline bool_t CBackgroundDetection::ForegroundDilation23Luma (SBackgroundOU* pBackgroundOU,
+inline bool CBackgroundDetection::ForegroundDilation23Luma (SBackgroundOU* pBackgroundOU,
SBackgroundOU* pOUNeighbours[]) {SBackgroundOU* pOU_L = pOUNeighbours[0];
SBackgroundOU* pOU_R = pOUNeighbours[1];
@@ -234,7 +234,7 @@
return 0;
}
-inline bool_t CBackgroundDetection::ForegroundDilation23Chroma (int8_t iNeighbourForegroundFlags,
+inline bool CBackgroundDetection::ForegroundDilation23Chroma (int8_t iNeighbourForegroundFlags,
int32_t iStartSamplePos, int32_t iPicStrideUV, vBGDParam* pBgdParam) { static const int8_t kaOUPos[4] = {OU_LEFT, OU_RIGHT, OU_TOP, OU_BOTTOM}; int32_t aEdgeOffset[4] = {0, BGD_OU_SIZE_UV - 1, 0, iPicStrideUV* (BGD_OU_SIZE_UV - 1)};--- a/codec/processing/src/backgrounddetection/BackgroundDetection.h
+++ b/codec/processing/src/backgrounddetection/BackgroundDetection.h
@@ -83,9 +83,9 @@
inline SBackgroundOU* AllocateOUArrayMemory (int32_t iWidth, int32_t iHeight);
inline void FreeOUArrayMemory();
inline int32_t CalculateAsdChromaEdge (uint8_t* pOriRef, uint8_t* pOriCur, int32_t iStride);
- inline bool_t ForegroundDilation23Luma (SBackgroundOU* pBackgroundOU,
+ inline bool ForegroundDilation23Luma (SBackgroundOU* pBackgroundOU,
SBackgroundOU* pOUNeighbours[]); //Foreground_Dilation_2_3_Luma
- inline bool_t ForegroundDilation23Chroma (int8_t iNeighbourForegroundFlags, int32_t iStartSamplePos,
+ inline bool ForegroundDilation23Chroma (int8_t iNeighbourForegroundFlags, int32_t iStartSamplePos,
int32_t iPicStrideUV, vBGDParam* pBgdParam);//Foreground_Dilation_2_3_Chroma
inline void ForegroundDilation (SBackgroundOU* pBackgroundOU, SBackgroundOU* pOUNeighbours[], vBGDParam* pBgdParam,
int32_t iChromaSampleStartPos);
--- a/codec/processing/src/common/WelsFrameWork.cpp
+++ b/codec/processing/src/common/WelsFrameWork.cpp
@@ -220,8 +220,8 @@
return eReturn;
}
-bool_t CVpFrameWork::CheckValid (EMethods eMethod, SPixMap& pSrcPixMap, SPixMap& pDstPixMap) {- bool_t eReturn = FALSE;
+bool CVpFrameWork::CheckValid (EMethods eMethod, SPixMap& pSrcPixMap, SPixMap& pDstPixMap) {+ bool eReturn = FALSE;
if (eMethod == METHOD_NULL)
goto exit;
--- a/codec/processing/src/common/WelsFrameWork.h
+++ b/codec/processing/src/common/WelsFrameWork.h
@@ -92,7 +92,7 @@
EMethods m_eMethod;
EVideoFormat m_eFormat;
int32_t m_iIndex;
- bool_t m_bInit;
+ bool m_bInit;
};
class CVpFrameWork : public IWelsVP {@@ -116,7 +116,7 @@
EResult SpecialFeature (int32_t iType, void* pIn, void* pOut);
private:
- bool_t CheckValid (EMethods eMethod, SPixMap& sSrc, SPixMap& sDst);
+ bool CheckValid (EMethods eMethod, SPixMap& sSrc, SPixMap& sDst);
IStrategy* CreateStrategy (EMethods eMethod, int32_t iCpuFlag);
private:
--- a/codec/processing/src/common/typedef.h
+++ b/codec/processing/src/common/typedef.h
@@ -74,7 +74,6 @@
#endif
typedef char str_t ; // [comment]: specific use plain char only for character parameters
-typedef bool bool_t ;
enum {FALSE = 0,