- Timestamp:
- 23 Jan 2014, 18:05:13 (11 years ago)
- Location:
- branches/SHM-5.0-dev/source/Lib
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/SHM-5.0-dev/source/Lib/TLibCommon/TComSlice.cpp
r551 r552 2082 2082 #if VPS_EXTN_PROFILE_INFO 2083 2083 ::memset(m_profilePresentFlag, 0, sizeof(m_profilePresentFlag)); 2084 #if !P0048_REMOVE_PROFILE_REF 2084 2085 ::memset(m_profileLayerSetRef, 0, sizeof(m_profileLayerSetRef)); 2086 #endif 2085 2087 #endif 2086 2088 #if VPS_EXTN_OP_LAYER_SETS -
branches/SHM-5.0-dev/source/Lib/TLibCommon/TComSlice.h
r551 r552 514 514 // Profile-tier-level signalling related 515 515 Bool m_profilePresentFlag[MAX_VPS_LAYER_SETS_PLUS1]; // The value with index 0 will not be used. 516 #if !P0048_REMOVE_PROFILE_REF 516 517 UInt m_profileLayerSetRef[MAX_VPS_LAYER_SETS_PLUS1]; // The value with index 0 will not be used. 518 #endif 517 519 std::vector<TComPTL> m_pcPTLForExtn; 518 520 #endif … … 777 779 Void setProfilePresentFlag(Int id, Bool x) { m_profilePresentFlag[id] = x; } 778 780 781 #if !P0048_REMOVE_PROFILE_REF 779 782 UInt getProfileLayerSetRef(Int id) { return m_profileLayerSetRef[id]; } 780 783 Void setProfileLayerSetRef(Int id, Bool x) { m_profileLayerSetRef[id] = x; } 784 #endif 781 785 782 786 std::vector<TComPTL>* getPTLForExtnPtr() { return &m_pcPTLForExtn; } -
branches/SHM-5.0-dev/source/Lib/TLibCommon/TypeDef.h
r550 r552 53 53 #define O0109_O0199_FLAGS_TO_VUI 1 ///< JCTVC-O0109, O0199: move single_layer_for_non_irap_flag and higher_layer_flag to vps_vui 54 54 #define O0109_VIEW_ID_LEN 1 ///< JCTVC-O0109: view_id_len_minus1 to view_id_len, and add constraint (1<<view_id_len) is greater than or equal to NumViews 55 56 #define P0048_REMOVE_PROFILE_REF 1 ///< JCTVC-P0048: remove profile_ref_minus1 57 #if !P0048_REMOVE_PROFILE_REF 55 58 #define O0109_PROF_REF_MINUS1 1 ///< JCTVC-O0109: constraint that profile_ref_minus1[i] shall be less than or equal to i 59 #endif 60 56 61 #define O0109_DEFAULT_ONE_OUT_LAYER_IDC 1 ///< JCTVC-O0109: default_one_target_output_layer_flag to default_one_target_output_layer_idc 57 62 #define O0109_MOVE_VPS_VUI_FLAG 1 ///< JCTVC-O0109: move vps_vui_present_flag before vps_vui_offset -
branches/SHM-5.0-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp
r551 r552 1194 1194 if( !vps->getProfilePresentFlag(idx) ) 1195 1195 { 1196 #if P0048_REMOVE_PROFILE_REF 1197 // Copy profile information from previous one 1198 vps->getPTLForExtn(idx)->copyProfileInfo( (idx==1) ? vps->getPTL() : vps->getPTLForExtn( idx - 1 ) ); 1199 #else 1196 1200 READ_CODE( 6, uiCode, "profile_ref_minus1[i]" ); vps->setProfileLayerSetRef(idx, uiCode + 1); 1197 1201 #if O0109_PROF_REF_MINUS1 … … 1202 1206 // Copy profile information as indicated 1203 1207 vps->getPTLForExtn(idx)->copyProfileInfo( vps->getPTLForExtn( vps->getProfileLayerSetRef(idx) ) ); 1208 #endif 1204 1209 } 1205 1210 parsePTL( vps->getPTLForExtn(idx), vps->getProfilePresentFlag(idx), vps->getMaxTLayers() - 1 ); -
branches/SHM-5.0-dev/source/Lib/TLibEncoder/TEncCavlc.cpp
r551 r552 955 955 { 956 956 WRITE_FLAG( vps->getProfilePresentFlag(idx), "vps_profile_present_flag[i]" ); 957 #if !P0048_REMOVE_PROFILE_REF 957 958 if( !vps->getProfilePresentFlag(idx) ) 958 959 { 959 960 WRITE_CODE( vps->getProfileLayerSetRef(idx) - 1, 6, "profile_ref_minus1[i]" ); 960 961 } 962 #endif 961 963 codePTL( vps->getPTLForExtn(idx), vps->getProfilePresentFlag(idx), vps->getMaxTLayers() - 1 ); 962 964 }
Note: See TracChangeset for help on using the changeset viewer.