Merge pull request #274 from mstorsjo/typedef-cleanup
Remove typedefs for standard C++ types
This commit is contained in:
@@ -395,8 +395,8 @@ void DeblockingInterMb (DeblockingFunc* pfDeblocking, SMB* pCurMb, SDeblockingFi
|
||||
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];
|
||||
@@ -481,8 +481,8 @@ void FilteringEdgeLumaHV (DeblockingFunc* pfDeblocking, SMB* pCurMb, SDeblocking
|
||||
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];
|
||||
@@ -536,8 +536,8 @@ void FilteringEdgeChromaHV (DeblockingFunc* pfDeblocking, SMB* pCurMb, SDeblocki
|
||||
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];
|
||||
@@ -592,8 +592,8 @@ void DeblockingMbAvcbase (SWelsFuncPtrList* pFunc, SMB* pCurMb, SDeblockingFilte
|
||||
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];
|
||||
|
||||
Reference in New Issue
Block a user