Changeset 696 in 3DVCSoftware for branches/HTM-8.2-dev2-Samsung/source/Lib/TLibCommon

Timestamp:

15 Nov 2013, 01:35:16 (11 years ago)

Author:

samsung-htm

Message:

Integration of F0150: MPI candidate in depth merge mode list construction

Location:

branches/HTM-8.2-dev2-Samsung/source/Lib/TLibCommon

Files:

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

branches/HTM-8.2-dev2-Samsung/source/Lib/TLibCommon/TComDataCU.cpp

@@ -3522 +3522 @@
   deriveLeftRightTopIdxGeneral( uiAbsPartIdx, uiPUIdx, uiPartIdxLT, uiPartIdxRT );
   deriveLeftBottomIdxGeneral  ( uiAbsPartIdx, uiPUIdx, uiPartIdxLB );
+#if SEC_MPI_ENABLING_MERGE_F0150
+  Bool bMPIFlag   = getSlice()->getVPS()->getMPIFlag( getSlice()->getLayerIdInVps() );
+#endif
 #if QC_DEPTH_IV_MRG_F0125
   Bool bIsDepth = getSlice()->getIsDepth();
@@ -3542 +3545 @@
   /////////////////////////////////////////////
 
+#if SEC_MPI_ENABLING_MERGE_F0150
+  if( bMPIFlag)
+#else
   if( m_pcSlice->getIsDepth())
+#endif
   {
     UInt uiPartIdxCenter;

branches/HTM-8.2-dev2-Samsung/source/Lib/TLibCommon/TComSlice.cpp

@@ -1835 +1835 @@
 #if H_3D_INTER_SDC
     m_bInterSDCFlag        [ i ] = false;
+#endif
+#if SEC_MPI_ENABLING_MERGE_F0150
+    m_bMPIFlag             [ i ] = false;
 #endif
   }  

branches/HTM-8.2-dev2-Samsung/source/Lib/TLibCommon/TComSlice.h

@@ -619 +619 @@
   Bool        m_bInterSDCFlag[MAX_NUM_LAYERS   ];
 #endif
+#if SEC_MPI_ENABLING_MERGE_F0150
+  Bool        m_bMPIFlag[MAX_NUM_LAYERS   ];
+#endif
 
 #endif
@@ -854 +857 @@
   Void    setInterSDCFlag      ( Int layerIdInVps, Bool bval ){ m_bInterSDCFlag[layerIdInVps] = bval; }
 #endif
-
+#if SEC_MPI_ENABLING_MERGE_F0150
+  Bool    getMPIFlag      ( Int layerIdInVps )           { return m_bMPIFlag[layerIdInVps]; }
+  Void    setMPIFlag      ( Int layerIdInVps, Bool bval ){ m_bMPIFlag[layerIdInVps] = bval; }
+#endif
 #endif  
 #endif

branches/HTM-8.2-dev2-Samsung/source/Lib/TLibCommon/TypeDef.h

@@ -131 +131 @@
                                               // QC_AMVP_MRG_UNIFY_IVCAN_C0051     
                                               // TEXTURE MERGING CANDIDATE     , JCT3V-C0137
-                                              // QC_INRIA_MTK_MRG_E0126            
+                                              // QC_INRIA_MTK_MRG_E0126 
+#define SEC_MPI_ENABLING_MERGE_F0150      1   // MPI flag in VPS and enabling in Merge mode
+
 #define H_3D_TMVP                         1   // QC_TMVP_C0047 
                                               // Sony_M23639