Changeset 489 in 3DVCSoftware


Ignore:
Timestamp:
22 Jun 2013, 22:37:06 (11 years ago)
Author:
zhang
Message:

Use m_ivPicLists instead of TAppE/DencTop encapsulated with H_3D_ARP_FIX

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  
    654654#if H_3D
    655655   m_tDecTop[ decIdx ]->setCamParsCollector( &m_cCamParsCollector );
    656 #if H_3D_ARP
     656#if H_3D_ARP && !H_3D_ARP_FIX
    657657    m_tDecTop[ decIdx ]->setTAppDecTop(this);
    658658#endif

  • branches/HTM-DEV-0.3-dev2a/source/App/TAppDecoder/TAppDecTop.h

    r465 r489  
    9191  Void  decode            (); ///< main decoding function
    9292 
    93 #if H_3D_ARP              
     93#if H_3D_ARP && !H_3D_ARP_FIX              
    9494//GT (IVREFS): This is not needed any more. Reference picture can be obtained from m_ivPicLists. Should be fixed later.
    9595  TDecTop* getTDecTop     ( Int layerId )          { return m_tDecTop[layerId]; }

  • branches/HTM-DEV-0.3-dev2a/source/App/TAppEncoder/TAppEncTop.cpp

    r468 r489  
    621621  {
    622622    m_acTEncTopList[layer]->init( );
    623 #if H_3D_ARP
     623#if H_3D_ARP && !H_3D_ARP_FIX
    624624    //GT (IVREFS): This is not needed any more. Reference pictures can be obtained from m_ivPicLists. Should be fixed later.
    625625    m_acTEncTopList[layer]->setTAppEncTop( this );

  • branches/HTM-DEV-0.3-dev2a/source/Lib/TLibCommon/TComPic.cpp

    r456 r489  
    556556  return getPicYuv( layerIdInNuh, poc, recon );
    557557}
     558#if H_3D_ARP_FIX
     559TComList<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
    558575#endif // H_3D
    559576#endif // H_MV

  • branches/HTM-DEV-0.3-dev2a/source/Lib/TLibCommon/TComPic.h

    r455 r489  
    234234  Void        push_back( TComList<TComPic*>* list ) { m_lists.push_back( list );   }
    235235  Int         size     ()                           { return (Int) m_lists.size(); }
     236#if H_3D_ARP_FIX
     237  TComList<TComPic*>*  getPicList   ( Int layerIdInNuh );
     238#endif
    236239  TComPic*    getPic   ( Int layerIdInNuh,              Int poc );   
    237240  TComPicYuv* getPicYuv( Int layerIdInNuh,              Int poc, Bool recon );

  • branches/HTM-DEV-0.3-dev2a/source/Lib/TLibCommon/TypeDef.h

    r468 r489  
    125125#if H_3D_ARP
    126126#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
    127128#endif
    128129

  • branches/HTM-DEV-0.3-dev2a/source/Lib/TLibDecoder/TDecTop.cpp

    r465 r489  
    901901        if( iViewIdx<getViewIndex() && !bIsDepth )
    902902        {
     903#if H_3D_ARP_FIX
     904          pcSlice->setBaseViewRefPicList( m_ivPicLists->getPicList( iLayerId ), iViewIdx );
     905#else
    903906          //GT (IVREFS): m_tAppDecTop is not needed any more. Reference pictures can be obtained from m_ivPicLists. Should be fixed later.
    904907          pcSlice->setBaseViewRefPicList( m_tAppDecTop->getTDecTop(iLayerId)->getListPic(), iViewIdx );
     908#endif
    905909        }
    906910      }

  • branches/HTM-DEV-0.3-dev2a/source/Lib/TLibDecoder/TDecTop.h

    r465 r489  
    227227#endif
    228228
    229 #if H_3D_ARP
     229#if H_3D_ARP && !H_3D_ARP_FIX
    230230  //GT (IVREFS): This is not needed any more. Reference picture can be obtained from m_ivPicLists. Should be fixed later.
    231231  TAppDecTop*             m_tAppDecTop;
    … …  
    273273  Void                    setCamParsCollector( CamParsCollector* pcCamParsCollector ) { m_pcCamParsCollector = pcCamParsCollector; }
    274274
    275 #if H_3D_ARP
     275#if H_3D_ARP && !H_3D_ARP_FIX
    276276  //GT (IVREFS): This is not needed any more. Reference picture can be obtained from m_ivPicLists. Should be fixed later.
    277277  Void                    setTAppDecTop( TAppDecTop* pcTAppDecTop ) { m_tAppDecTop = pcTAppDecTop; }

  • branches/HTM-DEV-0.3-dev2a/source/Lib/TLibEncoder/TEncGOP.cpp

    r465 r489  
    683683        if( iViewIdx<getViewIndex() && !bIsDepth )
    684684        {
     685#if H_3D_ARP_FIX
     686          pcSlice->setBaseViewRefPicList( m_ivPicLists->getPicList( iLayerId ), iViewIdx );
     687#else
    685688          //GT (IVREFS): m_tAppEncTop is not needed any more. Reference pictures can be obtained from m_ivPicLists. Should be fixed later.
    686689          pcSlice->setBaseViewRefPicList( m_pcEncTop->getTAppEncTop()->getTEncTop( iLayerId )->getListPic(), iViewIdx );
     690#endif
    687691        }
    688692      }

  • branches/HTM-DEV-0.3-dev2a/source/Lib/TLibEncoder/TEncTop.h

    r465 r489  
    129129  TEncRateCtrl            m_cRateCtrl;                    ///< Rate control class
    130130
    131 #if H_3D_ARP
     131#if H_3D_ARP && !H_3D_ARP_FIX
    132132  TAppEncTop*             m_pcTAppEncTop;
    133133#endif
    … …  
    213213  Void                    setIvPicLists         ( TComPicLists* picLists) { m_ivPicLists = picLists; }
    214214#endif
    215 #if H_3D_ARP
     215#if H_3D_ARP && !H_3D_ARP_FIX
    216216  //GT (IVREFS): m_tAppDecTop is not needed any more. Reference pictures can be obtained from m_ivPicLists. Should be fixed later.
    217217  Void            setTAppEncTop( TAppEncTop* pcTAppEncTop ) { m_pcTAppEncTop = pcTAppEncTop; }
Note: See TracChangeset for help on using the changeset viewer.