Changeset 1048 in 3DVCSoftware for branches/HTM-12.0-dev1/source/Lib/TLibCommon

Timestamp:

18 Aug 2014, 09:35:34 (11 years ago)

Author:

lg

Message:

Integration of JCT3V-I0116

Location:

branches/HTM-12.0-dev1/source/Lib/TLibCommon

Files:

• TComDataCU.cpp (modified) (1 diff)
• TComSlice.cpp (modified) (1 diff)
• TypeDef.h (modified) (1 diff)

branches/HTM-12.0-dev1/source/Lib/TLibCommon/TComDataCU.cpp

@@ -4177 +4177 @@
     TComPic * pcTexPic = m_pcSlice->getTexturePic();
 #if H_3D_FCO
+#if LGE_FCO_I0116
+    if (pcTexPic && pcTexPic->getReconMark())
+#else
     if (pcTexturePic->getReconMark())
+#endif
     {
 #endif    

branches/HTM-12.0-dev1/source/Lib/TLibCommon/TComSlice.cpp

@@ -3727 +3727 @@
 
 #if H_3D_DDD
+#if LGE_FCO_I0116
+  if( getIsDepth() && getViewIndex() > 0 && getVPS()->getMPIFlag(layerIdInVPS))
+#else
   if( getIsDepth() && getViewIndex() > 0 )
+#endif
   {
       TComSlice *pcTextSlice = getTexturePic()->getSlice( 0 );

branches/HTM-12.0-dev1/source/Lib/TLibCommon/TypeDef.h

@@ -251 +251 @@
 
 #define H_3D_FCO                          0   // Flexible coding order for 3D
+#if H_3D_FCO
+#define LGE_FCO_I0116                     1
+#endif
 
 #define SCU_HS_FAST_INTRA_SDC_I0123       1