History

Use bool instead of bool_t

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

Martin Storsjö committed 12 years ago

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

Showing the changes to codec/encoder/core/src/slice_multi_threading.cpp (1 of 82 files). Show all

Unified · Split

codec/encoder/core/src/slice_multi_threading.cpp+10−10
@@ -81,10 +81,10 @@ void UpdateMbListNeighborParallel (SSliceCtx* pSliceCtx, · 80 unmodified lines
8181 const int32_t kiMbXY = pMb->iMbXY;
8282 const int32_t kiMbX = pMb->iMbX;
8383 const int32_t kiMbY = pMb->iMbY;
84− bool_t bLeft;
85− bool_t bTop;
86− bool_t bLeftTop;
87− bool_t bRightTop;
84+ bool bLeft;
85+ bool bTop;
86+ bool bLeftTop;
87+ bool bRightTop;
8888 int32_t iLeftXY, iTopXY, iLeftTopXY, iRightTopXY;
8989
9090 iLeftXY = kiMbXY - 1;
@@ -688,7 +688,7 @@ int32_t AppendSliceToFrameBs (sWelsEncCtx* pCtx, SLayerBSInfo* pLbi, const int32 · 597 unmodified lines
688688 SWelsSvcCodingParam* pCodingParam = pCtx->pSvcParam;
689689 SDLayerParam* pDlp = &pCodingParam->sDependencyLayers[pCtx->uiDependencyId];
690690 SWelsSliceBs* pSliceBs = NULL;
691− const bool_t kbIsDynamicSlicingMode = (pDlp->sMso.uiSliceMode == SM_DYN_SLICE);
691+ const bool kbIsDynamicSlicingMode = (pDlp->sMso.uiSliceMode == SM_DYN_SLICE);
692692 int32_t iLayerSize = 0;
693693 int32_t iNalIdxBase = pLbi->iNalCount;
694694 int32_t iSliceIdx = 0;
@@ -897,7 +897,7 @@ WELS_THREAD_ROUTINE_TYPE CodingSliceThreadProc (void* arg) { · 202 unmodified lines
897897 int32_t iSliceIdx = -1;
898898 int32_t iThreadIdx = -1;
899899 int32_t iEventIdx = -1;
900− bool_t bNeedPrefix = false;
900+ bool bNeedPrefix = false;
901901 EWelsNalUnitType eNalType = NAL_UNIT_UNSPEC_0;
902902 EWelsNalRefIdc eNalRefIdc = NRI_PRI_LOWEST;
903903
@@ -946,7 +946,7 @@ WELS_THREAD_ROUTINE_TYPE CodingSliceThreadProc (void* arg) { · 42 unmodified lines
946946
947947 if (pParamD->sMso.uiSliceMode != SM_DYN_SLICE) {
948948 int64_t iSliceStart = 0;
949− bool_t bDsaFlag = false;
949+ bool bDsaFlag = false;
950950 iSliceIdx = pPrivateData->iSliceIndex;
951951 pSlice = &pCurDq->sLayerInfo.pSliceInLayer[iSliceIdx];
952952 pSliceBs = &pEncPEncCtx->pSliceBs[iSliceIdx];
@@ -1252,10 +1252,10 @@ void ResetCountBsSizeInPartitions (uint32_t* pCountBsSizeList, const int32_t iPa · 299 unmodified lines
12521252
12531253 #ifdef _WIN32
12541254 int32_t FiredSliceThreads (SSliceThreadPrivateData* pPriData, WELS_EVENT* pEventsList, SLayerBSInfo* pLbi,
1255− const uint32_t uiNumThreads, SSliceCtx* pSliceCtx, const bool_t bIsDynamicSlicingMode)
1255+ const uint32_t uiNumThreads, SSliceCtx* pSliceCtx, const bool bIsDynamicSlicingMode)
12561256 #else
12571257 int32_t FiredSliceThreads (SSliceThreadPrivateData* pPriData, WELS_EVENT** pEventsList, SLayerBSInfo* pLbi,
1258− const uint32_t uiNumThreads, SSliceCtx* pSliceCtx, const bool_t bIsDynamicSlicingMode)
1258+ const uint32_t uiNumThreads, SSliceCtx* pSliceCtx, const bool bIsDynamicSlicingMode)
12591259 #endif//WIN32
12601260 {
12611261 int32_t iEndMbIdx = 0;
@@ -1376,7 +1376,7 @@ int32_t AdjustEnhanceLayer (sWelsEncCtx* pCtx, int32_t iCurDid) { · 114 unmodified lines
13761376 int32_t iNeedAdj = 1;
13771377 // uiSliceMode of referencing spatial should be SM_FIXEDSLCNUM_SLICE
13781378 // if using spatial base layer for complexity estimation
1379− const bool_t kbModelingFromSpatial = (pCtx->pCurDqLayer->pRefLayer != NULL && iCurDid > 0)
1379+ const bool kbModelingFromSpatial = (pCtx->pCurDqLayer->pRefLayer != NULL && iCurDid > 0)
13801380 && (pCtx->pSvcParam->sDependencyLayers[iCurDid - 1].sMso.uiSliceMode == SM_FIXEDSLCNUM_SLICE
13811381 && pCtx->pSvcParam->iMultipleThreadIdc >= pCtx->pSvcParam->sDependencyLayers[iCurDid -
13821382 1].sMso.sSliceArgument.iSliceNum);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t