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

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

Files:

• TLibCommon/TComDataCU.cpp (modified) (1 diff)
• TLibCommon/TComSlice.cpp (modified) (1 diff)
• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibDecoder/TDecCAVLC.cpp (modified) (1 diff)
• TLibDecoder/TDecCu.cpp (modified) (1 diff)
• TLibDecoder/TDecSbac.cpp (modified) (2 diffs)
• TLibDecoder/TDecTop.cpp (modified) (2 diffs)
• TLibEncoder/TEncCavlc.cpp (modified) (1 diff)
• TLibEncoder/TEncCu.cpp (modified) (2 diffs)
• TLibEncoder/TEncSbac.cpp (modified) (2 diffs)
• TLibEncoder/TEncSearch.cpp (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

branches/HTM-12.0-dev1/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -2637 +2637 @@
 
 #if H_3D
+#if LGE_FCO_I0116
+  if( rpcSlice->getVPS()->hasCamParInSliceHeader( rpcSlice->getViewIndex() )  && rpcSlice->getIsDepth() )
+#else
   if( rpcSlice->getVPS()->hasCamParInSliceHeader( rpcSlice->getViewIndex() )  && !rpcSlice->getIsDepth() )
+#endif
   {
     UInt uiViewIndex = rpcSlice->getViewIndex();

branches/HTM-12.0-dev1/source/Lib/TLibDecoder/TDecCu.cpp

@@ -859 +859 @@
   // get collocated depth block
   UInt uiDepthStride = 0;
+#if LGE_FCO_I0116
+  Pel* pDepthPels = pcCU->getVirtualDepthBlock(pcCU->getZorderIdxInCU(), pcCU->getWidth(0), pcCU->getHeight(0), uiDepthStride);
+#else
   Pel* pDepthPels = pcCU->getVirtualDepthBlock(0, pcCU->getWidth(0), pcCU->getHeight(0), uiDepthStride);
+#endif
   AOF( pDepthPels != NULL );
   AOF( uiDepthStride != 0 );

branches/HTM-12.0-dev1/source/Lib/TLibDecoder/TDecSbac.cpp

@@ -794 +794 @@
 
 #if MTK_I0099_VPS_EX2
+#if LGE_FCO_I0116
+  if(bDepthMapDetect && !bIntraSliceDetect && !rapPic && bLimQtPredFlag && pcTexture->getReconMark())
+#else
   if(bDepthMapDetect && !bIntraSliceDetect && !rapPic && bLimQtPredFlag)
+#endif
 #else
   if(bDepthMapDetect && !bIntraSliceDetect && !rapPic && sps->getUseQTL() && sps->getUsePC())
@@ -854 +858 @@
   UInt uiTexturePart = uiMode;
 #if MTK_I0099_VPS_EX2
+#if LGE_FCO_I0116
+  if(bDepthMapDetect && !bIntraSliceDetect && !rapPic && bLimQtPredFlag && pcTexture->getReconMark())
+#else
   if(bDepthMapDetect && !bIntraSliceDetect && !rapPic && bLimQtPredFlag )
+#endif
 #else
   if(bDepthMapDetect && !bIntraSliceDetect && !rapPic && sps->getUseQTL() && sps->getUsePC())

branches/HTM-12.0-dev1/source/Lib/TLibDecoder/TDecTop.cpp

@@ -229 +229 @@
   }
 
+#if !LGE_FCO_I0116
   if ( pcSlice->getIsDepth())
   {
     return;
   }
+#endif
 
   Int curPoc = pcSlice->getPOC();
@@ -1201 +1203 @@
 
 #if H_3D_IV_MERGE
+#if LGE_FCO_I0116
+  if( !pcSlice->getIsDepth() && m_pcCamParsCollector )
+#else
   if( pcSlice->getIsDepth() && m_pcCamParsCollector )
+#endif
   {
     m_pcCamParsCollector->copyCamParamForSlice( pcSlice );

branches/HTM-12.0-dev1/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -2126 +2126 @@
   }
 #if H_3D
+#if LGE_FCO_I0116
+  if( pcSlice->getVPS()->hasCamParInSliceHeader( pcSlice->getViewIndex() ) && pcSlice->getIsDepth() )
+#else
   if( pcSlice->getVPS()->hasCamParInSliceHeader( pcSlice->getViewIndex() ) && !pcSlice->getIsDepth() )
+#endif
   {
     for( UInt uiId = 0; uiId < pcSlice->getViewIndex(); uiId++ )

branches/HTM-12.0-dev1/source/Lib/TLibEncoder/TEncCu.cpp

@@ -538 +538 @@
 #if MTK_I0099_VPS_EX2
 #if MTK_I0099_FIX
+#if LGE_FCO_I0116
+      if(depthMapDetect && !bIntraSliceDetect && !rapPic && ( m_pcEncCfg->getUseQTL() || bLimQtPredFalg ) && pcTexture->getReconMark())
+#else
       if(depthMapDetect && !bIntraSliceDetect && !rapPic && ( m_pcEncCfg->getUseQTL() || bLimQtPredFalg ))
+#endif
 #else
       if(depthMapDetect && !bIntraSliceDetect && !rapPic && bLimQtPredFalg)
@@ -2588 +2592 @@
   // fetch virtual depth block
   UInt uiDepthStride = 0;
+#if LGE_FCO_I0116
+  Pel* pDepthPels = rpcTempCU->getVirtualDepthBlock(rpcTempCU->getZorderIdxInCU(), uiWidth, uiHeight, uiDepthStride);
+#else
   Pel* pDepthPels = rpcTempCU->getVirtualDepthBlock(0, uiWidth, uiHeight, uiDepthStride);
+#endif
   AOF( pDepthPels != NULL );
   AOF( uiDepthStride != 0 );

branches/HTM-12.0-dev1/source/Lib/TLibEncoder/TEncSbac.cpp

@@ -732 +732 @@
   UInt uiTexturePart = eSize;
 #if MTK_I0099_VPS_EX2
+#if LGE_FCO_I0116
+  if(bDepthMapDetect && !bIntraSliceDetect && !rapPic && pcCU->getPic()->getReduceBitsFlag() && bLimQtPredFlag && pcTexture->getReconMark())
+#else
   if(bDepthMapDetect && !bIntraSliceDetect && !rapPic && pcCU->getPic()->getReduceBitsFlag() && bLimQtPredFlag )
+#endif
 #else
   if(bDepthMapDetect && !bIntraSliceDetect && !rapPic && pcCU->getPic()->getReduceBitsFlag() && sps->getUseQTL() && sps->getUsePC() )
@@ -1106 +1110 @@
 
 #if MTK_I0099_VPS_EX2
+#if LGE_FCO_I0116
+  if(bDepthMapDetect && !bIntraSliceDetect && !rapPic && pcCU->getPic()->getReduceBitsFlag() && bLimQtPredFlag && pcTexture->getReconMark() )
+#else
   if(bDepthMapDetect && !bIntraSliceDetect && !rapPic && pcCU->getPic()->getReduceBitsFlag() && bLimQtPredFlag  )
+#endif
 #else
   if(bDepthMapDetect && !bIntraSliceDetect && !rapPic && pcCU->getPic()->getReduceBitsFlag() && sps->getUseQTL() && sps->getUsePC())

branches/HTM-12.0-dev1/source/Lib/TLibEncoder/TEncSearch.cpp

@@ -3212 +3212 @@
 #if H_3D_FCO
             TComPic* picTexture  = pcCU->getSlice()->getIvPic(false, pcCU->getSlice()->getViewIndex() );
+#if LGE_FCO_I0116
+            if ( !picTexture->getReconMark() && (DMM4_IDX == dmmType ) )
+#else
             if ( !picTexture->getReconMark() && (DMM3_IDX == dmmType || DMM4_IDX == dmmType ) )
+#endif
             {
                 continue;