Changeset 478 in 3DVCSoftware for branches/HTM-DEV-0.3-dev2/source/App/TAppEncoder/TAppEncTop.cpp

Timestamp:

18 Jun 2013, 17:25:49 (11 years ago)

Author:

tech

Message:

Minor clean ups.

File:

• branches/HTM-DEV-0.3-dev2/source/App/TAppEncoder/TAppEncTop.cpp (modified) (6 diffs)

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

@@ -128 +128 @@
     m_frameRcvd                 .push_back(0);
     m_acTEncTopList             .push_back(new TEncTop); 
-#if H_3D_IV_MERGE
-//    m_acTEncDepthTopList        .push_back(new TEncTop); 
-#endif
     m_acTVideoIOYuvInputFileList.push_back(new TVideoIOYuv);
     m_acTVideoIOYuvReconFileList.push_back(new TVideoIOYuv);
     m_picYuvRec                 .push_back(new TComList<TComPicYuv*>) ;
-#if H_3D_IV_MERGE
-    //m_acTEncDepthTopList[iViewIdx]->setFrameRate                    ( m_iFrameRate );
-    //m_acTEncDepthTopList[iViewIdx]->setFrameSkip                    ( m_FrameSkip );
-    //m_acTEncDepthTopList[iViewIdx]->setSourceWidth                  ( m_iSourceWidth );
-    //m_acTEncDepthTopList[iViewIdx]->setSourceHeight                 ( m_iSourceHeight );
-    //m_acTEncDepthTopList[iViewIdx]->setCroppingMode                 ( m_croppingMode );
-    //m_acTEncDepthTopList[iViewIdx]->setCropLeft                     ( m_cropLeft );
-    //m_acTEncDepthTopList[iViewIdx]->setCropRight                    ( m_cropRight );
-    //m_acTEncDepthTopList[iViewIdx]->setCropTop                      ( m_cropTop );
-    //m_acTEncDepthTopList[iViewIdx]->setCropBottom                   ( m_cropBottom );
-    //m_acTEncDepthTopList[iViewIdx]->setFrameToBeEncoded             ( m_iFrameToBeEncoded );
-    //m_acTEncDepthTopList[iViewIdx]->setViewId                       ( iViewIdx );
-    //m_acTEncDepthTopList[iViewIdx]->setIsDepth                      ( true );
-
-    //m_acTEncDepthTopList[iViewIdx]->setViewOrderIdx                 ( m_cCameraData.getViewOrderIndex()[ iViewIdx ] );
-
-    //m_acTEncDepthTopList[iViewIdx]->setLayerId                      ( layerId );
-
-#endif
+
     m_ivPicLists.push_back( m_acTEncTopList[ layer ]->getListPic()  ); 
     TEncTop& m_cTEncTop = *m_acTEncTopList[ layer ];  // It is not a member, but this name helps avoiding code duplication !!!
@@ -164 +143 @@
     m_cTEncTop.setIsDepth                      ( isDepth );
     //====== Camera Parameters =========
-#if H_3D_IV_MERGE
-      //m_acTEncDepthTopList[iViewIdx]->setCamParPrecision              ( 0 );
-      //m_acTEncDepthTopList[iViewIdx]->setCamParInSliceHeader          ( false );
-      //m_acTEncDepthTopList[iViewIdx]->setCodedScale                   ( 0 );
-      //m_acTEncDepthTopList[iViewIdx]->setCodedOffset                  ( 0 );
-#endif
     m_cTEncTop.setCameraParameters             ( &m_cCameraData );     
     m_cTEncTop.setCamParPrecision              ( isDepth ? false : m_cCameraData.getCamParsCodedPrecision  () );
@@ -220 +193 @@
   
   //====== Coding Structure ========
-#if H_3D_IV_MERGE
-      //m_acTEncDepthTopList[iViewIdx]->setIntraPeriod                  ( m_iIntraPeriod );
-      //m_acTEncDepthTopList[iViewIdx]->setDecodingRefreshType          ( m_iDecodingRefreshType );
-      //m_acTEncDepthTopList[iViewIdx]->setGOPSize                      ( m_iGOPSize );
-      //m_acTEncDepthTopList[iViewIdx]->setGopList                      ( m_GOPListsMvc[iViewIdx] );
-      //m_acTEncDepthTopList[iViewIdx]->setExtraRPSs                    ( m_extraRPSs[iViewIdx] );
-#endif
   m_cTEncTop.setIntraPeriod                  ( m_iIntraPeriod );
   m_cTEncTop.setDecodingRefreshType          ( m_iDecodingRefreshType );
@@ -267 +233 @@
   {
     m_cTEncTop.setLambdaModifier( uiLoop, m_adLambdaModifier[ uiLoop ] );
-#if H_3D_IV_MERGE
-//        m_acTEncDepthTopList[iViewIdx]->setLambdaModifier( uiLoop, m_adLambdaModifier[ uiLoop ] );
-#endif
   }
 #if H_MV
@@ -289 +252 @@
   
   //====== Loop/Deblock Filter ========
-#if H_3D_IV_MERGE
-      //m_acTEncDepthTopList[iViewIdx]->setLoopFilterDisable            ( m_abLoopFilterDisable[1]   );
-      //m_acTEncDepthTopList[iViewIdx]->setLoopFilterOffsetInAPS        ( m_loopFilterOffsetInAPS );
-      //m_acTEncDepthTopList[iViewIdx]->setLoopFilterBetaOffset         ( m_loopFilterBetaOffsetDiv2  );
-      //m_acTEncDepthTopList[iViewIdx]->setLoopFilterTcOffset           ( m_loopFilterTcOffsetDiv2    );
-      //m_acTEncDepthTopList[iViewIdx]->setDeblockingFilterControlPresent( m_DeblockingFilterControlPresent);
-#endif
 #if H_MV
   m_cTEncTop.setLoopFilterDisable            ( m_bLoopFilterDisable[layer]);
@@ -1102 +1058 @@
 #endif
 #if H_3D_IV_MERGE
+ // GT: This function is not necessary anymore m_ivPicLists should be used instead
 TComPic* TAppEncTop::xGetPicFromView( Int viewIdx, Int poc, Bool isDepth )
 {