Changeset 38 in SHVCSoftware for branches/SHM-1.1-dev/source/App/TAppEncoder/TAppEncCfg.cpp

Timestamp:

20 Feb 2013, 21:24:20 (12 years ago)

Author:

seregin

Message:

AVC_SYNTAX: initial porting of the AVC metadata file reading

File:

• branches/SHM-1.1-dev/source/App/TAppEncoder/TAppEncCfg.cpp (modified) (5 diffs)

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

@@ -229 +229 @@
     cfg_CroppingMode[layer] = &m_acLayerCfg[layer].m_croppingMode;
   }
+#if AVC_SYNTAX
+  string  cfg_BLSyntaxFile;
+#endif
 #else
   string cfg_InputFile;
@@ -259 +262 @@
   ("InternalBitDepth",        m_uiInternalBitDepth, 0u, "Internal bit-depth (BitDepth+BitIncrement)")
 #if AVC_BASE
-  ("InputBLFile,-ibl",        *cfg_InputFile[0],     string(""), "Original BL rec YUV input file name")
+  ("InputBLFile,-ibl",        *cfg_InputFile[0],     string(""), "Base layer rec YUV input file name")
+#if AVC_SYNTAX
+  ("InputBLSyntaxFile,-ibs",  cfg_BLSyntaxFile,     string(""), "Base layer syntax input file name")
+#endif
 #endif
 #if REF_IDX_FRAMEWORK
@@ -516 +522 @@
 #if SVC_EXTENSION
   m_pchBitstreamFile = cfg_BitstreamFile.empty() ? NULL : strdup(cfg_BitstreamFile.c_str());
+#if AVC_SYNTAX
+  m_BLSyntaxFile = cfg_BLSyntaxFile.empty() ? NULL : strdup(cfg_BLSyntaxFile.c_str());
+#endif
 #else
   m_pchInputFile = cfg_InputFile.empty() ? NULL : strdup(cfg_InputFile.c_str());
@@ -1308 +1317 @@
   printf("RecalQP:%d ", m_recalculateQPAccordingToLambda ? 1 : 0 );
 #endif
+  printf("AVC_BASE:%d ", AVC_BASE);
 #if REF_IDX_FRAMEWORK
   printf("REF_IDX_FRAMEWORK:%d ", REF_IDX_FRAMEWORK);
@@ -1313 +1323 @@
   printf("REF_IDX_ME_AROUND_ZEROMV:%d ", REF_IDX_ME_AROUND_ZEROMV);
   printf("REF_IDX_ME_ZEROMV: %d", REF_IDX_ME_ZEROMV);
-#else
+#elif INTRA_BL
   printf("INTRA_BL:%d ", INTRA_BL);
-  printf("AVC_BASE:%d ", AVC_BASE);
 #if !AVC_BASE
   printf("SVC_MVP:%d ", SVC_MVP );