Ticket #429: HM-6.0-dev-r2140-WPPEntryPoint.patch

source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -990 +990 @@
     entryPointOffset                    = new UInt[pSlice->getPPS()->getNumSubstreams()];
     UInt* pSubstreamSizes               = pSlice->getSubstreamSizes();
     // Find number of zero substreams at the end of slice
-    for (Int idx=pSlice->getPPS()->getNumSubstreams()-1; idx>=0; idx--)
+    for (Int idx=pSlice->getPPS()->getNumSubstreams()-2; idx>=0; idx--)
     {
       if ( pSubstreamSizes[ idx ] ==  0 )
       {
@@ -1001 +1001 @@
         break;
       }
     }
-    numEntryPointOffsets       = pSlice->getPPS()->getNumSubstreams() - numZeroSubstreamsAtEndOfSlice;
+    numEntryPointOffsets       = pSlice->getPPS()->getNumSubstreams() - 1 - numZeroSubstreamsAtEndOfSlice;
     for (Int idx=0; idx<numEntryPointOffsets; idx++)
     {
       entryPointOffset[ idx ] = ( pSubstreamSizes[ idx ] >> 3 ) ;