Showing the changes to codec/encoder/core/src/deblocking.cpp (1 of 15 files). Show all
Unified · Split
| @@ -364,8 +364,8 @@ void DeblockingInterMb (DeblockingFunc* pfDeblocking, SMB* pCurMb, SDeblockingFi · 363 unmodified lines | |||
| 364 | int32_t iMbX = pCurMb->iMbX; | 364 | int32_t iMbX = pCurMb->iMbX; |
| 365 | int32_t iMbY = pCurMb->iMbY; | 365 | int32_t iMbY = pCurMb->iMbY; |
| 366 | 366 | ||
| 367 | bool bLeftBsValid[2] = { (iMbX > 0), ((iMbX > 0) && (pCurMb->uiSliceIdc == (pCurMb - 1)->uiSliceIdc))}; | 367 | bool bLeftBsValid[2] = { (iMbX > 0), ((iMbX > 0)&& (pCurMb->uiSliceIdc == (pCurMb - 1)->uiSliceIdc))}; |
| 368 | bool bTopBsValid[2] = { (iMbY > 0), ((iMbY > 0) && (pCurMb->uiSliceIdc == (pCurMb - iMbStride)->uiSliceIdc))}; | 368 | bool bTopBsValid[2] = { (iMbY > 0), ((iMbY > 0)&& (pCurMb->uiSliceIdc == (pCurMb - iMbStride)->uiSliceIdc))}; |
| 369 | 369 | ||
| 370 | int32_t iLeftFlag = bLeftBsValid[pFilter->uiFilterIdc]; | 370 | int32_t iLeftFlag = bLeftBsValid[pFilter->uiFilterIdc]; |
| 371 | int32_t iTopFlag = bTopBsValid[pFilter->uiFilterIdc]; | 371 | int32_t iTopFlag = bTopBsValid[pFilter->uiFilterIdc]; |
| @@ -450,8 +450,8 @@ void FilteringEdgeLumaHV (DeblockingFunc* pfDeblocking, SMB* pCurMb, SDeblocking · 78 unmodified lines | |||
| 450 | int32_t iMbX = pCurMb->iMbX; | 450 | int32_t iMbX = pCurMb->iMbX; |
| 451 | int32_t iMbY = pCurMb->iMbY; | 451 | int32_t iMbY = pCurMb->iMbY; |
| 452 | 452 | ||
| 453 | bool bLeftBsValid[2] = { (iMbX > 0), ((iMbX > 0) && (pCurMb->uiSliceIdc == (pCurMb - 1)->uiSliceIdc))}; | 453 | bool bLeftBsValid[2] = { (iMbX > 0), ((iMbX > 0)&& (pCurMb->uiSliceIdc == (pCurMb - 1)->uiSliceIdc))}; |
| 454 | bool bTopBsValid[2] = { (iMbY > 0), ((iMbY > 0) && (pCurMb->uiSliceIdc == (pCurMb - iMbStride)->uiSliceIdc))}; | 454 | bool bTopBsValid[2] = { (iMbY > 0), ((iMbY > 0)&& (pCurMb->uiSliceIdc == (pCurMb - iMbStride)->uiSliceIdc))}; |
| 455 | 455 | ||
| 456 | int32_t iLeftFlag = bLeftBsValid[pFilter->uiFilterIdc]; | 456 | int32_t iLeftFlag = bLeftBsValid[pFilter->uiFilterIdc]; |
| 457 | int32_t iTopFlag = bTopBsValid[pFilter->uiFilterIdc]; | 457 | int32_t iTopFlag = bTopBsValid[pFilter->uiFilterIdc]; |
| @@ -505,8 +505,8 @@ void FilteringEdgeChromaHV (DeblockingFunc* pfDeblocking, SMB* pCurMb, SDeblocki · 47 unmodified lines | |||
| 505 | int32_t iMbX = pCurMb->iMbX; | 505 | int32_t iMbX = pCurMb->iMbX; |
| 506 | int32_t iMbY = pCurMb->iMbY; | 506 | int32_t iMbY = pCurMb->iMbY; |
| 507 | 507 | ||
| 508 | bool bLeftBsValid[2] = { (iMbX > 0), ((iMbX > 0) && (pCurMb->uiSliceIdc == (pCurMb - 1)->uiSliceIdc))}; | 508 | bool bLeftBsValid[2] = { (iMbX > 0), ((iMbX > 0)&& (pCurMb->uiSliceIdc == (pCurMb - 1)->uiSliceIdc))}; |
| 509 | bool bTopBsValid[2] = { (iMbY > 0), ((iMbY > 0) && (pCurMb->uiSliceIdc == (pCurMb - iMbStride)->uiSliceIdc))}; | 509 | bool bTopBsValid[2] = { (iMbY > 0), ((iMbY > 0)&& (pCurMb->uiSliceIdc == (pCurMb - iMbStride)->uiSliceIdc))}; |
| 510 | 510 | ||
| 511 | int32_t iLeftFlag = bLeftBsValid[pFilter->uiFilterIdc]; | 511 | int32_t iLeftFlag = bLeftBsValid[pFilter->uiFilterIdc]; |
| 512 | int32_t iTopFlag = bTopBsValid[pFilter->uiFilterIdc]; | 512 | int32_t iTopFlag = bTopBsValid[pFilter->uiFilterIdc]; |
| @@ -634,8 +634,8 @@ void DeblockingMbAvcbase (SWelsFuncPtrList* pFunc, SMB* pCurMb, SDeblockingFilte · 121 unmodified lines | |||
| 634 | int32_t iMbX = pCurMb->iMbX; | 634 | int32_t iMbX = pCurMb->iMbX; |
| 635 | int32_t iMbY = pCurMb->iMbY; | 635 | int32_t iMbY = pCurMb->iMbY; |
| 636 | 636 | ||
| 637 | bool bLeftBsValid[2] = { (iMbX > 0), ((iMbX > 0) && (pCurMb->uiSliceIdc == (pCurMb - 1)->uiSliceIdc))}; | 637 | bool bLeftBsValid[2] = { (iMbX > 0), ((iMbX > 0)&& (pCurMb->uiSliceIdc == (pCurMb - 1)->uiSliceIdc))}; |
| 638 | bool bTopBsValid[2] = { (iMbY > 0), ((iMbY > 0) && (pCurMb->uiSliceIdc == (pCurMb - iMbStride)->uiSliceIdc))}; | 638 | bool bTopBsValid[2] = { (iMbY > 0), ((iMbY > 0)&& (pCurMb->uiSliceIdc == (pCurMb - iMbStride)->uiSliceIdc))}; |
| 639 | 639 | ||
| 640 | int32_t iLeftFlag = bLeftBsValid[pFilter->uiFilterIdc]; | 640 | int32_t iLeftFlag = bLeftBsValid[pFilter->uiFilterIdc]; |
| 641 | int32_t iTopFlag = bTopBsValid[pFilter->uiFilterIdc]; | 641 | int32_t iTopFlag = bTopBsValid[pFilter->uiFilterIdc]; |
| @@ -754,7 +754,7 @@ void PerformDeblockingFilter (sWelsEncCtx* pEnc) { · 112 unmodified lines | |||
| 754 | iSliceCount = GetCurrentSliceNum (pCurLayer); | 754 | iSliceCount = GetCurrentSliceNum (pCurLayer); |
| 755 | do { | 755 | do { |
| 756 | pSlice = pCurLayer->ppSliceInLayer[iSliceIdx]; | 756 | pSlice = pCurLayer->ppSliceInLayer[iSliceIdx]; |
| 757 | assert( NULL != pSlice); | 757 | assert (NULL != pSlice); |
| 758 | DeblockingFilterSliceAvcbase (pCurLayer, pEnc->pFuncList, pSlice); | 758 | DeblockingFilterSliceAvcbase (pCurLayer, pEnc->pFuncList, pSlice); |
| 759 | ++ iSliceIdx; | 759 | ++ iSliceIdx; |
| 760 | } while (iSliceIdx < iSliceCount); | 760 | } while (iSliceIdx < iSliceCount); |