Changeset 1249 in 3DVCSoftware for branches/HTM-14.1-update-dev1-RWTH/source/App/TAppEncoder/TAppEncTop.cpp
- Timestamp:
- 3 Jun 2015, 18:23:49 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-14.1-update-dev1-RWTH/source/App/TAppEncoder/TAppEncTop.cpp
r1237 r1249 92 92 93 93 #if NH_3D_DLT 94 TComDLT dlt = m_dlt;94 TComDLT dlt = TComDLT(); 95 95 #endif 96 96 … … 150 150 #endif 151 151 #if NH_3D_DLT 152 xDeriveDltArray ( vps, dlt );152 xDeriveDltArray ( vps, &dlt ); 153 153 #endif 154 154 if ( m_targetEncLayerIdList.size() == 0 ) … … 2387 2387 2388 2388 #if NH_3D_DLT 2389 Void TAppEncTop::xDeriveDltArray( TComVPS& vps, TComDLT &dlt )2389 Void TAppEncTop::xDeriveDltArray( TComVPS& vps, TComDLT* dlt ) 2390 2390 { 2391 2391 Int iNumDepthViews = 0; … … 2401 2401 } 2402 2402 2403 dlt .setUseDLTFlag( layer , isDepth && m_useDLT );2404 if( dlt .getUseDLTFlag( layer ) )2405 { 2406 xAnalyzeInputBaseDepth(layer, max(m_iIntraPeriod[layer], 24), &vps, &dlt);2407 bDltPresentFlag = bDltPresentFlag || dlt .getUseDLTFlag(layer);2408 dlt .setInterViewDltPredEnableFlag(layer, (dlt.getUseDLTFlag(layer) && (layer>1)));2403 dlt->setUseDLTFlag( layer , isDepth && m_useDLT ); 2404 if( dlt->getUseDLTFlag( layer ) ) 2405 { 2406 xAnalyzeInputBaseDepth(layer, max(m_iIntraPeriod[layer], 24), &vps, dlt); 2407 bDltPresentFlag = bDltPresentFlag || dlt->getUseDLTFlag(layer); 2408 dlt->setInterViewDltPredEnableFlag(layer, (dlt->getUseDLTFlag(layer) && (layer>1))); 2409 2409 2410 2410 // ----------------------------- determine whether to use bit-map ----------------------------- … … 2421 2421 UInt uiNumDepthValues_coded = 0; 2422 2422 2423 uiNumDepthValues_coded = dlt .getNumDepthValues(layer);2423 uiNumDepthValues_coded = dlt->getNumDepthValues(layer); 2424 2424 for( UInt ui = 0; ui<uiNumDepthValues_coded; ui++ ) 2425 2425 { 2426 aiIdx2DepthValue_coded[ui] = dlt .idx2DepthValue(layer, ui);2426 aiIdx2DepthValue_coded[ui] = dlt->idx2DepthValue(layer, ui); 2427 2427 } 2428 2428 2429 if( dlt .getInterViewDltPredEnableFlag( layer ) )2429 if( dlt->getInterViewDltPredEnableFlag( layer ) ) 2430 2430 { 2431 2431 AOF( vps.getDepthId( 1 ) == 1 ); 2432 2432 AOF( layer > 1 ); 2433 2433 // assumes ref layer id to be 1 2434 std::vector<Int> piRefDLT = dlt .idx2DepthValue( 1 );2435 UInt uiRefNum = dlt .getNumDepthValues( 1 );2436 dlt .getDeltaDLT(layer, piRefDLT, uiRefNum, aiIdx2DepthValue_coded, uiNumDepthValues_coded);2434 std::vector<Int> piRefDLT = dlt->idx2DepthValue( 1 ); 2435 UInt uiRefNum = dlt->getNumDepthValues( 1 ); 2436 dlt->getDeltaDLT(layer, piRefDLT, uiRefNum, aiIdx2DepthValue_coded, uiNumDepthValues_coded); 2437 2437 } 2438 2438 … … 2483 2483 bDltBitMapRepFlag = (uiNumBitsBitMap > uiNumBitsNonBitMap) ? false : true; 2484 2484 2485 dlt .setUseBitmapRep(layer, bDltBitMapRepFlag);2486 } 2487 } 2488 2489 dlt .setDltPresentFlag( bDltPresentFlag );2490 dlt .setNumDepthViews ( iNumDepthViews );2491 dlt .setDepthViewBitDepth( m_inputBitDepth[CHANNEL_TYPE_LUMA] );2485 dlt->setUseBitmapRep(layer, bDltBitMapRepFlag); 2486 } 2487 } 2488 2489 dlt->setDltPresentFlag( bDltPresentFlag ); 2490 dlt->setNumDepthViews ( iNumDepthViews ); 2491 dlt->setDepthViewBitDepth( m_inputBitDepth[CHANNEL_TYPE_LUMA] ); 2492 2492 } 2493 2493 #endif
Note: See TracChangeset for help on using the changeset viewer.