Changeset 767 in 3DVCSoftware for branches/HTM-9.2-dev0/source/Lib/TLibDecoder/TDecTop.cpp
- Timestamp:
- 12 Jan 2014, 04:39:11 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-9.2-dev0/source/Lib/TLibDecoder/TDecTop.cpp
r766 r767 228 228 m_uiMaxViewIndex = std::max( m_uiMaxViewIndex, uiViewIndex ); 229 229 m_aiViewId[ uiViewIndex ] = pcSlice->getViewId(); 230 #if CAM_HLS_F0136_F0045_F0082 230 231 231 if( uiViewIndex == 1 ) 232 232 { … … 239 239 AOF( m_bCamParsVaryOverTime == pcSlice->getVPS()->hasCamParInSliceHeader ( uiViewIndex ) ); 240 240 } 241 #else 242 if( uiViewIndex == 1 ) 243 { 244 m_uiCamParsCodedPrecision = pcSlice->getSPS()->getCamParPrecision (); 245 m_bCamParsVaryOverTime = pcSlice->getSPS()->hasCamParInSliceHeader (); 246 } 247 else if( uiViewIndex > 1 ) 248 { 249 AOF( m_uiCamParsCodedPrecision == pcSlice->getSPS()->getCamParPrecision () ); 250 AOF( m_bCamParsVaryOverTime == pcSlice->getSPS()->hasCamParInSliceHeader () ); 251 } 252 #endif 241 253 242 for( UInt uiBaseIndex = 0; uiBaseIndex < uiViewIndex; uiBaseIndex++ ) 254 243 { … … 264 253 else 265 254 { 266 #if CAM_HLS_F0136_F0045_F0082267 255 m_aaiCodedScale [ uiBaseIndex ][ uiViewIndex ] = pcSlice->getVPS()->getCodedScale (uiViewIndex) [ uiBaseIndex ]; 268 256 m_aaiCodedOffset[ uiBaseIndex ][ uiViewIndex ] = pcSlice->getVPS()->getCodedOffset (uiViewIndex) [ uiBaseIndex ]; 269 257 m_aaiCodedScale [ uiViewIndex ][ uiBaseIndex ] = pcSlice->getVPS()->getInvCodedScale (uiViewIndex) [ uiBaseIndex ]; 270 258 m_aaiCodedOffset[ uiViewIndex ][ uiBaseIndex ] = pcSlice->getVPS()->getInvCodedOffset(uiViewIndex) [ uiBaseIndex ]; 271 #else272 m_aaiCodedScale [ uiBaseIndex ][ uiViewIndex ] = pcSlice->getSPS()->getCodedScale () [ uiBaseIndex ];273 m_aaiCodedOffset[ uiBaseIndex ][ uiViewIndex ] = pcSlice->getSPS()->getCodedOffset () [ uiBaseIndex ];274 m_aaiCodedScale [ uiViewIndex ][ uiBaseIndex ] = pcSlice->getSPS()->getInvCodedScale () [ uiBaseIndex ];275 m_aaiCodedOffset[ uiViewIndex ][ uiBaseIndex ] = pcSlice->getSPS()->getInvCodedOffset() [ uiBaseIndex ];276 #endif277 259 xInitLUTs( uiBaseIndex, uiViewIndex, m_aaiCodedScale[ uiBaseIndex ][ uiViewIndex ], m_aaiCodedOffset[ uiBaseIndex ][ uiViewIndex ], m_adBaseViewShiftLUT, m_aiBaseViewShiftLUT ); 278 260 xInitLUTs( uiViewIndex, uiBaseIndex, m_aaiCodedScale[ uiViewIndex ][ uiBaseIndex ], m_aaiCodedOffset[ uiViewIndex ][ uiBaseIndex ], m_adBaseViewShiftLUT, m_aiBaseViewShiftLUT ); … … 306 288 CamParsCollector::copyCamParamForSlice( TComSlice* pcSlice ) 307 289 { 308 #if !CAM_HLS_F0136_F0045_F0082309 UInt uiViewIndex = pcSlice->getViewIndex();310 311 pcSlice->getSPS()->initCamParaSPS( uiViewIndex, m_uiCamParsCodedPrecision, m_bCamParsVaryOverTime, m_aaiCodedScale, m_aaiCodedOffset );312 #endif313 290 if( m_bCamParsVaryOverTime ) 314 291 { … … 1111 1088 m_pcCamParsCollector->setSlice( pcSlice ); 1112 1089 } 1113 #if H_3D_IV_MERGE1114 if( pcSlice->getIsDepth() )1115 {1116 #if !CAM_HLS_F0136_F0045_F00821117 pcSlice->getSPS()->setHasCamParInSliceHeader( false );1118 #endif1119 }1120 #endif1121 1090 #endif 1122 1091 m_bFirstSliceInPicture = false; … … 1158 1127 pps->setLayerId( getLayerId() ); 1159 1128 #endif 1160 #if DLT_DIFF_CODING_IN_PPS1129 #if H_3D 1161 1130 // Assuming that all PPS indirectly refer to the same VPS via different SPS 1162 1131 // There is no parsing dependency in decoding DLT in PPS. … … 1165 1134 // Step 1) decoding DLT tables based on the number of depth layers, and 1166 1135 // Step 2) mapping DLT tables to the depth layers 1167 // as descri pted in the 3D-HEVC WD.1136 // as described in the 3D-HEVC WD. 1168 1137 TComVPS* vps = m_parameterSetManagerDecoder.getPrefetchedVPS( 0 ); 1169 1138 m_cEntropyDecoder.decodePPS( pps, vps );
Note: See TracChangeset for help on using the changeset viewer.