Ticket #1283: check_zero.patch

source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -1433 +1433 @@
     }
   }
 }
+Void TDecCavlc::parseRemainingBytes()
+{
+  UInt tmp;
+  if (m_pcBitstream->getNumBitsLeft() > 0)
+  {
+    tmp = m_pcBitstream->readByte();
+    assert (tmp == 0);
+  }
+}
 
 Void TDecCavlc::parseSkipFlag( TComDataCU* /*pcCU*/, UInt /*uiAbsPartIdx*/, UInt /*uiDepth*/ )
 {

source/Lib/TLibDecoder/TDecCAVLC.h

@@ -80 +80 @@
   Void  parseHrdParameters  (TComHRD *hrd, Bool cprms_present_flag, UInt tempLevelHigh);
   Void  parseSliceHeader    ( TComSlice*& rpcSlice, ParameterSetManagerDecoder *parameterSetManager);
   Void  parseTerminatingBit ( UInt& ruiBit );
-  
+  Void  parseRemainingBytes ();
+
   Void  parseMVPIdx         ( Int& riMVPIdx );
   
   Void  parseSkipFlag       ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth );

source/Lib/TLibDecoder/TDecCu.cpp

@@ -171 +171 @@
   
   if(uiIsLast) 
   {
+    // check that remaining bytes are zero
+    m_pcEntropyDecoder->decodeRemainingBytes();
     if(pcSlice->isNextSliceSegment()&&!pcSlice->isNextSlice()) 
     {
       pcSlice->setSliceSegmentCurEndCUAddr(pcCU->getSCUAddr()+uiAbsPartIdx+uiCurNumParts);

source/Lib/TLibDecoder/TDecEntropy.h

@@ -71 +71 @@
   virtual Void parseSliceHeader          ( TComSlice*& rpcSlice, ParameterSetManagerDecoder *parameterSetManager)       = 0;
 
   virtual Void  parseTerminatingBit       ( UInt& ruilsLast )                                     = 0;
-  
+
+  virtual Void parseRemainingBytes () = 0;
+
   virtual Void parseMVPIdx        ( Int& riMVPIdx ) = 0;
   
 public:
@@ -133 +135 @@
   Void    decodeSliceHeader           ( TComSlice*& rpcSlice, ParameterSetManagerDecoder *parameterSetManager)  { m_pcEntropyDecoderIf->parseSliceHeader(rpcSlice, parameterSetManager);         }
 
   Void    decodeTerminatingBit        ( UInt& ruiIsLast )       { m_pcEntropyDecoderIf->parseTerminatingBit(ruiIsLast);     }
-  
+
+  Void    decodeRemainingBytes () {m_pcEntropyDecoderIf->parseRemainingBytes();};
+
   TDecEntropyIf* getEntropyDecoder() { return m_pcEntropyDecoderIf; }
   
 public:

source/Lib/TLibDecoder/TDecSbac.cpp

@@ -190 +190 @@
   }
 }
 
+Void TDecSbac::parseRemainingBytes()
+{
+  UInt tmp;
+  if (m_pcBitstream->getNumBitsLeft() > 0)
+  {
+    tmp = m_pcBitstream->readByte();
+    assert (tmp == 0);
+  }
+}
 
 Void TDecSbac::xReadUnaryMaxSymbol( UInt& ruiSymbol, ContextModel* pcSCModel, Int iOffset, UInt uiMaxSymbol )
 {

source/Lib/TLibDecoder/TDecSbac.h

@@ -80 +80 @@
 
   Void  parseSliceHeader          ( TComSlice*& /*rpcSlice*/, ParameterSetManagerDecoder* /*parameterSetManager*/) {}
   Void  parseTerminatingBit       ( UInt& ruiBit );
+  Void  parseRemainingBytes ();
   Void  parseMVPIdx               ( Int& riMVPIdx          );
   Void  parseSaoMaxUvlc           ( UInt& val, UInt maxSymbol );
   Void  parseSaoMerge         ( UInt&  ruiVal   );