Changeset 280 in 3DVCSoftware for branches/HTM-5.1-dev0/source/Lib/TLibEncoder/TEncCavlc.cpp

Timestamp:

14 Feb 2013, 23:41:41 (12 years ago)

Author:

tech

Message:

Integration of branch dev 2.

File:

• branches/HTM-5.1-dev0/source/Lib/TLibEncoder/TEncCavlc.cpp (modified) (3 diffs)

branches/HTM-5.1-dev0/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -498 +498 @@
       }
     }
+#if INTER_VIEW_VECTOR_SCALING_C0115
+      WRITE_FLAG( pcVPS->getIVScalingFlag(),                      "inter_view_vector_scaling_flag" );
+#endif
   }
   
@@ -508 +511 @@
 #endif
 #endif
-#if HHI_MPI
+#if HHI_MPI || OL_QTLIMIT_PREDCODING_B0068 
 Void TEncCavlc::codeSPS( TComSPS* pcSPS, Bool bIsDepth )
 #else
@@ -1304 +1307 @@
   #elif HHI_MPI
   const int iExtraMergeCandidates = pcSlice->getSPS()->getUseMVI() ? 1 : 0;
+  #elif MTK_DEPTH_MERGE_TEXTURE_CANDIDATE_C0137
+  const int iExtraMergeCandidates = ( pcSlice->getIsDepth() || pcSlice->getSPS()->getMultiviewMvPredMode() ) ? 1 : 0;
   #else
   const int iExtraMergeCandidates = pcSlice->getSPS()->getMultiviewMvPredMode() ? 1 : 0;