Ignore:
Timestamp:
18 Jun 2013, 23:24:53 (12 years ago)
Author:
tech
Message:
  • changed IV-MERGE HLS to match Test Model 4 spec
  • incorporated iv-refpic list to TComSlice
  • removed TComDepthMapGenerator
Location:
branches/HTM-DEV-0.3-dev2/source/App/TAppDecoder
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/HTM-DEV-0.3-dev2/source/App/TAppDecoder/TAppDecTop.cpp

    r478 r479  
    641641    m_tDecTop[ decIdx ] =  new TDecTop;
    642642    m_tDecTop[ decIdx ]->create();
    643 #if H_3D_IV_MERGE
    644     m_tDecTop[ decIdx ]->init(this );
    645 #else
    646643    m_tDecTop[ decIdx ]->init( );
    647 #endif
    648644    m_tDecTop[ decIdx ]->setLayerId( layerId );
    649645    m_tDecTop[ decIdx ]->setDecodedPictureHashSEIEnabled(m_decodedPictureHashSEIEnabled);
    … …  
    682678}
    683679#endif
    684 #if H_3D_IV_MERGE
    685 // GT: This function is not necessary anymore m_ivPicLists should be used instead
    686 TComPic* TAppDecTop::xGetPicFromView( Int viewIdx, Int poc, Bool isDepth )
    687 {
    688   assert( ( viewIdx >= 0 ) );
    689 
    690   TComList<TComPic*>* apcListPic = m_tDecTop[ (isDepth ? 1 : 0) + viewIdx * 2 ]->getListPic();
    691 
    692   TComPic* pcPic = NULL;
    693   for( TComList<TComPic*>::iterator it=apcListPic->begin(); it!=apcListPic->end(); it++ )
    694   {
    695     if( (*it)->getPOC() == poc )
    696     {
    697       pcPic = *it;
    698       break;
    699     }
    700   }
    701   return pcPic;
    702 }
    703 #endif
    704680//! \}

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

    r478 r479  
    4949#include "TAppDecCfg.h"
    5050
    51 #if H_3D_IV_MERGE
    52 #include "TLibCommon/TComDepthMapGenerator.h"
    53 #endif
    5451//! \ingroup TAppDecoder
    5552//! \{
    … …  
    7673    // for output control
    7774  Bool                            m_abDecFlag[ MAX_GOP ];         ///< decoded flag in one GOP
    78 #if H_3D_IV_MERGE
    79   Int  m_fcoViewDepthId;
    80   Char m_fcoOrder[MAX_VIEW_NUM*2];
    81 #endif
    8275#if H_MV
    8376  Int                             m_pocLastDisplay      [ MAX_NUM_LAYERS ]; ///< last POC in display order
    … …  
    8982  FILE*                           m_pScaleOffsetFile;
    9083  CamParsCollector                m_cCamParsCollector;
    91 #if H_3D_IV_MERGE
    92   TComVPSAccess                   m_cVPSAccess;
    93   TComSPSAccess                   m_cSPSAccess;
    94   TComAUPicAccess                 m_cAUPicAccess;
    95 #endif
    9684#endif
    9785public:
    … …  
    10391  Void  decode            (); ///< main decoding function
    10492
    105 #if H_3D_IV_MERGE
    106   TDecTop* getTDecTop     ( Int viewIdx, Bool isDepth );
    107   TComPic*              getPicFromView     ( Int viewIdx, Int poc, bool isDepth ) { return xGetPicFromView( viewIdx, poc, isDepth ); }
    108   TComVPSAccess*    getVPSAccess  () { return &m_cVPSAccess;   }
    109   TComSPSAccess*    getSPSAccess  () { return &m_cSPSAccess;   }
    110   TComAUPicAccess*  getAUPicAccess() { return &m_cAUPicAccess; }
    111   TDecTop*          getDecTop0    () { return m_tDecTop[0]; }
    112 #endif
    113 
    11493protected:
    11594  Void  xCreateDecLib     (); ///< create internal classes
    … …  
    11796  Void  xInitDecLib       (); ///< initialize decoder class
    11897
    119 #if H_3D_IV_MERGE
    120   TComPic* xGetPicFromView( Int viewIdx, Int poc, Bool isDepth );
    121 #endif
    12298#if H_MV
    12399  Void  xWriteOutput      ( TComList<TComPic*>* pcListPic, Int layerId, Int tId ); ///< write YUV to file
Note: See TracChangeset for help on using the changeset viewer.