Ticket #635: j0033.patch

source/Lib/TLibDecoder/TDecSlice.cpp

@@ -200 +200 @@
     uiTileWidth = rpcPic->getPicSym()->getTComTile(rpcPic->getPicSym()->getTileIdxMap(iCUAddr))->getTileWidth();
     uiTileHeight = rpcPic->getPicSym()->getTComTile(rpcPic->getPicSym()->getTileIdxMap(iCUAddr))->getTileHeight();
     uiCol     = iCUAddr % uiWidthInLCUs;
-    uiLin     = iCUAddr / uiWidthInLCUs;
+    // The 'line' is now relative to the 1st line in the slice, not the 1st line in the picture.
+    uiLin     = (iCUAddr/uiWidthInLCUs)-(iStartCUAddr/uiWidthInLCUs);
     // inherit from TR if necessary, select substream to use.
 #if DEPENDENT_SLICES
     if( (pcSlice->getPPS()->getNumSubstreams() > 1) || ( bAllowDependence  && (uiCol == uiTileLCUX)&&(pcSlice->getPPS()->getTilesOrEntropyCodingSyncIdc()==2) ))

source/Lib/TLibDecoder/TDecGop.cpp

@@ -229 +229 @@
     m_pcSbacDecoder->init( (TDecBinIf*)m_pcBinCABAC );
     m_pcEntropyDecoder->setEntropyDecoder (m_pcSbacDecoder);
     
-    UInt uiNumSubstreams = pcSlice->getPPS()->getNumSubstreams();
+    UInt uiNumSubstreams = pcSlice->getPPS()->getTilesOrEntropyCodingSyncIdc() == 2 ? pcSlice->getNumEntryPointOffsets()+1 : pcSlice->getPPS()->getNumSubstreams();
 
     //init each couple {EntropyDecoder, Substream}
     UInt *puiSubstreamSizes = pcSlice->getSubstreamSizes();

source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -2245 +2245 @@
     }
     else if ( tilesOrEntropyCodingSyncIdc == 2 ) // wavefront
     {
-      Int numSubstreams = pps->getNumSubstreams();
+      Int numSubstreams = rpcSlice->getNumEntryPointOffsets()+1;
       rpcSlice->allocSubstreamSizes(numSubstreams);
       UInt *pSubstreamSizes       = rpcSlice->getSubstreamSizes();
       for (Int idx=0; idx<numSubstreams-1; idx++)

source/Lib/TLibEncoder/TEncGOP.cpp

@@ -1117 +1117 @@
 #if !REMOVE_TILE_MARKERS
           UInt uiAccumulatedLength = 0;
 #endif
-          for ( UInt ui = 0 ; ui < pcSlice->getPPS()->getNumSubstreams(); ui++ )
+          Int offs = 0;
+          Int nss = pcSlice->getPPS()->getNumSubstreams();
+          if (pcSlice->getPPS()->getTilesOrEntropyCodingSyncIdc() == 2)
           {
-            pcOut->addSubstream(&pcSubstreamsOut[ui]);
+            // 1st line present for WPP.
+            offs = pcSlice->getSliceCurStartCUAddr()/pcSlice->getPic()->getNumPartInCU()/pcSlice->getPic()->getFrameWidthInCU();
+            nss  = pcSlice->getNumEntryPointOffsets()+1;
+          }
+          for ( UInt ui = 0 ; ui < nss; ui++ )
+          {
+            pcOut->addSubstream(&pcSubstreamsOut[ui+offs]);
 
 #if !REMOVE_TILE_MARKERS
             // Update tile marker location information

source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -1100 +1100 @@
   }
 
   UInt numEntryPointOffsets = 0, offsetLenMinus1 = 0, maxOffset = 0;
+  Int  numZeroSubstreamsAtStartOfSlice  = 0;
   UInt *entryPointOffset = NULL;
   if (tilesOrEntropyCodingSyncIdc == 1) // tiles
   {
@@ -1124 +1125 @@
   }
   else if (tilesOrEntropyCodingSyncIdc == 2) // wavefront
   {
-    Int  numZeroSubstreamsAtEndOfSlice  = 0;
     UInt* pSubstreamSizes               = pSlice->getSubstreamSizes();
-    // Find number of zero substreams at the end of slice
-    for (Int idx=pSlice->getPPS()->getNumSubstreams()-2; idx>=0; idx--)
-    {
-      if ( pSubstreamSizes[ idx ] ==  0 )
-      {
-        numZeroSubstreamsAtEndOfSlice++; 
-      }
-      else
-      {
-        break;
-      }
-    }
-    numEntryPointOffsets       = pSlice->getPPS()->getNumSubstreams() - 1 - numZeroSubstreamsAtEndOfSlice;
+    Int maxNumParts                       = pSlice->getPic()->getNumPartInCU();
+    numZeroSubstreamsAtStartOfSlice       = pSlice->getSliceCurStartCUAddr()/maxNumParts/pSlice->getPic()->getFrameWidthInCU();
+    Int  numZeroSubstreamsAtEndOfSlice    = pSlice->getPic()->getFrameHeightInCU()-1 - ((pSlice->getSliceCurEndCUAddr()-1)/maxNumParts/pSlice->getPic()->getFrameWidthInCU());
+    numEntryPointOffsets                  = pSlice->getPPS()->getNumSubstreams() - numZeroSubstreamsAtStartOfSlice - numZeroSubstreamsAtEndOfSlice - 1;
+    pSlice->setNumEntryPointOffsets(numEntryPointOffsets);
     entryPointOffset           = new UInt[numEntryPointOffsets];
     for (Int idx=0; idx<numEntryPointOffsets; idx++)
     {
-      entryPointOffset[ idx ] = ( pSubstreamSizes[ idx ] >> 3 ) ;
+      entryPointOffset[ idx ] = ( pSubstreamSizes[ idx+numZeroSubstreamsAtStartOfSlice ] >> 3 ) ;
       if ( entryPointOffset[ idx ] > maxOffset )
       {
         maxOffset = entryPointOffset[ idx ];