Changeset 1025 in 3DVCSoftware for branches/HTM-11.2-dev2-Samsung/source/Lib/TLibDecoder/TDecCAVLC.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/TLibDecoder/TDecCAVLC.cpp (modified) (3 diffs)

branches/HTM-11.2-dev2-Samsung/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -1777 +1777 @@
 #if MTK_I0099_VPS_EX2
       READ_FLAG( uiCode, "iv_mv_pred_flag[i]");          pcVPS->setIvMvPredFlag         ( i, uiCode == 1 ? true : false );
+#if SEC_HLS_CLEANUP_I0100
+      READ_FLAG( uiCode, "iv_mv_scaling_flag[i]");       pcVPS->setIvMvScalingFlag         ( i, uiCode == 1 ? true : false );
+#endif
 #endif
       if( !( pcVPS->getDepthId( i ) == 1 ) )
@@ -1884 +1887 @@
   READ_UVLC (uiCode, "log2_sub_PU_MPI_size_minus3");              pcVPS->setSubPUMPILog2Size( uiCode + 3 ); 
 #endif
+#if !SEC_HLS_CLEANUP_I0100
   READ_FLAG( uiCode, "iv_mv_scaling_flag");                       pcVPS->setIvMvScalingFlag( uiCode == 1 ? true : false ); 
+#endif
 }
 #endif
@@ -2485 +2490 @@
     }
 #if H_3D_IC
+#if SEC_HLS_CLEANUP_I0100
+    else if( rpcSlice->getViewIndex() && ( rpcSlice->getSliceType() == P_SLICE || rpcSlice->getSliceType() == B_SLICE ) && !rpcSlice->getIsDepth() && vps->getNumDirectRefLayers( layerId ) > 0 )
+#else
     else if( rpcSlice->getViewIndex() && ( rpcSlice->getSliceType() == P_SLICE || rpcSlice->getSliceType() == B_SLICE ) && !rpcSlice->getIsDepth())
+#endif
     {
       UInt uiCodeTmp = 0;