Changeset 56 in SHVCSoftware for branches/HM-10.0-dev-SHM/source/App/TAppEncoder

Timestamp:

4 Mar 2013, 23:18:12 (12 years ago)

Author:

seregin

Message:

Intra-BL porting

Location:

branches/HM-10.0-dev-SHM/source/App/TAppEncoder

Files:

• TAppEncCfg.cpp (modified) (3 diffs)
• TAppEncCfg.h (modified) (1 diff)

branches/HM-10.0-dev-SHM/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -94 +94 @@
 TAppEncCfg::~TAppEncCfg()
 {
-#if !SVC_EXTENSION
+#if SVC_EXTENSION
+  free(m_pBitstreamFile);
+#else
+  free(m_pchBitstreamFile);
   if ( m_aidQP )
   {
@@ -101 +104 @@
   free(m_pchInputFile);
 #endif
-  free(m_pBitstreamFile);
 #if !SVC_EXTENSION  
   free(m_pchReconFile);
@@ -653 +655 @@
 #else
   m_pchInputFile = cfg_InputFile.empty() ? NULL : strdup(cfg_InputFile.c_str());
-  m_phBitstreamFile = cfg_BitstreamFile.empty() ? NULL : strdup(cfg_BitstreamFile.c_str());
+  m_pchBitstreamFile = cfg_BitstreamFile.empty() ? NULL : strdup(cfg_BitstreamFile.c_str());
   m_pchReconFile = cfg_ReconFile.empty() ? NULL : strdup(cfg_ReconFile.c_str());
   m_pchdQPFile = cfg_dQPFile.empty() ? NULL : strdup(cfg_dQPFile.c_str());

branches/HM-10.0-dev-SHM/source/App/TAppEncoder/TAppEncCfg.h

@@ -60 +60 @@
 #if SVC_EXTENSION
   TAppEncLayerCfg m_acLayerCfg [MAX_LAYERS]; 
-  Int       m_numLayers;                                     ///< number of layers
+  Int       m_numLayers;                                      ///< number of layers
 
   Char*     m_pBitstreamFile;                                 ///< output bitstream file