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

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/TLibDecoder

Files:

• TDecCAVLC.cpp (modified) (1 diff)
• TDecCu.cpp (modified) (1 diff)
• TDecSbac.cpp (modified) (2 diffs)
• TDecTop.cpp (modified) (2 diffs)

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 );