Changeset 1118 in 3DVCSoftware for branches/HTM-12.2-dev0/source/Lib/TLibEncoder/TEncCavlc.cpp
- Timestamp:
- 8 Nov 2014, 21:07:36 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-12.2-dev0/source/Lib/TLibEncoder/TEncCavlc.cpp
r1110 r1118 1679 1679 WRITE_FLAG( pcVPS->getInterSDCFlag( i ) ? 1 : 0, "depth_inter_SDC_flag" ); 1680 1680 #endif 1681 #if MTK_SINGLE_DEPTH_VPS_FLAG_J0060 1682 WRITE_FLAG( pcVPS->getSingleDepthModeFlag( i ) ? 1 : 0, "single_depth_mode_flag" ); 1683 #endif 1681 1684 } 1682 1685 } … … 2135 2138 } 2136 2139 #endif 2140 #if !MTK_SINGLE_DEPTH_VPS_FLAG_J0060 2137 2141 #if H_3D_SINGLE_DEPTH 2138 2142 if(pcSlice->getIsDepth()) … … 2140 2144 WRITE_FLAG( pcSlice->getApplySingleDepthMode() ? 1 : 0, "slice_enable_single_depth_mode" ); 2141 2145 } 2146 #endif 2142 2147 #endif 2143 2148 #if H_3D_IV_MERGE … … 2161 2166 { 2162 2167 Bool ivMvPredFlag = pcSlice->getVPS()->getIvMvPredFlag( pcSlice->getLayerIdInVps() ) ; 2168 #if MTK_MRG_LIST_SIZE_CLEANUP_J0059 2169 Bool vspFlag = pcSlice->getVPS()->getViewSynthesisPredFlag( pcSlice->getLayerIdInVps() ) ; 2170 WRITE_UVLC( ( ivMvPredFlag || vspFlag ? MRG_MAX_NUM_CANDS_MEM : MRG_MAX_NUM_CANDS ) - pcSlice->getMaxNumMergeCand(), "five_minus_max_num_merge_cand"); 2171 #else 2163 2172 WRITE_UVLC( ( ivMvPredFlag ? MRG_MAX_NUM_CANDS_MEM : MRG_MAX_NUM_CANDS ) - pcSlice->getMaxNumMergeCand(), "five_minus_max_num_merge_cand"); 2164 } 2165 #endif 2173 #endif 2174 } 2166 2175 #else 2167 2176 WRITE_UVLC(MRG_MAX_NUM_CANDS - pcSlice->getMaxNumMergeCand(), "five_minus_max_num_merge_cand");
Note: See TracChangeset for help on using the changeset viewer.