generic-library/openh264
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1517 from ruil2/cabac_qp

Browse Source 
fix cabac encoding bug -- don't get the correct previous mb qp
This commit is contained in:
sijchen 2014-11-11 14:52:04 -08:00
commit a37f1abe5e
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
codec/encoder/core/src/svc_set_mb_syn_cabac.cpp
View File

@ -224,12 +224,11 @@ void WelsCabacMbCbp (SMB* pCurMb, int32_t iMbWidth, SCabacCtx* pCabacCtx) {
}
}
void WelsCabacMbDeltaQp (SMB* pCurMb, SCabacCtx* pCabacCtx) {
void WelsCabacMbDeltaQp (SMB* pCurMb, SCabacCtx* pCabacCtx, bool bFirstMbInSlice) {
SMB* pPrevMb = NULL;
int32_t iCtx = 0;
uint32_t uiNeighborAvail = pCurMb->uiNeighborAvail;
if ((uiNeighborAvail & LEFT_MB_POS) || (uiNeighborAvail & TOP_MB_POS)) {
if (!bFirstMbInSlice) {
pPrevMb = pCurMb - 1;
pCurMb->iLumaDQp = pCurMb->uiLumaQp - pPrevMb->uiLumaQp;
@ -482,6 +481,8 @@ int32_t WelsWriteMbResidualCabac (SSlice* pSlice, SMbCache* sMbCacheInfo, SMB* p
SMbCache* pMbCache = &pSlice->sMbCacheInfo;
int16_t i = 0;
int8_t* pNonZeroCoeffCount = pMbCache->iNonZeroCoeffCount;
SSliceHeaderExt* pSliceHeadExt = &pSlice->sSliceHeaderExt;
const int32_t iSliceFirstMbXY = pSliceHeadExt->sSliceHeader.iFirstMbInSlice;
pCurMb->iCbpDc = 0;
@ -492,7 +493,7 @@ int32_t WelsWriteMbResidualCabac (SSlice* pSlice, SMbCache* sMbCacheInfo, SMB* p
int32_t iCbpLuma = pCurMb->uiCbp & 15;
pCurMb->iLumaDQp = pCurMb->uiLumaQp - pSlice->uiLastMbQp;
WelsCabacMbDeltaQp (pCurMb, pCabacCtx);
WelsCabacMbDeltaQp (pCurMb, pCabacCtx, (pCurMb->iMbXY == iSliceFirstMbXY));
pSlice->uiLastMbQp = pCurMb->uiLumaQp;
if (uiMbType == MB_TYPE_INTRA16x16) {
@ -557,6 +558,7 @@ int32_t WelsWriteMbResidualCabac (SSlice* pSlice, SMbCache* sMbCacheInfo, SMB* p
}
}
} else {
pCurMb->iLumaDQp = 0;
pCurMb->uiLumaQp = pSlice->uiLastMbQp;
pCurMb->uiChromaQp = g_kuiChromaQpTable[CLIP3_QP_0_51 (pCurMb->uiLumaQp + uiChromaQpIndexOffset)];
}