Changeset 489 in 3DVCSoftware
- Timestamp:
- 22 Jun 2013, 22:37:06 (12 years ago)
- Location:
- branches/HTM-DEV-0.3-dev2a/source
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-DEV-0.3-dev2a/source/App/TAppDecoder/TAppDecTop.cpp
r465 r489 654 654 #if H_3D 655 655 m_tDecTop[ decIdx ]->setCamParsCollector( &m_cCamParsCollector ); 656 #if H_3D_ARP 656 #if H_3D_ARP && !H_3D_ARP_FIX 657 657 m_tDecTop[ decIdx ]->setTAppDecTop(this); 658 658 #endif -
branches/HTM-DEV-0.3-dev2a/source/App/TAppDecoder/TAppDecTop.h
r465 r489 91 91 Void decode (); ///< main decoding function 92 92 93 #if H_3D_ARP 93 #if H_3D_ARP && !H_3D_ARP_FIX 94 94 //GT (IVREFS): This is not needed any more. Reference picture can be obtained from m_ivPicLists. Should be fixed later. 95 95 TDecTop* getTDecTop ( Int layerId ) { return m_tDecTop[layerId]; } -
branches/HTM-DEV-0.3-dev2a/source/App/TAppEncoder/TAppEncTop.cpp
r468 r489 621 621 { 622 622 m_acTEncTopList[layer]->init( ); 623 #if H_3D_ARP 623 #if H_3D_ARP && !H_3D_ARP_FIX 624 624 //GT (IVREFS): This is not needed any more. Reference pictures can be obtained from m_ivPicLists. Should be fixed later. 625 625 m_acTEncTopList[layer]->setTAppEncTop( this ); -
branches/HTM-DEV-0.3-dev2a/source/Lib/TLibCommon/TComPic.cpp
r456 r489 556 556 return getPicYuv( layerIdInNuh, poc, recon ); 557 557 } 558 #if H_3D_ARP_FIX 559 TComList<TComPic*>* TComPicLists::getPicList( Int layerIdInNuh ) 560 { 561 TComList<TComList<TComPic*>*>::iterator itL = m_lists.begin(); 562 Int iLayer = 0; 563 564 assert( layerIdInNuh < m_lists.size() ); 565 566 while( iLayer != layerIdInNuh ) 567 { 568 itL++; 569 iLayer++; 570 } 571 572 return *itL; 573 } 574 #endif 558 575 #endif // H_3D 559 576 #endif // H_MV -
branches/HTM-DEV-0.3-dev2a/source/Lib/TLibCommon/TComPic.h
r455 r489 234 234 Void push_back( TComList<TComPic*>* list ) { m_lists.push_back( list ); } 235 235 Int size () { return (Int) m_lists.size(); } 236 #if H_3D_ARP_FIX 237 TComList<TComPic*>* getPicList ( Int layerIdInNuh ); 238 #endif 236 239 TComPic* getPic ( Int layerIdInNuh, Int poc ); 237 240 TComPicYuv* getPicYuv( Int layerIdInNuh, Int poc, Bool recon ); -
branches/HTM-DEV-0.3-dev2a/source/Lib/TLibCommon/TypeDef.h
r468 r489 125 125 #if H_3D_ARP 126 126 #define H_3D_ARP_WFNR 3 127 #define H_3D_ARP_FIX 1 // Fix of using m_ivPicLists to access the reference pictures of other views 127 128 #endif 128 129 -
branches/HTM-DEV-0.3-dev2a/source/Lib/TLibDecoder/TDecTop.cpp
r465 r489 901 901 if( iViewIdx<getViewIndex() && !bIsDepth ) 902 902 { 903 #if H_3D_ARP_FIX 904 pcSlice->setBaseViewRefPicList( m_ivPicLists->getPicList( iLayerId ), iViewIdx ); 905 #else 903 906 //GT (IVREFS): m_tAppDecTop is not needed any more. Reference pictures can be obtained from m_ivPicLists. Should be fixed later. 904 907 pcSlice->setBaseViewRefPicList( m_tAppDecTop->getTDecTop(iLayerId)->getListPic(), iViewIdx ); 908 #endif 905 909 } 906 910 } -
branches/HTM-DEV-0.3-dev2a/source/Lib/TLibDecoder/TDecTop.h
r465 r489 227 227 #endif 228 228 229 #if H_3D_ARP 229 #if H_3D_ARP && !H_3D_ARP_FIX 230 230 //GT (IVREFS): This is not needed any more. Reference picture can be obtained from m_ivPicLists. Should be fixed later. 231 231 TAppDecTop* m_tAppDecTop; … … 273 273 Void setCamParsCollector( CamParsCollector* pcCamParsCollector ) { m_pcCamParsCollector = pcCamParsCollector; } 274 274 275 #if H_3D_ARP 275 #if H_3D_ARP && !H_3D_ARP_FIX 276 276 //GT (IVREFS): This is not needed any more. Reference picture can be obtained from m_ivPicLists. Should be fixed later. 277 277 Void setTAppDecTop( TAppDecTop* pcTAppDecTop ) { m_tAppDecTop = pcTAppDecTop; } -
branches/HTM-DEV-0.3-dev2a/source/Lib/TLibEncoder/TEncGOP.cpp
r465 r489 683 683 if( iViewIdx<getViewIndex() && !bIsDepth ) 684 684 { 685 #if H_3D_ARP_FIX 686 pcSlice->setBaseViewRefPicList( m_ivPicLists->getPicList( iLayerId ), iViewIdx ); 687 #else 685 688 //GT (IVREFS): m_tAppEncTop is not needed any more. Reference pictures can be obtained from m_ivPicLists. Should be fixed later. 686 689 pcSlice->setBaseViewRefPicList( m_pcEncTop->getTAppEncTop()->getTEncTop( iLayerId )->getListPic(), iViewIdx ); 690 #endif 687 691 } 688 692 } -
branches/HTM-DEV-0.3-dev2a/source/Lib/TLibEncoder/TEncTop.h
r465 r489 129 129 TEncRateCtrl m_cRateCtrl; ///< Rate control class 130 130 131 #if H_3D_ARP 131 #if H_3D_ARP && !H_3D_ARP_FIX 132 132 TAppEncTop* m_pcTAppEncTop; 133 133 #endif … … 213 213 Void setIvPicLists ( TComPicLists* picLists) { m_ivPicLists = picLists; } 214 214 #endif 215 #if H_3D_ARP 215 #if H_3D_ARP && !H_3D_ARP_FIX 216 216 //GT (IVREFS): m_tAppDecTop is not needed any more. Reference pictures can be obtained from m_ivPicLists. Should be fixed later. 217 217 Void setTAppEncTop( TAppEncTop* pcTAppEncTop ) { m_pcTAppEncTop = pcTAppEncTop; }
Note: See TracChangeset for help on using the changeset viewer.