negative data with left shift, use cast or multiplication instead

Licai Guo committed 12 years ago

Commit a8104081 parent 136931c3 files · +7 −6Browse files

Showing the changes to codec/decoder/core/src (3 of 3 files). Show all

Unified · Split

3 files

@@ -698,8 +698,8 @@ int32_t ParseSliceHeaderSyntaxs (PWelsDecoderContext pCtx, PBitStringAux pBs, co · 697 unmodified lines
698	return ERR_INFO_INVALID_DBLOCKING_IDC;	698	return ERR_INFO_INVALID_DBLOCKING_IDC;
699	}	699	}
700	if (pSliceHead->uiDisableDeblockingFilterIdc != 1) {	700	if (pSliceHead->uiDisableDeblockingFilterIdc != 1) {
701	pSliceHead->iSliceAlphaC0Offset = BsGetSe (pBs) << 1; // slice_alpha_c0_offset_div2	701	pSliceHead->iSliceAlphaC0Offset = BsGetSe (pBs) * 2; // slice_alpha_c0_offset_div2
702	pSliceHead->iSliceBetaOffset = BsGetSe (pBs) << 1; // iSliceBetaOffset	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	int32_t iPix14 = pSrc[-1] + pSrc[2];	138	int32_t iPix14 = pSrc[-1] + pSrc[2];
139	int32_t iPix23 = pSrc[ 0] + pSrc[1];	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	// h: iOffset=1 / v: iOffset=iSrcStride	143	// h: iOffset=1 / v: iOffset=iSrcStride
144	static inline int32_t FilterInput8bitWithStride_c (uint8_t* pSrc, const int32_t kiOffset) {	144	static inline int32_t FilterInput8bitWithStride_c (uint8_t* pSrc, const int32_t kiOffset) {

 }
 void BsEndCavlc (PBitStringAux pBs) {
   pBs->pCurBuf   = pBs->pStartBuf + (pBs->iIndex >> 3);
-  pBs->uiCurBits = ((((pBs->pCurBuf[0] << 8) | pBs->pCurBuf[1]) << 16) | (pBs->pCurBuf[2] << 8) | pBs->pCurBuf[3]) <<
+  uint32_t uiCache32Bit = (uint32_t)((((pBs->pCurBuf[0] << 8) | pBs->pCurBuf[1]) << 16) | (pBs->pCurBuf[2] << 8) | pBs->pCurBuf[3]);
-                   (pBs->iIndex & 0x07);
+  pBs->uiCurBits = uiCache32Bit << (pBs->iIndex & 0x07);
   pBs->pCurBuf  += 4;
   pBs->iLeftBits = -16 + (pBs->iIndex & 0x07);
 }
   uint8_t bChroma   = (bChromaDc || CHROMA_AC == iResidualProperty);
   SReadBitsCache sReadBitsCache;
-  sReadBitsCache.uiCache32Bit = ((((pBuf[0] << 8) | pBuf[1]) << 16) | (pBuf[2] << 8) | pBuf[3]) << (iCurIdx & 0x07);
+  uint32_t uiCache32Bit = (uint32_t)((((pBuf[0] << 8) | pBuf[1]) << 16) | (pBuf[2] << 8) | pBuf[3]);
+  sReadBitsCache.uiCache32Bit = uiCache32Bit << (iCurIdx & 0x07);
   sReadBitsCache.uiRemainBits = 32 - (iCurIdx & 0x07);
   sReadBitsCache.pBuf = pBuf;
   //////////////////////////////////////////////////////////////////////////

Keyboard shortcuts