shithub: openh264

Info  •  Files  •  Log  •  Branches

A better way of fixing Bug-1479831 without potential performance hit.

--- a/codec/decoder/core/src/cabac_decoder.cpp

+++ b/codec/decoder/core/src/cabac_decoder.cpp

@@ -145,11 +145,8 @@

   int32_t iRenorm = 1;

   uint32_t uiRangeLPS = g_kuiCabacRangeLps[uiState][ (uiRange >> 6) & 0x03];

   uiRange -= uiRangeLPS;

-  if (pDecEngine->iBitsLeft < 0) {

-    return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_CABAC_NO_BS_TO_READ);

-  }

-  if (uiOffset >= (uiRange << pDecEngine->iBitsLeft)) { //LPS

-    uiOffset -= (uiRange << pDecEngine->iBitsLeft);

+  if (uiOffset >= (uiRange << (uint32_t)pDecEngine->iBitsLeft)) { //LPS

+    uiOffset -= (uiRange << (uint32_t)pDecEngine->iBitsLeft);

     uiBinVal ^= 0x0001;

     if (!uiState)

       pBinCtx->uiMPS ^= 0x01;