Changeset 135 in SHVCSoftware for branches

Timestamp:

2 May 2013, 03:16:26 (12 years ago)

Author:

seregin

Message:

bring back setSpatialEnhLayerFlag

File:

• branches/SHM-2.0-dev/source/Lib/TLibEncoder/TEncTop.cpp (modified) (4 diffs)

branches/SHM-2.0-dev/source/Lib/TLibEncoder/TEncTop.cpp

@@ -501 +501 @@
       TEncPic* pcEPic = new TEncPic;
 
+#if SVC_EXTENSION //Temporal solution, should be modified
+      if(m_layerId > 0)
+      {
+#if VPS_EXTN_DIRECT_REF_LAYERS_CONTINUE
+        TEncTop *pcEncTopBase = (TEncTop *)getRefLayerEnc( m_layerId );
+#else
+        TEncTop *pcEncTopBase = (TEncTop *)getLayerEnc( m_layerId-1 );
+#endif
+        if(m_iSourceWidth != pcEncTopBase->getSourceWidth() || m_iSourceHeight != pcEncTopBase->getSourceHeight() )
+        {
+          pcEPic->setSpatialEnhLayerFlag( true );
+        }
+      }
+
 #if SVC_UPSAMPLING
       pcEPic->create( m_iSourceWidth, m_iSourceHeight, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, m_cPPS.getMaxCuDQPDepth()+1 ,
@@ -508 +522 @@
                       m_conformanceWindow, m_defaultDisplayWindow, m_numReorderPics);
 #endif
+#endif
       rpcPic = pcEPic;
     }
@@ -513 +528 @@
     {
       rpcPic = new TComPic;
-
-
-#if SVC_UPSAMPLING
-      rpcPic->create( m_iSourceWidth, m_iSourceHeight, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, 
-                      m_conformanceWindow, m_defaultDisplayWindow, m_numReorderPics, &m_cSPS);
-#else
-      rpcPic->create( m_iSourceWidth, m_iSourceHeight, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, 
-                      m_conformanceWindow, m_defaultDisplayWindow, m_numReorderPics);
-#endif
-    }
 
 #if SVC_EXTENSION //Temporal solution, should be modified
@@ -537 +542 @@
         }
       }
-#endif
+
+#if SVC_UPSAMPLING
+      rpcPic->create( m_iSourceWidth, m_iSourceHeight, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, 
+                      m_conformanceWindow, m_defaultDisplayWindow, m_numReorderPics, &m_cSPS);
+#else
+      rpcPic->create( m_iSourceWidth, m_iSourceHeight, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, 
+                      m_conformanceWindow, m_defaultDisplayWindow, m_numReorderPics);
+#endif
+#endif
+    }
 
     if (getUseSAO())