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

Timestamp:

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

Author:

tech

Message:

Minor clean ups.

Location:

branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder

Files:

• TEncCavlc.cpp (modified) (1 diff)
• TEncGOP.cpp (modified) (2 diffs)
• TEncGOP.h (modified) (1 diff)
• TEncTop.cpp (modified) (4 diffs)
• TEncTop.h (modified) (3 diffs)

branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -581 +581 @@
   WRITE_FLAG( 0, "sps_extension_flag" );
 #endif
-
 #if H_3D_IV_MERGE
   if( pcSPS->getViewIndex() || pcSPS->isDepth() )

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

@@ -682 +682 @@
 #endif
 
-#if H_3D_IV_MERGE
+#if H_3D_IV_MERGE 
     TAppEncTop* tAppEncTop = m_pcEncTop->getEncTop();
     TComPic * const pcTexturePic = m_pcEncTop->getIsDepth() ? tAppEncTop->getPicFromView( getViewIndex(), pcSlice->getPOC(), false ) : NULL;
@@ -1042 +1042 @@
     m_storedStartCUAddrForEncodingSliceSegment.push_back(nextCUAddr);
     startCUAddrSliceSegmentIdx++;
-
 #if H_3D_IV_MERGE
     m_pcDepthMapGenerator->initViewComponent( pcPic );
 #endif
-
 #if H_3D_NBDV
       if(pcSlice->getViewIndex() && !pcSlice->getIsDepth()) //Notes from QC: this condition shall be changed once the configuration is completed, e.g. in pcSlice->getSPS()->getMultiviewMvPredMode() || ARP in prev. HTM. Remove this comment once it is done.

branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncGOP.h

@@ -110 +110 @@
   Int                     m_viewIndex; 
   Bool                    m_isDepth;
-
 #if H_3D_IV_MERGE
   TComDepthMapGenerator*  m_pcDepthMapGenerator;
 #endif
-
 #endif
 #endif

branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncTop.cpp

@@ -123 +123 @@
   m_cDepthMapGenerator. create( false, getSourceWidth(), getSourceHeight(), g_uiMaxCUDepth, g_uiMaxCUWidth, g_uiMaxCUHeight, g_bitDepthY, PDM_SUB_SAMP_EXP_X(m_uiPredDepthMapGeneration), PDM_SUB_SAMP_EXP_Y(m_uiPredDepthMapGeneration) );
 #endif
-
 #if RATE_CONTROL_LAMBDA_DOMAIN
   if ( m_RCEnableRateControl )
@@ -229 +228 @@
   m_cLoopFilter.        destroy();
   m_cRateCtrl.          destroy();
-
 #if H_3D_IV_MERGE
   m_cDepthMapGenerator. destroy();
@@ -322 +320 @@
   m_cDepthMapGenerator.init( (TComPrediction*)this->getPredSearch(), m_pcTAppEncTop->getVPSAccess(), m_pcTAppEncTop->getSPSAccess(), m_pcTAppEncTop->getAUPicAccess() );
 #endif
-
   // initialize transform & quantization class
   m_pcCavlcCoder = getCavlcCoder();
@@ -1334 +1331 @@
 }
 #endif
-
-
 //! \}

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

@@ -57 +57 @@
 #include "TEncPreanalyzer.h"
 #include "TEncRateCtrl.h"
-
 #if H_3D_IV_MERGE
 #include "TLibCommon/TComDepthMapGenerator.h"
@@ -71 +70 @@
 class TAppEncTop;
 #endif
-
 /// encoder class
 class TEncTop : public TEncCfg
@@ -104 +102 @@
   TEncSlice               m_cSliceEncoder;                ///< slice encoder
   TEncCu                  m_cCuEncoder;                   ///< CU encoder
-
 #if H_3D_IV_MERGE
   TComDepthMapGenerator   m_cDepthMapGenerator;           ///< depth map generator
 #endif
-
   // SPS
   TComSPS                 m_cSPS;                         ///< SPS