Changeset 365 in 3DVCSoftware for branches

Timestamp:

3 May 2013, 16:46:10 (12 years ago)

Author:

tech

Message:

Further minor cleanups.

Location:

branches/HTM-DEV-0.1-dev/source

Files:

• App/TAppDecoder/TAppDecCfg.h (modified) (1 diff)
• App/TAppDecoder/TAppDecTop.cpp (modified) (3 diffs)
• App/TAppDecoder/TAppDecTop.h (modified) (1 diff)
• App/TAppEncoder/TAppEncCfg.cpp (modified) (6 diffs)
• App/TAppEncoder/TAppEncTop.cpp (modified) (5 diffs)
• Lib/TAppCommon/program_options_lite.h (modified) (1 diff)
• Lib/TLibCommon/TComPic.cpp (modified) (1 diff)
• Lib/TLibEncoder/TEncSlice.cpp (modified) (1 diff)
• Lib/TLibEncoder/TEncTop.cpp (modified) (1 diff)

branches/HTM-DEV-0.1-dev/source/App/TAppDecoder/TAppDecCfg.h

@@ -58 +58 @@
 protected:
   Char*         m_pchBitstreamFile;                   ///< input bitstream file name
-
 #if H_MV
   Int           m_maxLayerId;                         ///< maximum nuh_layer_id decoded

branches/HTM-DEV-0.1-dev/source/App/TAppDecoder/TAppDecTop.cpp

@@ -156 +156 @@
     Bool bPreviousPictureDecoded = false;
 #endif
+
     vector<uint8_t> nalUnit;
     InputNALUnit nalu;
@@ -272 +273 @@
     }
 #endif
+
     if( pcListPic )
     {
@@ -282 +284 @@
         if (!m_outputBitDepthY) { m_outputBitDepthY = g_bitDepthY; }
         if (!m_outputBitDepthC) { m_outputBitDepthC = g_bitDepthC; }
+
 #if H_MV
         m_tVideoIOYuvReconFile[decIdxLastPic]->open( m_pchReconFiles[decIdxLastPic], true, m_outputBitDepthY, m_outputBitDepthC, g_bitDepthY, g_bitDepthC ); // write mode

branches/HTM-DEV-0.1-dev/source/App/TAppDecoder/TAppDecTop.h

@@ -74 +74 @@
   // for output control
   Bool                            m_abDecFlag[ MAX_GOP ];         ///< decoded flag in one GOP
-
 #if H_MV
   Int                             m_pocLastDisplay      [ MAX_NUM_LAYERS ]; ///< last POC in display order

branches/HTM-DEV-0.1-dev/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -142 +142 @@
   free(m_pRowHeight);
   free(m_scalingListFile);
-
 #if H_MV
   for( Int i = 0; i < m_GOPListMvc.size(); i++ )
@@ -321 +320 @@
   string cfg_InputFile;
 #endif
-
   string cfg_BitstreamFile;
-
 #if !H_MV
   string cfg_ReconFile;
 #endif
-
 #if H_MV
   vector<Int>   cfg_dimensionLength; 
@@ -386 +382 @@
   ("SplittingFlag",         m_splittingFlag      , false                , "Splitting Flag")    
 #endif
-
   ("SourceWidth,-wdt",      m_iSourceWidth,        0, "Source picture width")
   ("SourceHeight,-hgt",     m_iSourceHeight,       0, "Source picture height")
@@ -743 +738 @@
    */
   /* convert std::string to c string for compatability */
-
 #if !H_MV
   m_pchInputFile = cfg_InputFile.empty() ? NULL : strdup(cfg_InputFile.c_str());
 #endif
-
   m_pchBitstreamFile = cfg_BitstreamFile.empty() ? NULL : strdup(cfg_BitstreamFile.c_str());
-
 #if !H_MV
   m_pchReconFile = cfg_ReconFile.empty() ? NULL : strdup(cfg_ReconFile.c_str());
@@ -1465 +1457 @@
       Int*      m_numReorderPics     = m_numReorderPicsMvc    [layer]; // It is not a member, but this name helps avoiding code duplication !!!
 #endif
-
   /* if this is an intra-only sequence, ie IntraPeriod=1, don't verify the GOP structure
    * This permits the ability to omit a GOP structure specification */
@@ -1941 +1932 @@
   }
 #endif
-
 #if H_MV
   }

branches/HTM-DEV-0.1-dev/source/App/TAppEncoder/TAppEncTop.cpp

@@ -111 +111 @@
   }
 #endif
-
 #if H_MV
   xSetLayerIds             ( vps );   
@@ -185 +184 @@
 #endif
   m_cTEncTop.setPad                          ( m_aiPad );
-    
 #if H_MV
   m_cTEncTop.setMaxTempLayer                 ( m_maxTempLayerMvc[layer] );
@@ -727 +725 @@
  .
  */
-
 #if H_MV
 Void TAppEncTop::xGetBuffer( TComPicYuv*& rpcPicYuvRec, UInt layer)
@@ -755 +752 @@
 
   }
-
 #if H_MV
   m_picYuvRec[layer]->pushBack( rpcPicYuvRec );
@@ -765 +761 @@
 Void TAppEncTop::xDeleteBuffer( )
 {
-
 #if H_MV
   for(Int layer=0; layer<m_picYuvRec.size(); layer++)

branches/HTM-DEV-0.1-dev/source/Lib/TAppCommon/program_options_lite.h

@@ -282 +282 @@
     }
 #endif
-
     /** Option class for argument handling using a user provided function */
     struct OptionFunc : public OptionBase

branches/HTM-DEV-0.1-dev/source/Lib/TLibCommon/TComPic.cpp

@@ -481 +481 @@
 #endif
 
+
 //! \}

branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncSlice.cpp

@@ -414 +414 @@
   eSliceType = (pocLast == 0 || pocCurr % m_pcCfg->getIntraPeriod() == 0 || m_pcGOPEncoder->getGOPSize() == 0) ? I_SLICE : eSliceType;
 #endif
+
   rpcSlice->setSliceType        ( eSliceType );
 #endif

branches/HTM-DEV-0.1-dev/source/Lib/TLibEncoder/TEncTop.cpp

@@ -438 +438 @@
   m_iNumPicRcvd       = 0;
   m_uiNumAllPicCoded += iNumEncoded;
-
 #if H_MV
 }
 #endif
-
 }