Changeset 1602 in SHVCSoftware for branches

Timestamp:

12 Dec 2017, 03:02:27 (7 years ago)

Author:

seregin

Message:

keep original depth for ILRP for the motion compensation

File:

• branches/SHM-dev/source/Lib/TLibCommon/TComPic.cpp (modified) (2 diffs)

branches/SHM-dev/source/Lib/TLibCommon/TComPic.cpp

@@ -87 +87 @@
 
   const ChromaFormat chromaFormatIDC = sps.getChromaFormatIdc();
-  const Int          iWidth          = sps.getPicWidthInLumaSamples();
-  const Int          iHeight         = sps.getPicHeightInLumaSamples();
-  const UInt         uiMaxCuWidth    = sps.getMaxCUWidth();
-  const UInt         uiMaxCuHeight   = sps.getMaxCUHeight();
-#if SVC_EXTENSION
-  UInt maxDepth = 0;
+  const Int          iWidth = sps.getPicWidthInLumaSamples();
+  const Int          iHeight = sps.getPicHeightInLumaSamples();
+  const UInt         uiMaxCuWidth = sps.getMaxCUWidth();
+  const UInt         uiMaxCuHeight = sps.getMaxCUHeight();
+  const UInt         uiMaxDepth = sps.getMaxTotalCUDepth();
+  const Window& conformanceWindow = sps.getConformanceWindow();
+
+  // original uiMaxDepth must be used for motion compensation for inter-layer prediction, since EL partition address is used to derive reference PU location.
+  m_maxILRPdepth = uiMaxDepth;
+
   if( isILRP )
   {
-    while( ( uiMaxCuWidth >> maxDepth ) > 16 )
-    {
-      maxDepth++;
-    }
-  }
-
-  const UInt         uiMaxDepth      = ( ( uiMaxCuWidth >> sps.getMaxTotalCUDepth() ) > 16 && isILRP ) ? maxDepth : sps.getMaxTotalCUDepth();
-
-  if( isILRP )
-  {
-    m_maxILRPdepth = uiMaxDepth;
+    UInt maxDepth = 0;
+    if( isILRP )
+    {
+      while( ( uiMaxCuWidth >> maxDepth ) > 16 )
+      {
+        maxDepth++;
+      }
+    }
+
+    m_maxILRPdepth = ( ( uiMaxCuWidth >> sps.getMaxTotalCUDepth() ) > 16 && isILRP ) ? maxDepth : sps.getMaxTotalCUDepth();
 
     UInt* piTmp = &m_auiZscanToRaster[0];
@@ -112 +115 @@
     initRasterToPelXY( uiMaxCuWidth, uiMaxCuHeight, m_maxILRPdepth + 1, m_auiRasterToPelX, m_auiRasterToPelY );
   }
-#else
-  const UInt         uiMaxDepth      = sps.getMaxTotalCUDepth();
-#endif
-  const Window& conformanceWindow    = sps.getConformanceWindow();
 
   m_layerId = layerId;
 
 #if REDUCED_ENCODER_MEMORY
-  m_picSym.create( sps, pps, uiMaxDepth, bCreateForImmediateReconstruction, layerId );
+  m_picSym.create( sps, pps, m_maxILRPdepth, bCreateForImmediateReconstruction, layerId );
   if (bCreateEncoderSourcePicYuv)
 #else
-  m_picSym.create( sps, pps, uiMaxDepth, layerId );
+  m_picSym.create( sps, pps, m_maxILRPdepth, layerId );
 
   if (!bIsVirtual)