Showing the changes to codec/decoder (3 of 3 files). Show all
Unified · Split
| @@ -698,8 +698,8 @@ int32_t ParseSliceHeaderSyntaxs (PWelsDecoderContext pCtx, PBitStringAux pBs, co · 697 unmodified lines | ||
| 698 | 698 | return ERR_INFO_INVALID_DBLOCKING_IDC; |
| 699 | 699 | } |
| 700 | 700 | if (pSliceHead->uiDisableDeblockingFilterIdc != 1) { |
| 701 | − pSliceHead->iSliceAlphaC0Offset = BsGetSe (pBs) << 1; // slice_alpha_c0_offset_div2 | |
| 702 | − pSliceHead->iSliceBetaOffset = BsGetSe (pBs) << 1; // iSliceBetaOffset | |
| 701 | + pSliceHead->iSliceAlphaC0Offset = BsGetSe (pBs) * 2; // slice_alpha_c0_offset_div2 | |
| 702 | + pSliceHead->iSliceBetaOffset = BsGetSe (pBs) * 2; // iSliceBetaOffset | |
| 703 | 703 | } |
| 704 | 704 | } |
| 705 | 705 | |
| @@ -138,7 +138,7 @@ static inline int32_t HorFilterInput16bit_c (int16_t* pSrc) { · 137 unmodified lines | ||
| 138 | 138 | int32_t iPix14 = pSrc[-1] + pSrc[2]; |
| 139 | 139 | int32_t iPix23 = pSrc[ 0] + pSrc[1]; |
| 140 | 140 | |
| 141 | − return (iPix05 - ((iPix14 << 2) + iPix14) + (iPix23 << 4) + (iPix23 << 2)); | |
| 141 | + return (iPix05 - ((iPix14 * 4) + iPix14) + (iPix23 * 16) + (iPix23 * 4)); | |
| 142 | 142 | } |
| 143 | 143 | // h: iOffset=1 / v: iOffset=iSrcStride |
| 144 | 144 | static inline int32_t FilterInput8bitWithStride_c (uint8_t* pSrc, const int32_t kiOffset) { |
| @@ -477,8 +477,8 @@ void BsStartCavlc (PBitStringAux pBs) { · 476 unmodified lines | ||
| 477 | 477 | } |
| 478 | 478 | void BsEndCavlc (PBitStringAux pBs) { |
| 479 | 479 | pBs->pCurBuf = pBs->pStartBuf + (pBs->iIndex >> 3); |
| 480 | − pBs->uiCurBits = ((((pBs->pCurBuf[0] << 8) | pBs->pCurBuf[1]) << 16) | (pBs->pCurBuf[2] << 8) | pBs->pCurBuf[3]) << | |
| 481 | − (pBs->iIndex & 0x07); | |
| 480 | + uint32_t uiCache32Bit = (uint32_t)((((pBs->pCurBuf[0] << 8) | pBs->pCurBuf[1]) << 16) | (pBs->pCurBuf[2] << 8) | pBs->pCurBuf[3]); | |
| 481 | + pBs->uiCurBits = uiCache32Bit << (pBs->iIndex & 0x07); | |
| 482 | 482 | pBs->pCurBuf += 4; |
| 483 | 483 | pBs->iLeftBits = -16 + (pBs->iIndex & 0x07); |
| 484 | 484 | } |
| @@ -677,7 +677,8 @@ int32_t WelsResidualBlockCavlc (SVlcTable* pVlcTable, uint8_t* pNonZeroCountCach · 192 unmodified lines | ||
| 677 | 677 | uint8_t bChroma = (bChromaDc || CHROMA_AC == iResidualProperty); |
| 678 | 678 | SReadBitsCache sReadBitsCache; |
| 679 | 679 | |
| 680 | − sReadBitsCache.uiCache32Bit = ((((pBuf[0] << 8) | pBuf[1]) << 16) | (pBuf[2] << 8) | pBuf[3]) << (iCurIdx & 0x07); | |
| 680 | + uint32_t uiCache32Bit = (uint32_t)((((pBuf[0] << 8) | pBuf[1]) << 16) | (pBuf[2] << 8) | pBuf[3]); | |
| 681 | + sReadBitsCache.uiCache32Bit = uiCache32Bit << (iCurIdx & 0x07); | |
| 681 | 682 | sReadBitsCache.uiRemainBits = 32 - (iCurIdx & 0x07); |
| 682 | 683 | sReadBitsCache.pBuf = pBuf; |
| 683 | 684 | ////////////////////////////////////////////////////////////////////////// |