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

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/App/TAppEncoder

Files:

• TAppEncCfg.cpp (modified) (2 diffs)
• TAppEncCfg.h (modified) (1 diff)
• TAppEncTop.cpp (modified) (2 diffs)

branches/HTM-8.2-dev2-Samsung/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -513 +513 @@
 #if H_3D_INTER_SDC
   ("InterSDC",                 m_bDepthInterSDCFlag,        true, "Enable depth inter SDC")
+#endif
+#if SEC_MPI_ENABLING_MERGE_F0150
+  ("MPI",                      m_bMPIFlag,        true, "Enable MPI")
 #endif
   // Coding tools
@@ -2448 +2451 @@
   printf( "interSDC: %d ", m_bDepthInterSDCFlag ? 1 : 0 );
 #endif
+#if SEC_MPI_ENABLING_MERGE_F0150
+  printf( "MPI: %d ", m_bMPIFlag ? 1 : 0 );
+#endif
   printf("\n\n");  
 

branches/HTM-8.2-dev2-Samsung/source/App/TAppEncoder/TAppEncCfg.h

@@ -476 +476 @@
   Bool m_bDepthInterSDCFlag;                                ///< flag for inter SDC of depth map coding
 #endif
+#if SEC_MPI_ENABLING_MERGE_F0150
+  Bool m_bMPIFlag;                                           ///< flag for MPI of depth map coding
+#endif
 #endif
   // internal member functions

branches/HTM-8.2-dev2-Samsung/source/App/TAppEncoder/TAppEncTop.cpp

@@ -200 +200 @@
 #if H_3D_INTER_SDC
     m_cTEncTop.setInterSDCEnable               ( isDepth ? m_bDepthInterSDCFlag    : false );
+#endif
+#if SEC_MPI_ENABLING_MERGE_F0150
+    m_cTEncTop.setUseMPI               ( isDepth ? m_bMPIFlag    : false );
 #endif
 #endif // H_3D
@@ -1681 +1684 @@
     vps.setInterSDCFlag( layer, !isLayerZero && isDepth && m_bDepthInterSDCFlag );
 #endif
+#if SEC_MPI_ENABLING_MERGE_F0150
+    vps.setMPIFlag( layer, !isLayerZero && isDepth && m_bMPIFlag );
+#endif
   }  
 #if H_3D