Changeset 633 in SHVCSoftware for branches/SHM-5.1-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp
- Timestamp:
- 17 Mar 2014, 19:12:54 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified branches/SHM-5.1-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp ¶
r632 r633 853 853 Window& scaledWindow = pcSPS->getScaledRefLayerWindow(i); 854 854 #if O0098_SCALED_REF_LAYER_ID 855 READ_CODE( 6, uiCode, "scaled_ref_layer_ left_id" );pcSPS->setScaledRefLayerId( i, uiCode );855 READ_CODE( 6, uiCode, "scaled_ref_layer_id" ); pcSPS->setScaledRefLayerId( i, uiCode ); 856 856 #endif 857 857 READ_SVLC( iCode, "scaled_ref_layer_left_offset" ); scaledWindow.setWindowLeftOffset (iCode << 1); … … 860 860 READ_SVLC( iCode, "scaled_ref_layer_bottom_offset" ); scaledWindow.setWindowBottomOffset(iCode << 1); 861 861 #if P0312_VERT_PHASE_ADJ 862 READ_FLAG( uiCode, "vert_phase_pos _enable_flag" );scaledWindow.setVertPhasePositionEnableFlag (uiCode); pcSPS->setVertPhasePositionEnableFlag(i,uiCode);862 READ_FLAG( uiCode, "vert_phase_position_enable_flag" ); scaledWindow.setVertPhasePositionEnableFlag(uiCode); pcSPS->setVertPhasePositionEnableFlag( pcSPS->getScaledRefLayerId(i), uiCode); 863 863 #endif 864 864 } … … 1943 1943 #endif 1944 1944 1945 #if P0312_VERT_PHASE_ADJ1946 READ_FLAG( uiCode, "vps_vui_vert_phase_in_use_flag" ); vps->setVpsVuiVertPhaseInUseFlag(uiCode);1947 #endif1948 1949 1945 #if O0109_O0199_FLAGS_TO_VUI 1950 1946 #if M0040_ADAPTIVE_RESOLUTION_CHANGE … … 1955 1951 #endif 1956 1952 #endif 1957 1953 #if P0312_VERT_PHASE_ADJ 1954 READ_FLAG( uiCode, "vps_vui_vert_phase_in_use_flag" ); vps->setVpsVuiVertPhaseInUseFlag(uiCode); 1955 #endif 1958 1956 #if N0160_VUI_EXT_ILP_REF 1959 1957 READ_FLAG( uiCode, "ilp_restricted_ref_layers_flag" ); vps->setIlpRestrictedRefLayersFlag( uiCode == 1 ); … … 2539 2537 for(Int i = 0; i < rpcSlice->getActiveNumILRRefIdx(); i++ ) 2540 2538 { 2541 if (rpcSlice->getSPS()->getVertPhasePositionEnableFlag(rpcSlice->getInterLayerPredLayerIdc(i))) 2542 { 2543 READ_FLAG( uiCode, "phase_pos_flag" ); rpcSlice->setVertPhasePositionFlag( uiCode? true: false, i); 2539 UInt refLayerIdc = rpcSlice->getInterLayerPredLayerIdc(i); 2540 if( rpcSlice->getSPS()->getVertPhasePositionEnableFlag(refLayerIdc) ) 2541 { 2542 READ_FLAG( uiCode, "vert_phase_position_flag" ); rpcSlice->setVertPhasePositionFlag( uiCode? true : false, refLayerIdc ); 2544 2543 } 2545 2544 }
Note: See TracChangeset for help on using the changeset viewer.