Changeset 869 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibCommon/TComPicYuv.cpp

Timestamp:

14 Aug 2014, 00:00:45 (10 years ago)

Author:

seregin

Message:

Move conformance window signalling to the rep_format (JCTVC-R0156), patch was provided by Danny Hong <danny@…>

File:

• branches/SHM-dev/source/Lib/TLibCommon/TComPicYuv.cpp (modified) (3 diffs)

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

@@ -69 +69 @@
 
 #if SVC_EXTENSION
+#if R0156_CONF_WINDOW_IN_REP_FORMAT
+#if AUXILIARY_PICTURES
+Void TComPicYuv::create( Int iPicWidth, Int iPicHeight, ChromaFormat chromaFormatIDC, UInt uiMaxCUWidth, UInt uiMaxCUHeight, UInt uiMaxCUDepth, Window* conformanceWindow )
+#else
+Void TComPicYuv::create( Int iPicWidth, Int iPicHeight, UInt uiMaxCUWidth, UInt uiMaxCUHeight, UInt uiMaxCUDepth, Window* conformanceWindow )
+#endif
+#else // R0156_CONF_WINDOW_IN_REP_FORMAT
 #if AUXILIARY_PICTURES
 Void TComPicYuv::create( Int iPicWidth, Int iPicHeight, ChromaFormat chromaFormatIDC, UInt uiMaxCUWidth, UInt uiMaxCUHeight, UInt uiMaxCUDepth, TComSPS* pcSps )
@@ -74 +81 @@
 Void TComPicYuv::create( Int iPicWidth, Int iPicHeight, UInt uiMaxCUWidth, UInt uiMaxCUHeight, UInt uiMaxCUDepth, TComSPS* pcSps )
 #endif
+#endif
 #else
 Void TComPicYuv::create( Int iPicWidth, Int iPicHeight, UInt uiMaxCUWidth, UInt uiMaxCUHeight, UInt uiMaxCUDepth )
@@ -82 +90 @@
   
 #if SVC_EXTENSION
+#if R0156_CONF_WINDOW_IN_REP_FORMAT
+  if(conformanceWindow != NULL)
+  {
+    m_conformanceWindow = *conformanceWindow;
+  }
+#else
   if(pcSps != NULL)
   {
     m_conformanceWindow = pcSps->getConformanceWindow();
   }
+#endif
 #endif