Changeset 1366 in SHVCSoftware for branches/SHM-dev/source/App

Timestamp:

22 Jul 2015, 04:32:08 (9 years ago)

Author:

seregin

Message:

port rev 4483 and fixes for previous revisions

Location:

branches/SHM-dev/source/App/TAppEncoder

Files:

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

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

@@ -109 +109 @@
 #if SVC_EXTENSION
 TAppEncCfg::TAppEncCfg()
-: m_pBitstreamFile()
+: m_pchBitstreamFile()
 #if AVC_BASE
 , m_nonHEVCBaseLayerFlag(0)
@@ -148 +148 @@
 TAppEncCfg::~TAppEncCfg()
 {
-#if SVC_EXTENSION
-  if( m_pBitstreamFile )
-  {
-    free(m_pBitstreamFile);
-    m_pBitstreamFile = NULL;
-  }
-#else  
+#if !SVC_EXTENSION
   if ( m_aidQP )
   {
@@ -176 +170 @@
 
   free(m_pchInputFile);
+#endif
   free(m_pchBitstreamFile);
-#endif
 #if !SVC_EXTENSION  
   free(m_pchReconFile);
@@ -1772 +1766 @@
   }
 #endif
-  m_pBitstreamFile = cfg_BitstreamFile.empty() ? NULL : strdup(cfg_BitstreamFile.c_str());
 #else //SVC_EXTENSION
   m_pchInputFile = cfg_InputFile.empty() ? NULL : strdup(cfg_InputFile.c_str());
+#endif
   m_pchBitstreamFile = cfg_BitstreamFile.empty() ? NULL : strdup(cfg_BitstreamFile.c_str());
+#if !SVC_EXTENSION
   m_pchReconFile = cfg_ReconFile.empty() ? NULL : strdup(cfg_ReconFile.c_str());
   m_pchdQPFile = cfg_dQPFile.empty() ? NULL : strdup(cfg_dQPFile.c_str());
@@ -4341 +4336 @@
   }
   printf("=== Common configuration settings === \n");
-  printf("Bitstream      File               : %s\n", m_pBitstreamFile      );
+  printf("Bitstream      File               : %s\n", m_pchBitstreamFile      );
 #else //SVC_EXTENSION
   printf("\n");

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

@@ -64 +64 @@
   Int       m_numLayers;                                      ///< number of layers
   Int       m_scalabilityMask[MAX_VPS_NUM_SCALABILITY_TYPES]; ///< scalability_mask
-  Char*     m_pBitstreamFile;                                 ///< output bitstream file
-  Double    m_adLambdaModifier[ MAX_TLAYER ];                 ///< Lambda modifier array for each temporal layer
-  // source specification
-  UInt      m_FrameSkip;                                      ///< number of skipped frames from the beginning
-  Int       m_framesToBeEncoded;                              ///< number of encoded frames
 #if AVC_BASE
   Int       m_nonHEVCBaseLayerFlag;                           ///< non HEVC BL
@@ -88 +83 @@
 #else
   Char*     m_pchInputFile;                                   ///< source file name
+#endif
   Char*     m_pchBitstreamFile;                               ///< output bitstream file
+#if !SVC_EXTENSION
   Char*     m_pchReconFile;                                   ///< output reconstruction file
+#endif
   Double    m_adLambdaModifier[ MAX_TLAYER ];                 ///< Lambda modifier array for each temporal layer
   // source specification
+#if !SVC_EXTENSION
   Int       m_iFrameRate;                                     ///< source frame-rates (Hz)
+#endif
   UInt      m_FrameSkip;                                   ///< number of skipped frames from the beginning
+#if !SVC_EXTENSION
   Int       m_iSourceWidth;                                   ///< source width in pixel
   Int       m_iSourceHeight;                                  ///< source height in pixel (when interlaced = field height)
@@ -110 +111 @@
   Int       m_confWinTop;
   Int       m_confWinBottom;
+#endif
   Int       m_framesToBeEncoded;                              ///< number of encoded frames
+#if !SVC_EXTENSION
   Int       m_aiPad[2];                                       ///< number of padded pixels for width and height
 #endif  

branches/SHM-dev/source/App/TAppEncoder/TAppEncTop.cpp

@@ -1680 +1680 @@
 Void TAppEncTop::encode()
 {
-  fstream bitstreamFile(m_pBitstreamFile, fstream::binary | fstream::out);
+  fstream bitstreamFile(m_pchBitstreamFile, fstream::binary | fstream::out);
   if (!bitstreamFile)
   {
-    fprintf(stderr, "\nfailed to open bitstream file `%s' for writing\n", m_pBitstreamFile);
+    fprintf(stderr, "\nfailed to open bitstream file `%s' for writing\n", m_pchBitstreamFile);
     exit(EXIT_FAILURE);
   }