Changeset 1025 in 3DVCSoftware for branches/HTM-11.2-dev2-Samsung/source/Lib/TLibEncoder/TEncCavlc.cpp

Timestamp:

29 Jul 2014, 04:18:55 (10 years ago)

Author:

samsung-htm

Message:

Integration of JCT3V-I0100: vps_extension2 and slice_segment_header clean-up

File:

• branches/HTM-11.2-dev2-Samsung/source/Lib/TLibEncoder/TEncCavlc.cpp (modified) (3 diffs)

branches/HTM-11.2-dev2-Samsung/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -1572 +1572 @@
 #if MTK_I0099_VPS_EX2
       WRITE_FLAG( pcVPS->getIvMvPredFlag         ( i ) ? 1 : 0 , "iv_mv_pred_flag[i]");
+#if SEC_HLS_CLEANUP_I0100
+      WRITE_FLAG( pcVPS->getIvMvScalingFlag( i ) ? 1 : 0 ,       "iv_mv_scaling_flag[i]" );
+#endif
+
 #endif
       if ( !( pcVPS->getDepthId( i ) == 1 ) )
@@ -1653 +1657 @@
 #endif
 #if H_3D_TMVP
+#if !SEC_HLS_CLEANUP_I0100
   WRITE_FLAG( pcVPS->getIvMvScalingFlag( ) ? 1 : 0 ,          "iv_mv_scaling_flag" );
+#endif
 #endif
 }
@@ -2039 +2045 @@
     }
 #if H_3D_IC
-    else if( pcSlice->getViewIndex() && ( pcSlice->getSliceType() == P_SLICE || pcSlice->getSliceType() == B_SLICE ) && !pcSlice->getIsDepth())
+#if SEC_HLS_CLEANUP_I0100
+    else if( pcSlice->getViewIndex() && ( pcSlice->getSliceType() == P_SLICE || pcSlice->getSliceType() == B_SLICE ) && !pcSlice->getIsDepth() && vps->getNumDirectRefLayers( layerId ) > 0 )
+#else
+    else if( pcSlice->getViewIndex() && ( pcSlice->getSliceType() == P_SLICE || pcSlice->getSliceType() == B_SLICE ) && !pcSlice->getIsDepth() )
+#endif
     {
       WRITE_FLAG( pcSlice->getApplyIC() ? 1 : 0, "slice_ic_enable_flag" );