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
81 const int32_t kiMbXY = pMb->iMbXY;81 const int32_t kiMbXY = pMb->iMbXY;
82 const int32_t kiMbX = pMb->iMbX;82 const int32_t kiMbX = pMb->iMbX;
83 const int32_t kiMbY = pMb->iMbY;83 const int32_t kiMbY = pMb->iMbY;
84 bool_t bLeft;84 bool bLeft;
85 bool_t bTop;85 bool bTop;
86 bool_t bLeftTop;86 bool bLeftTop;
87 bool_t bRightTop;87 bool bRightTop;
88 int32_t iLeftXY, iTopXY, iLeftTopXY, iRightTopXY;88 int32_t iLeftXY, iTopXY, iLeftTopXY, iRightTopXY;
89 89
90 iLeftXY = kiMbXY - 1;90 iLeftXY = kiMbXY - 1;
@@ -688,7 +688,7 @@ int32_t AppendSliceToFrameBs (sWelsEncCtx* pCtx, SLayerBSInfo* pLbi, const int32 · 597 unmodified lines
688 SWelsSvcCodingParam* pCodingParam = pCtx->pSvcParam;688 SWelsSvcCodingParam* pCodingParam = pCtx->pSvcParam;
689 SDLayerParam* pDlp = &pCodingParam->sDependencyLayers[pCtx->uiDependencyId];689 SDLayerParam* pDlp = &pCodingParam->sDependencyLayers[pCtx->uiDependencyId];
690 SWelsSliceBs* pSliceBs = NULL;690 SWelsSliceBs* pSliceBs = NULL;
691 const bool_t kbIsDynamicSlicingMode = (pDlp->sMso.uiSliceMode == SM_DYN_SLICE);691 const bool kbIsDynamicSlicingMode = (pDlp->sMso.uiSliceMode == SM_DYN_SLICE);
692 int32_t iLayerSize = 0;692 int32_t iLayerSize = 0;
693 int32_t iNalIdxBase = pLbi->iNalCount;693 int32_t iNalIdxBase = pLbi->iNalCount;
694 int32_t iSliceIdx = 0;694 int32_t iSliceIdx = 0;
@@ -897,7 +897,7 @@ WELS_THREAD_ROUTINE_TYPE CodingSliceThreadProc (void* arg) { · 202 unmodified lines
897 int32_t iSliceIdx = -1;897 int32_t iSliceIdx = -1;
898 int32_t iThreadIdx = -1;898 int32_t iThreadIdx = -1;
899 int32_t iEventIdx = -1;899 int32_t iEventIdx = -1;
900 bool_t bNeedPrefix = false;900 bool bNeedPrefix = false;
901 EWelsNalUnitType eNalType = NAL_UNIT_UNSPEC_0;901 EWelsNalUnitType eNalType = NAL_UNIT_UNSPEC_0;
902 EWelsNalRefIdc eNalRefIdc = NRI_PRI_LOWEST;902 EWelsNalRefIdc eNalRefIdc = NRI_PRI_LOWEST;
903 903
@@ -946,7 +946,7 @@ WELS_THREAD_ROUTINE_TYPE CodingSliceThreadProc (void* arg) { · 42 unmodified lines
946 946
947 if (pParamD->sMso.uiSliceMode != SM_DYN_SLICE) {947 if (pParamD->sMso.uiSliceMode != SM_DYN_SLICE) {
948 int64_t iSliceStart = 0;948 int64_t iSliceStart = 0;
949 bool_t bDsaFlag = false;949 bool bDsaFlag = false;
950 iSliceIdx = pPrivateData->iSliceIndex;950 iSliceIdx = pPrivateData->iSliceIndex;
951 pSlice = &pCurDq->sLayerInfo.pSliceInLayer[iSliceIdx];951 pSlice = &pCurDq->sLayerInfo.pSliceInLayer[iSliceIdx];
952 pSliceBs = &pEncPEncCtx->pSliceBs[iSliceIdx];952 pSliceBs = &pEncPEncCtx->pSliceBs[iSliceIdx];
@@ -1252,10 +1252,10 @@ void ResetCountBsSizeInPartitions (uint32_t* pCountBsSizeList, const int32_t iPa · 299 unmodified lines
1252 1252
1253#ifdef _WIN321253#ifdef _WIN32
1254int32_t FiredSliceThreads (SSliceThreadPrivateData* pPriData, WELS_EVENT* pEventsList, SLayerBSInfo* pLbi,1254int32_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)
1256#else1256#else
1257int32_t FiredSliceThreads (SSliceThreadPrivateData* pPriData, WELS_EVENT** pEventsList, SLayerBSInfo* pLbi,1257int32_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)
1259#endif//WIN321259#endif//WIN32
1260{1260{
1261 int32_t iEndMbIdx = 0;1261 int32_t iEndMbIdx = 0;
@@ -1376,7 +1376,7 @@ int32_t AdjustEnhanceLayer (sWelsEncCtx* pCtx, int32_t iCurDid) { · 114 unmodified lines
1376 int32_t iNeedAdj = 1;1376 int32_t iNeedAdj = 1;
1377 // uiSliceMode of referencing spatial should be SM_FIXEDSLCNUM_SLICE1377 // uiSliceMode of referencing spatial should be SM_FIXEDSLCNUM_SLICE
1378 // if using spatial base layer for complexity estimation1378 // 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)
1380 && (pCtx->pSvcParam->sDependencyLayers[iCurDid - 1].sMso.uiSliceMode == SM_FIXEDSLCNUM_SLICE1380 && (pCtx->pSvcParam->sDependencyLayers[iCurDid - 1].sMso.uiSliceMode == SM_FIXEDSLCNUM_SLICE
1381 && pCtx->pSvcParam->iMultipleThreadIdc >= pCtx->pSvcParam->sDependencyLayers[iCurDid -1381 && pCtx->pSvcParam->iMultipleThreadIdc >= pCtx->pSvcParam->sDependencyLayers[iCurDid -
1382 1].sMso.sSliceArgument.iSliceNum);1382 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