Changeset 364 in 3DVCSoftware for branches/HTM-DEV-0.1-dev/source/App/TAppEncoder/TAppEncCfg.cpp

Timestamp:

3 May 2013, 16:34:51 (12 years ago)

Author:

tech

Message:

Further cleanups

File:

• branches/HTM-DEV-0.1-dev/source/App/TAppEncoder/TAppEncCfg.cpp (modified) (14 diffs)

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

@@ -107 +107 @@
     delete[] m_aidQP;
   }
-  free(m_pchInputFile);
 #endif
 #if J0149_TONE_MAPPING_SEI
@@ -126 +125 @@
   }
 #endif
+#if !H_MV
+  free(m_pchInputFile);
+#endif
   free(m_pchBitstreamFile);
-
 #if H_MV
   for(Int i = 0; i< m_pchReconFileList.size(); i++ )
@@ -137 +138 @@
   free(m_pchReconFile);
 #endif
-
   free(m_pchdQPFile);
   free(m_pColumnWidth);
@@ -337 +337 @@
 #endif 
 #endif
-
   string cfg_dQPFile;
   string cfg_ColumnWidth;
@@ -361 +360 @@
   
   // File, I/O and source parameters
-
 #if H_MV
   ("InputFile_%d,i_%d",       m_pchInputFileList,       (char *) 0 , MAX_NUM_LAYER_IDS , "original Yuv input file name %d")
@@ -367 +365 @@
   ("InputFile,i",           cfg_InputFile,     string(""), "Original YUV input file name")
 #endif
-
   ("BitstreamFile,b",       cfg_BitstreamFile, string(""), "Bitstream output file name")
-
 #if H_MV
   ("ReconFile_%d,o_%d",       m_pchReconFileList,       (char *) 0 , MAX_NUM_LAYER_IDS , "reconstructed Yuv output file name %d")
@@ -375 +371 @@
   ("ReconFile,o",           cfg_ReconFile,     string(""), "Reconstructed YUV output file name")
 #endif
-
 #if H_MV
   ("NumberOfLayers",        m_numberOfLayers     , 1,                     "Number of layers")
@@ -413 +408 @@
 
   // Profile and level
-
   ("Profile", m_profile,   Profile::NONE, "Profile to be used when encoding (Incomplete)")
   ("Level",   m_level,     Level::NONE,   "Level limit to be used, eg 5.1 (Incomplete)")
@@ -730 +724 @@
   }
 #endif
-
   po::setDefaults(opts);
   const list<const Char*>& argv_unhandled = po::scanArgv(opts, argc, (const Char**) argv);
@@ -760 +753 @@
   m_pchReconFile = cfg_ReconFile.empty() ? NULL : strdup(cfg_ReconFile.c_str());
 #endif
-
   m_pchdQPFile = cfg_dQPFile.empty() ? NULL : strdup(cfg_dQPFile.c_str());
   
@@ -824 +816 @@
   free ( pRowHeight   ); 
 #endif
-
 #if SIGNAL_BITRATE_PICRATE_IN_VPS
   readBoolString(cfg_bitRateInfoPresentFlag, m_bitRatePicRateMaxTLayers, m_bitRateInfoPresentFlag, "bit rate info. present flag" );
@@ -1142 +1133 @@
   xConfirmPara( m_iFrameRate <= 0,                                                          "Frame rate must be more than 1" );
   xConfirmPara( m_framesToBeEncoded <= 0,                                                   "Total Number Of Frames encoded must be more than 0" );
-
 #if H_MV
   xConfirmPara( m_numberOfLayers > MAX_NUM_LAYER_IDS ,                                      "NumberOfLayers must be less than or equal to MAX_NUM_LAYER_IDS");
@@ -1155 +1145 @@
   xConfirmPara( m_scalabilityMask != 1 , "Scalability Mask must be equal to 1. ");
 #endif
-  
+ 
   m_dimIds.push_back( m_viewId ); 
 #if H_3D
@@ -1212 +1202 @@
 
 #endif
-
-
   xConfirmPara( m_iGOPSize < 1 ,                                                            "GOP Size must be greater or equal to 1" );
   xConfirmPara( m_iGOPSize > 1 &&  m_iGOPSize % 2,                                          "GOP Size must be a multiple of 2, if GOP Size is greater than 1" );