Changeset 478 in 3DVCSoftware for branches/HTM-DEV-0.3-dev2/source/App


Ignore:
Timestamp:
18 Jun 2013, 17:25:49 (12 years ago)
Author:
tech
Message:

Minor clean ups.

Location:
branches/HTM-DEV-0.3-dev2/source/App
Files:
5 edited

Legend:

Unmodified
Added
Removed

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

    r476 r478  
    683683#endif
    684684#if H_3D_IV_MERGE
     685// GT: This function is not necessary anymore m_ivPicLists should be used instead
    685686TComPic* TAppDecTop::xGetPicFromView( Int viewIdx, Int poc, Bool isDepth )
    686687{
    … …  
    701702}
    702703#endif
    703 
    704704//! \}

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

    r476 r478  
    7676    // for output control
    7777  Bool                            m_abDecFlag[ MAX_GOP ];         ///< decoded flag in one GOP
    78 
    7978#if H_3D_IV_MERGE
    8079  Int  m_fcoViewDepthId;
    … …  
    107106  TDecTop* getTDecTop     ( Int viewIdx, Bool isDepth );
    108107  TComPic*              getPicFromView     ( Int viewIdx, Int poc, bool isDepth ) { return xGetPicFromView( viewIdx, poc, isDepth ); }
    109 #endif
    110 
    111 #if H_3D_IV_MERGE
    112108  TComVPSAccess*    getVPSAccess  () { return &m_cVPSAccess;   }
    113109  TComSPSAccess*    getSPSAccess  () { return &m_cSPSAccess;   }
    … …  
    124120  TComPic* xGetPicFromView( Int viewIdx, Int poc, Bool isDepth );
    125121#endif
    126 
    127122#if H_MV
    128123  Void  xWriteOutput      ( TComList<TComPic*>* pcListPic, Int layerId, Int tId ); ///< write YUV to file
    … …  
    133128  Void  xFlushOutput      ( TComList<TComPic*>* pcListPic ); ///< flush all remaining decoded pictures to file
    134129#endif
    135 
    136130  Bool  isNaluWithinTargetDecLayerIdSet ( InputNALUnit* nalu ); ///< check whether given Nalu is within targetDecLayerIdSet
    137131};

  • branches/HTM-DEV-0.3-dev2/source/App/TAppEncoder/TAppEncCfg.cpp

    r476 r478  
    717717
    718718#endif //HHI_VSO
    719 
    720719#if H_3D_IV_MERGE
    721720  ("PredDepthMapGen",  m_uiPredDepthMapGeneration, (UInt)0, "generation of prediction depth maps for motion data prediction" )

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

    r476 r478  
    128128    m_frameRcvd                 .push_back(0);
    129129    m_acTEncTopList             .push_back(new TEncTop);
    130 #if H_3D_IV_MERGE
    131 //    m_acTEncDepthTopList        .push_back(new TEncTop);
    132 #endif
    133130    m_acTVideoIOYuvInputFileList.push_back(new TVideoIOYuv);
    134131    m_acTVideoIOYuvReconFileList.push_back(new TVideoIOYuv);
    135132    m_picYuvRec                 .push_back(new TComList<TComPicYuv*>) ;
    136 #if H_3D_IV_MERGE
    137     //m_acTEncDepthTopList[iViewIdx]->setFrameRate                    ( m_iFrameRate );
    138     //m_acTEncDepthTopList[iViewIdx]->setFrameSkip                    ( m_FrameSkip );
    139     //m_acTEncDepthTopList[iViewIdx]->setSourceWidth                  ( m_iSourceWidth );
    140     //m_acTEncDepthTopList[iViewIdx]->setSourceHeight                 ( m_iSourceHeight );
    141     //m_acTEncDepthTopList[iViewIdx]->setCroppingMode                 ( m_croppingMode );
    142     //m_acTEncDepthTopList[iViewIdx]->setCropLeft                     ( m_cropLeft );
    143     //m_acTEncDepthTopList[iViewIdx]->setCropRight                    ( m_cropRight );
    144     //m_acTEncDepthTopList[iViewIdx]->setCropTop                      ( m_cropTop );
    145     //m_acTEncDepthTopList[iViewIdx]->setCropBottom                   ( m_cropBottom );
    146     //m_acTEncDepthTopList[iViewIdx]->setFrameToBeEncoded             ( m_iFrameToBeEncoded );
    147     //m_acTEncDepthTopList[iViewIdx]->setViewId                       ( iViewIdx );
    148     //m_acTEncDepthTopList[iViewIdx]->setIsDepth                      ( true );
    149 
    150     //m_acTEncDepthTopList[iViewIdx]->setViewOrderIdx                 ( m_cCameraData.getViewOrderIndex()[ iViewIdx ] );
    151 
    152     //m_acTEncDepthTopList[iViewIdx]->setLayerId                      ( layerId );
    153 
    154 #endif
     133
    155134    m_ivPicLists.push_back( m_acTEncTopList[ layer ]->getListPic()  );
    156135    TEncTop& m_cTEncTop = *m_acTEncTopList[ layer ];  // It is not a member, but this name helps avoiding code duplication !!!
    … …  
    164143    m_cTEncTop.setIsDepth                      ( isDepth );
    165144    //====== Camera Parameters =========
    166 #if H_3D_IV_MERGE
    167       //m_acTEncDepthTopList[iViewIdx]->setCamParPrecision              ( 0 );
    168       //m_acTEncDepthTopList[iViewIdx]->setCamParInSliceHeader          ( false );
    169       //m_acTEncDepthTopList[iViewIdx]->setCodedScale                   ( 0 );
    170       //m_acTEncDepthTopList[iViewIdx]->setCodedOffset                  ( 0 );
    171 #endif
    172145    m_cTEncTop.setCameraParameters             ( &m_cCameraData );     
    173146    m_cTEncTop.setCamParPrecision              ( isDepth ? false : m_cCameraData.getCamParsCodedPrecision  () );
    … …  
    220193 
    221194  //====== Coding Structure ========
    222 #if H_3D_IV_MERGE
    223       //m_acTEncDepthTopList[iViewIdx]->setIntraPeriod                  ( m_iIntraPeriod );
    224       //m_acTEncDepthTopList[iViewIdx]->setDecodingRefreshType          ( m_iDecodingRefreshType );
    225       //m_acTEncDepthTopList[iViewIdx]->setGOPSize                      ( m_iGOPSize );
    226       //m_acTEncDepthTopList[iViewIdx]->setGopList                      ( m_GOPListsMvc[iViewIdx] );
    227       //m_acTEncDepthTopList[iViewIdx]->setExtraRPSs                    ( m_extraRPSs[iViewIdx] );
    228 #endif
    229195  m_cTEncTop.setIntraPeriod                  ( m_iIntraPeriod );
    230196  m_cTEncTop.setDecodingRefreshType          ( m_iDecodingRefreshType );
    … …  
    267233  {
    268234    m_cTEncTop.setLambdaModifier( uiLoop, m_adLambdaModifier[ uiLoop ] );
    269 #if H_3D_IV_MERGE
    270 //        m_acTEncDepthTopList[iViewIdx]->setLambdaModifier( uiLoop, m_adLambdaModifier[ uiLoop ] );
    271 #endif
    272235  }
    273236#if H_MV
    … …  
    289252 
    290253  //====== Loop/Deblock Filter ========
    291 #if H_3D_IV_MERGE
    292       //m_acTEncDepthTopList[iViewIdx]->setLoopFilterDisable            ( m_abLoopFilterDisable[1]   );
    293       //m_acTEncDepthTopList[iViewIdx]->setLoopFilterOffsetInAPS        ( m_loopFilterOffsetInAPS );
    294       //m_acTEncDepthTopList[iViewIdx]->setLoopFilterBetaOffset         ( m_loopFilterBetaOffsetDiv2  );
    295       //m_acTEncDepthTopList[iViewIdx]->setLoopFilterTcOffset           ( m_loopFilterTcOffsetDiv2    );
    296       //m_acTEncDepthTopList[iViewIdx]->setDeblockingFilterControlPresent( m_DeblockingFilterControlPresent);
    297 #endif
    298254#if H_MV
    299255  m_cTEncTop.setLoopFilterDisable            ( m_bLoopFilterDisable[layer]);
    … …  
    11021058#endif
    11031059#if H_3D_IV_MERGE
     1060 // GT: This function is not necessary anymore m_ivPicLists should be used instead
    11041061TComPic* TAppEncTop::xGetPicFromView( Int viewIdx, Int poc, Bool isDepth )
    11051062{

  • branches/HTM-DEV-0.3-dev2/source/App/TAppEncoder/TAppEncTop.h

    r476 r478  
    9292  TRenModel                   m_cRendererModel;   
    9393#endif
    94 
    9594#if H_3D_IV_MERGE
    9695  TComVPSAccess               m_cVPSAccess;
    … …  
    145144  TEncTop&    getTEncTop  ()   { return  m_cTEncTop; }      ///< return encoder class pointer reference
    146145#endif
    147 
    148146#if H_3D_IV_MERGE
    149147  TComVPSAccess*    getVPSAccess  () { return &m_cVPSAccess;   }
Note: See TracChangeset for help on using the changeset viewer.