Changeset 1263 in SHVCSoftware

Timestamp:

14 Jul 2015, 03:38:00 (9 years ago)

Author:

seregin

Message:

port rev 4260

Location:

branches/SHM-dev/source/Lib/TLibDecoder

Files:

• TDecCu.cpp (modified) (1 diff)
• TDecCu.h (modified) (1 diff)
• TDecEntropy.cpp (modified) (1 diff)
• TDecEntropy.h (modified) (2 diffs)
• TDecTop.cpp (modified) (1 diff)
• TDecTop.h (modified) (1 diff)

branches/SHM-dev/source/Lib/TLibDecoder/TDecCu.cpp

@@ -38 +38 @@
 #include "TDecCu.h"
 #include "TLibCommon/TComTU.h"
+#include "TLibCommon/TComPrediction.h"
 #if SVC_EXTENSION
 #include "TDecTop.h"

branches/SHM-dev/source/Lib/TLibDecoder/TDecCu.h

@@ -44 +44 @@
 
 #include "TLibCommon/TComTrQuant.h"
-#include "TLibCommon/TComPrediction.h"
 #include "TDecEntropy.h"
 

branches/SHM-dev/source/Lib/TLibDecoder/TDecEntropy.cpp

@@ -38 +38 @@
 #include "TDecEntropy.h"
 #include "TLibCommon/TComTU.h"
+#include "TLibCommon/TComPrediction.h"
 
 #if ENVIRONMENT_VARIABLE_DEBUG_AND_TEST

branches/SHM-dev/source/Lib/TLibDecoder/TDecEntropy.h

@@ -43 +43 @@
 #include "TLibCommon/TComSlice.h"
 #include "TLibCommon/TComPic.h"
-#include "TLibCommon/TComPrediction.h"
 #include "TLibCommon/TComSampleAdaptiveOffset.h"
 #include "TLibCommon/TComRectangle.h"
@@ -50 +49 @@
 class TDecCavlc;
 class ParameterSetManagerDecoder;
+class TComPrediction;
 #if CGS_3D_ASYMLUT
 class TCom3DAsymLUT;

branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp

@@ -2207 +2207 @@
     g_uiAddCUDepth  = max (0, sps->getLog2MinCodingBlockSize() - (Int)sps->getQuadtreeTULog2MinSize() );
 
-    Int  numReorderPics[MAX_TLAYER];
-
-    for( Int temporalLayer=0; temporalLayer < MAX_TLAYER; temporalLayer++ ) 
-    {
-      if( m_commonDecoderParams->getTargetOutputLayerSetIdx() == 0 )
-      {
-        assert( this->getLayerId() == 0 );
-        numReorderPics[temporalLayer] = sps->getNumReorderPics(temporalLayer);
-      }
-      else
-      {        
-        // SHM decoders will use DPB size table in the VPS to determine the number of reorder pictures.
-        numReorderPics[temporalLayer] = vps->getMaxVpsNumReorderPics( getCommonDecoderParams()->getTargetOutputLayerSetIdx() , temporalLayer);
-      }
-    }
-
     if (m_cIlpPic[0] == NULL)
     {

branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.h

@@ -44 +44 @@
 #include "TLibCommon/TComPic.h"
 #include "TLibCommon/TComTrQuant.h"
+#include "TLibCommon/TComPrediction.h"
 #include "TLibCommon/SEI.h"
 #if CGS_3D_ASYMLUT