shithub: openh264

Info  •  Files  •  Log  •  Branches

Merge pull request #2163 from HaiboZhu/Remove_cabac_shift_exponent_too_large

Remove the shift exponent too large warning

--- a/codec/decoder/core/inc/error_code.h

+++ b/codec/decoder/core/inc/error_code.h

@@ -196,6 +196,7 @@

 ERR_INFO_INVALID_MMCO_LONG_TERM_IDX_EXCEED_MAX,

 //for CABAC

 ERR_CABAC_NO_BS_TO_READ,

+ERR_CABAC_UNEXPECTED_VALUE,

 //for scaling list

 ERR_SCALING_LIST_DELTA_SCALE,

 };

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

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

@@ -273,7 +273,10 @@

       iSymTmp += (1 << iCount);

       ++iCount;

     }

-  } while (uiCode != 0);

+  } while (uiCode != 0 && iCount != 31);

+  if (iCount == 31) {

+    return ERR_CABAC_UNEXPECTED_VALUE;

+  }

   while (iCount--) {

     WELS_READ_VERIFY (DecodeBypassCabac (pDecEngine, uiCode));