Changeset 1274 in 3DVCSoftware for branches/HTM-14.1-update-dev2/source/Lib/TLibDecoder/TDecCAVLC.cpp
- Timestamp:
- 14 Jul 2015, 12:31:09 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-14.1-update-dev2/source/Lib/TLibDecoder/TDecCAVLC.cpp
r1225 r1274 1840 1840 else 1841 1841 { 1842 vpsVui->setVpsNumVideoSignalInfoMinus1( pcVPS->getMaxLayersMinus1() - pcVPS->getVpsBaseLayerInternalFlag() ? 0 : 1 );1842 vpsVui->setVpsNumVideoSignalInfoMinus1( (pcVPS->getMaxLayersMinus1() - pcVPS->getVpsBaseLayerInternalFlag()) ? 0 : 1 ); 1843 1843 } 1844 1844 … … 2805 2805 { 2806 2806 READ_UVLC( uiCode, "five_minus_max_num_merge_cand"); 2807 #if H_3D_IV_MERGE2807 #if NH_3D_IV_MERGE 2808 2808 pcSlice->setMaxNumMergeCand(( ( pcSlice->getMpiFlag() || pcSlice->getIvMvPredFlag() || pcSlice->getViewSynthesisPredFlag() ) ? MRG_MAX_NUM_CANDS_MEM : MRG_MAX_NUM_CANDS) - uiCode); 2809 2809 #else … … 3376 3376 } 3377 3377 3378 #if H_3D_ARP3378 #if NH_3D_ARP 3379 3379 Void TDecCavlc::parseARPW( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth ) 3380 3380 { … … 3400 3400 3401 3401 #endif 3402 #if H_3D_DBBP3402 #if NH_3D_DBBP 3403 3403 Void TDecCavlc::parseDBBPFlag( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth ) 3404 3404 {
Note: See TracChangeset for help on using the changeset viewer.