History

fix decoder, now it works correctly again

Sigrid Solveig Haflínudóttir committed 5 years ago

Commit 07b90531 parent 37423d47 files · +29 −58Browse files

Showing the changes to codec/decoder/core/src/decode_slice.cpp (1 of 7 files). Show all

Unified · Split

codec/decoder/core/src/decode_slice.cpp+1−3
@@ -1536,7 +1536,6 @@ int32_t WelsDecodeSlice (PWelsDecoderContext pCtx, bool bFirstSliceInLayer, PNal · 1535 unmodified lines
15361536 WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR,
15371537 "WelsDecodeSlice()::::ILP flag exist, not supported with CABAC enabled!");
15381538 pCtx->iErrorCode |= dsBitstreamError;
1539− fprint(2, "dsBitstreamError\n");
15401539 return dsBitstreamError;
15411540 }
15421541 if (P_SLICE == pSliceHeader->eSliceType)
@@ -1588,7 +1587,6 @@ int32_t WelsDecodeSlice (PWelsDecoderContext pCtx, bool bFirstSliceInLayer, PNal · 45 unmodified lines
15881587 pCurDqLayer->iMbXyIndex = iNextMbXyIndex;
15891588
15901589 do {
1591− //fprint(2, "(-1 == %d) || (%d >= %d) → %d\n", iNextMbXyIndex, iNextMbXyIndex, kiCountNumMb, (-1 == iNextMbXyIndex) || (iNextMbXyIndex >= kiCountNumMb));
15921590 if ((-1 == iNextMbXyIndex) || (iNextMbXyIndex >= kiCountNumMb)) { // slice group boundary or end of a frame
15931591 break;
15941592 }
@@ -1598,7 +1596,6 @@ int32_t WelsDecodeSlice (PWelsDecoderContext pCtx, bool bFirstSliceInLayer, PNal · 3 unmodified lines
15981596 iRet = pDecMbFunc (pCtx, pNalCur, &uiEosFlag);
15991597 pCurDqLayer->pMbRefConcealedFlag[iNextMbXyIndex] = pCtx->bMbRefConcealed;
16001598 if (iRet != ERR_NONE) {
1601− fprint(2, "pDecMbFunc %p %p %d\n", pDecMbFunc, WelsDecodeMbCabacPSlice, iRet);
16021599 return iRet;
16031600 }
16041601
@@ -1733,6 +1730,7 @@ int32_t WelsDecodeAndConstructSlice (PWelsDecoderContext pCtx) { · 128 unmodified lines
17331730 if (pCtx->uiNalRefIdc > 0) {
17341731 if (pCurDqLayer->iMbX == 0 || pCurDqLayer->iMbX == pCurDqLayer->iMbWidth - 1 || pCurDqLayer->iMbY == 0
17351732 || pCurDqLayer->iMbY == pCurDqLayer->iMbHeight - 1) {
1733+
17361734 PadMBLuma_c (pCurDqLayer->pDec->pData[0], pCurDqLayer->pDec->iLinesize[0], pCurDqLayer->pDec->iWidthInPixel,
17371735 pCurDqLayer->pDec->iHeightInPixel, pCurDqLayer->iMbX, pCurDqLayer->iMbY, pCurDqLayer->iMbWidth, pCurDqLayer->iMbHeight);
17381736 PadMBChroma_c (pCurDqLayer->pDec->pData[1], pCurDqLayer->pDec->iLinesize[1], pCurDqLayer->pDec->iWidthInPixel / 2,

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