Changeset 669 in 3DVCSoftware for branches/HTM-8.2-dev2-Qualcomm/source/Lib/TLibEncoder/TEncCavlc.cpp

Timestamp:

4 Nov 2013, 17:39:44 (11 years ago)

Author:

zhang

Message:

JCT3V-F0125

File:

• branches/HTM-8.2-dev2-Qualcomm/source/Lib/TLibEncoder/TEncCavlc.cpp (modified) (2 diffs)

branches/HTM-8.2-dev2-Qualcomm/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -1019 +1019 @@
       else
       {
+#if QC_DEPTH_IV_MRG_F0125
+        if(i!=1)
+        {
+          WRITE_FLAG( pcVPS->getIvMvPredFlag         ( i ) ? 1 : 0 , "iv_mv_pred_flag[i]");
+        }
+#endif
         WRITE_FLAG( pcVPS->getVpsDepthModesFlag( i ) ? 1 : 0 ,          "vps_depth_modes_flag[i]" );
         //WRITE_FLAG( pcVPS->getLimQtPredFlag    ( i ) ? 1 : 0 ,          "lim_qt_pred_flag[i]"     ); 
@@ -1452 +1458 @@
     WRITE_UVLC(0,"slice_header_extension_length"); //<- this element needs to be set to the correct value!!
 
+#if QC_DEPTH_IV_MRG_F0125
+    if( pcSlice->getSPS()->hasCamParInSliceHeader() && !pcSlice->getIsDepth() )
+#else
     if( pcSlice->getSPS()->hasCamParInSliceHeader() )
+#endif
     {
       for( UInt uiId = 0; uiId < pcSlice->getViewIndex(); uiId++ )