Ticket #800: wpp1-removeredundanttests.patch

source/Lib/TLibDecoder/TDecSlice.cpp

@@ -371 +371 @@
 #if ENC_DEC_TRACE
     g_bJustDoIt = g_bEncDecTraceDisable;
 #endif
-    /*If at the end of a LCU line but not at the end of a substream, perform CABAC flush*/
-    if (!uiIsLast && pcSlice->getPPS()->getNumSubstreams() > 1)
-    {
-      if ((uiCol == uiTileLCUX+uiTileWidth-1) && (uiLin+iNumSubstreamsPerTile < uiTileLCUY+uiTileHeight))
-      {
-        m_pcEntropyDecoder->decodeFlush();
-      }
-    }
     pcSbacDecoders[uiSubStrm].load(pcSbacDecoder);
 
     //Store probabilities of second LCU in line into buffer

source/Lib/TLibEncoder/TEncCu.cpp

@@ -263 +263 @@
 
   // Encode CU data
   xEncodeCU( pcCU, 0, 0 );
-  
-  bool bTerminateSlice = bForceTerminate;
-  UInt uiCUAddr = pcCU->getAddr();
-    /* If at the end of an LCU line but not at the end of a substream, perform CABAC flush */
-    if (!bTerminateSlice && pcCU->getSlice()->getPPS()->getNumSubstreams() > 1)
-    {
-      Int iNumSubstreams = pcCU->getSlice()->getPPS()->getNumSubstreams();
-      UInt uiWidthInLCUs = pcCU->getPic()->getPicSym()->getFrameWidthInCU();
-      UInt uiCol     = uiCUAddr % uiWidthInLCUs;
-      UInt uiLin     = uiCUAddr / uiWidthInLCUs;
-      UInt uiTileStartLCU = pcCU->getPic()->getPicSym()->getTComTile(pcCU->getPic()->getPicSym()->getTileIdxMap(uiCUAddr))->getFirstCUAddr();
-      UInt uiTileLCUX = uiTileStartLCU % uiWidthInLCUs;
-      UInt uiTileLCUY = uiTileStartLCU / uiWidthInLCUs;
-      UInt uiTileWidth = pcCU->getPic()->getPicSym()->getTComTile(pcCU->getPic()->getPicSym()->getTileIdxMap(uiCUAddr))->getTileWidth();
-      UInt uiTileHeight = pcCU->getPic()->getPicSym()->getTComTile(pcCU->getPic()->getPicSym()->getTileIdxMap(uiCUAddr))->getTileHeight();
-      Int iNumSubstreamsPerTile = iNumSubstreams;
-      if (pcCU->getSlice()->getPPS()->getNumSubstreams() > 1)
-      {
-        iNumSubstreamsPerTile /= pcCU->getPic()->getPicSym()->getNumTiles();
-      }
-      if ((uiCol == uiTileLCUX+uiTileWidth-1) && (uiLin+iNumSubstreamsPerTile < uiTileLCUY+uiTileHeight))
-      {
-        m_pcEntropyCoder->encodeFlush();
-      }
-    }
 }
 
 // ====================================================================================================================