Showing the changes to codec/decoder/core/src/decode_slice.cpp (1 of 7 files). Show all
Unified · Split
| @@ -1536,7 +1536,6 @@ int32_t WelsDecodeSlice (PWelsDecoderContext pCtx, bool bFirstSliceInLayer, PNal · 1535 unmodified lines | |||
| 1536 | WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR, | 1536 | WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR, |
| 1537 | "WelsDecodeSlice()::::ILP flag exist, not supported with CABAC enabled!"); | 1537 | "WelsDecodeSlice()::::ILP flag exist, not supported with CABAC enabled!"); |
| 1538 | pCtx->iErrorCode |= dsBitstreamError; | 1538 | pCtx->iErrorCode |= dsBitstreamError; |
| 1539 | fprint(2, "dsBitstreamError\n"); | ||
| 1540 | return dsBitstreamError; | 1539 | return dsBitstreamError; |
| 1541 | } | 1540 | } |
| 1542 | if (P_SLICE == pSliceHeader->eSliceType) | 1541 | if (P_SLICE == pSliceHeader->eSliceType) |
| @@ -1588,7 +1587,6 @@ int32_t WelsDecodeSlice (PWelsDecoderContext pCtx, bool bFirstSliceInLayer, PNal · 45 unmodified lines | |||
| 1588 | pCurDqLayer->iMbXyIndex = iNextMbXyIndex; | 1587 | pCurDqLayer->iMbXyIndex = iNextMbXyIndex; |
| 1589 | 1588 | ||
| 1590 | do { | 1589 | do { |
| 1591 | //fprint(2, "(-1 == %d) || (%d >= %d) → %d\n", iNextMbXyIndex, iNextMbXyIndex, kiCountNumMb, (-1 == iNextMbXyIndex) || (iNextMbXyIndex >= kiCountNumMb)); | ||
| 1592 | if ((-1 == iNextMbXyIndex) || (iNextMbXyIndex >= kiCountNumMb)) { // slice group boundary or end of a frame | 1590 | if ((-1 == iNextMbXyIndex) || (iNextMbXyIndex >= kiCountNumMb)) { // slice group boundary or end of a frame |
| 1593 | break; | 1591 | break; |
| 1594 | } | 1592 | } |
| @@ -1598,7 +1596,6 @@ int32_t WelsDecodeSlice (PWelsDecoderContext pCtx, bool bFirstSliceInLayer, PNal · 3 unmodified lines | |||
| 1598 | iRet = pDecMbFunc (pCtx, pNalCur, &uiEosFlag); | 1596 | iRet = pDecMbFunc (pCtx, pNalCur, &uiEosFlag); |
| 1599 | pCurDqLayer->pMbRefConcealedFlag[iNextMbXyIndex] = pCtx->bMbRefConcealed; | 1597 | pCurDqLayer->pMbRefConcealedFlag[iNextMbXyIndex] = pCtx->bMbRefConcealed; |
| 1600 | if (iRet != ERR_NONE) { | 1598 | if (iRet != ERR_NONE) { |
| 1601 | fprint(2, "pDecMbFunc %p %p %d\n", pDecMbFunc, WelsDecodeMbCabacPSlice, iRet); | ||
| 1602 | return iRet; | 1599 | return iRet; |
| 1603 | } | 1600 | } |
| 1604 | 1601 | ||
| @@ -1733,6 +1730,7 @@ int32_t WelsDecodeAndConstructSlice (PWelsDecoderContext pCtx) { · 128 unmodified lines | |||
| 1733 | if (pCtx->uiNalRefIdc > 0) { | 1730 | if (pCtx->uiNalRefIdc > 0) { |
| 1734 | if (pCurDqLayer->iMbX == 0 || pCurDqLayer->iMbX == pCurDqLayer->iMbWidth - 1 || pCurDqLayer->iMbY == 0 | 1731 | if (pCurDqLayer->iMbX == 0 || pCurDqLayer->iMbX == pCurDqLayer->iMbWidth - 1 || pCurDqLayer->iMbY == 0 |
| 1735 | || pCurDqLayer->iMbY == pCurDqLayer->iMbHeight - 1) { | 1732 | || pCurDqLayer->iMbY == pCurDqLayer->iMbHeight - 1) { |
| 1733 | |||
| 1736 | PadMBLuma_c (pCurDqLayer->pDec->pData[0], pCurDqLayer->pDec->iLinesize[0], pCurDqLayer->pDec->iWidthInPixel, | 1734 | PadMBLuma_c (pCurDqLayer->pDec->pData[0], pCurDqLayer->pDec->iLinesize[0], pCurDqLayer->pDec->iWidthInPixel, |
| 1737 | pCurDqLayer->pDec->iHeightInPixel, pCurDqLayer->iMbX, pCurDqLayer->iMbY, pCurDqLayer->iMbWidth, pCurDqLayer->iMbHeight); | 1735 | pCurDqLayer->pDec->iHeightInPixel, pCurDqLayer->iMbX, pCurDqLayer->iMbY, pCurDqLayer->iMbWidth, pCurDqLayer->iMbHeight); |
| 1738 | PadMBChroma_c (pCurDqLayer->pDec->pData[1], pCurDqLayer->pDec->iLinesize[1], pCurDqLayer->pDec->iWidthInPixel / 2, | 1736 | PadMBChroma_c (pCurDqLayer->pDec->pData[1], pCurDqLayer->pDec->iLinesize[1], pCurDqLayer->pDec->iWidthInPixel / 2, |