Changeset 1055 in 3DVCSoftware for branches/HTM-12.0-dev1/source/Lib/TLibDecoder/TDecCAVLC.cpp
- Timestamp:
- 26 Sep 2014, 19:29:56 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-12.0-dev1/source/Lib/TLibDecoder/TDecCAVLC.cpp
r1054 r1055 1438 1438 } 1439 1439 } 1440 #endif // H_MV_HLS10_GEN1440 #endif 1441 1441 1442 1442 if (pcVPS->getNumLayerSets() > 1) … … 1461 1461 if( i >= pcVPS->getNumLayerSets( ) ) 1462 1462 { 1463 #if !VPS_MISC_UPDATES 1463 1464 READ_UVLC( uiCode, "layer_set_idx_for_ols_minus1[i]" ); pcVPS->setLayerSetIdxForOlsMinus1( i, uiCode ); 1465 #else 1466 READ_CODE( pcVPS->getLayerSetIdxForOlsMinus1Len( i ), uiCode, "layer_set_idx_for_ols_minus1[i]" ); pcVPS->setLayerSetIdxForOlsMinus1( i, uiCode ); 1467 #endif 1464 1468 } 1465 1469 … … 1709 1713 } 1710 1714 1715 #if I0045_VPS_VUI_VST_PARAMS 1711 1716 if( pcVPSVUI->getVideoSignalInfoIdxPresentFlag() && pcVPSVUI->getVpsNumVideoSignalInfoMinus1() > 0 ) 1712 1717 { 1713 #if H_MV_HLS10_VPS_VUI1714 1718 for( Int i = pcVPS->getVpsBaseLayerInternalFlag() ? 0 : 1; i <= pcVPS->getMaxLayersMinus1(); i++ ) 1715 #else 1719 { 1720 READ_CODE( 4, uiCode, "vps_video_signal_info_idx" ); pcVPSVUI->setVpsVideoSignalInfoIdx( i, uiCode ); 1721 } 1722 } 1723 else if ( !pcVPSVUI->getVideoSignalInfoIdxPresentFlag() ) 1724 { 1725 for( Int i = pcVPS->getVpsBaseLayerInternalFlag() ? 0 : 1; i <= pcVPS->getMaxLayersMinus1(); i++ ) 1726 { 1727 pcVPSVUI->setVpsVideoSignalInfoIdx( i, i ); 1728 } 1729 } 1730 else 1731 { 1732 for( Int i = pcVPS->getVpsBaseLayerInternalFlag() ? 0 : 1; i <= pcVPS->getMaxLayersMinus1(); i++ ) 1733 { 1734 pcVPSVUI->setVpsVideoSignalInfoIdx( i, 0 ); 1735 } 1736 } 1737 #else 1738 if( pcVPSVUI->getVideoSignalInfoIdxPresentFlag() && pcVPSVUI->getVpsNumVideoSignalInfoMinus1() > 0 ) 1739 { 1716 1740 for( Int i = 1; i <= pcVPS->getMaxLayersMinus1(); i++ ) 1717 #endif1718 1741 { 1719 1742 READ_CODE( 4, uiCode, "vps_video_signal_info_idx" ); pcVPSVUI->setVpsVideoSignalInfoIdx( i, uiCode ); … … 1728 1751 } 1729 1752 } 1753 #endif 1730 1754 READ_FLAG( uiCode, "tiles_not_in_use_flag" ); pcVPSVUI->setTilesNotInUseFlag( uiCode == 1 ); 1731 1755 if( !pcVPSVUI->getTilesNotInUseFlag() ) … … 1802 1826 if ( pcVPSVUI->getVpsVuiBspHrdPresentFlag( ) ) 1803 1827 { 1828 #if VPS_MISC_UPDATES 1829 assert(pcVPS->getTimingInfo()->getTimingInfoPresentFlag() == 1); 1830 #endif 1804 1831 parseVpsVuiBspHrdParameters( pcVPS ); 1805 1832 } … … 2287 2314 esb++; 2288 2315 READ_FLAG( uiCode, "discardable_flag" ); rpcSlice->setDiscardableFlag( uiCode == 1 ); 2316 #if NON_REF_NAL_TYPE_DISCARDABLE 2317 if ( uiCode == 1 ) 2318 { 2319 assert(rpcSlice->getNalUnitType() != NAL_UNIT_CODED_SLICE_TRAIL_R && 2320 rpcSlice->getNalUnitType() != NAL_UNIT_CODED_SLICE_TSA_R && 2321 rpcSlice->getNalUnitType() != NAL_UNIT_CODED_SLICE_STSA_R && 2322 rpcSlice->getNalUnitType() != NAL_UNIT_CODED_SLICE_RADL_R && 2323 rpcSlice->getNalUnitType() != NAL_UNIT_CODED_SLICE_RASL_R); 2324 } 2325 #endif 2289 2326 } 2290 2327 … … 2574 2611 if (rpcSlice->getSPS()->getTMVPFlagsPresent()) 2575 2612 { 2613 #if I0044_SLICE_TMVP 2614 READ_FLAG( uiCode, "slice_temporal_mvp_enabled_flag" ); 2615 #else 2576 2616 READ_FLAG( uiCode, "slice_temporal_mvp_enable_flag" ); 2617 #endif 2577 2618 rpcSlice->setEnableTMVPFlag( uiCode == 1 ? true : false ); 2578 2619 } … … 3014 3055 #endif 3015 3056 } 3057 #if INFERENCE_POC_MSB_VAL_PRESENT 3058 else 3059 { 3060 rpcSlice->setSliceSegmentHeaderExtensionLength( 0 ); 3061 rpcSlice->setPocMsbValPresentFlag( false ); 3062 } 3063 #endif 3016 3064 3017 3065
Note: See TracChangeset for help on using the changeset viewer.