From d4ae4e808480342ed803dac91cb079c6a4f8db07 Mon Sep 17 00:00:00 2001
From: Hongtao Wang <hongtaow@qti.qualcomm.com>
Date: Thu, 22 Aug 2019 16:09:09 -0700
Subject: [PATCH] Avoid calling encodeBinsEP with more than 32 bits

---
 source/Lib/EncoderLib/CABACWriter.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/source/Lib/EncoderLib/CABACWriter.cpp b/source/Lib/EncoderLib/CABACWriter.cpp
index f74b0dcf9..19ca5ed7e 100644
--- a/source/Lib/EncoderLib/CABACWriter.cpp
+++ b/source/Lib/EncoderLib/CABACWriter.cpp
@@ -4207,10 +4207,9 @@ void CABACWriter::exp_golomb_eqprob( unsigned symbol, unsigned count )
   }
   bins <<= 1;
   numBins++;
-  bins = (bins << count) | symbol;
-  numBins += count;
-  //CHECK(!( numBins <= 32 ), "Unspecified error");
-  m_BinEncoder.encodeBinsEP( bins, numBins );
+  //CHECK(!( numBins + count <= 32 ), "Unspecified error");
+  m_BinEncoder.encodeBinsEP(bins, numBins);
+  m_BinEncoder.encodeBinsEP(symbol, count);
 }
 
 void CABACWriter::codeAlfCtuEnableFlags( CodingStructure& cs, ChannelType channel, AlfParam* alfParam)
-- 
GitLab