Changeset 244 in SHVCSoftware for branches/SHM-2.1-dev/source/App/TAppEncoder

Timestamp:

29 May 2013, 23:43:53 (12 years ago)

Author:

seregin

Message:

add config parameter for scalability_mask

Location:

branches/SHM-2.1-dev/source/App/TAppEncoder

Files:

• TAppEncCfg.cpp (modified) (1 diff)
• TAppEncCfg.h (modified) (1 diff)
• TAppEncTop.cpp (modified) (1 diff)

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

@@ -424 +424 @@
   ("NumLayers",               m_numLayers, 1, "Number of layers to code")
   ("ConformanceMode%d",       cfg_conformanceMode,0, MAX_LAYERS, "Window conformance mode (0: no cropping, 1:automatic padding, 2: padding, 3:cropping")
-
+  ("ScalabilityMask",       m_scalabilityMask, 1, "scalability_mask")
   ("BitstreamFile,b",       cfg_BitstreamFile, string(""), "Bitstream output file name")
   ("InputBitDepth",         m_inputBitDepthY,    8, "Bit-depth of input file")

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

@@ -61 +61 @@
   TAppEncLayerCfg m_acLayerCfg [MAX_LAYERS]; 
   Int       m_numLayers;                                      ///< number of layers
-
+  Int       m_scalabilityMask;                                ///< scalability_mask
   Char*     m_pBitstreamFile;                                 ///< output bitstream file
   Double    m_adLambdaModifier[ MAX_TLAYER ];                 ///< Lambda modifier array for each temporal layer

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

@@ -844 +844 @@
   if(m_numLayers > 1) 
   {
-    vps->setScalabilityMask(1, true); // Only turn on spatial/SNR scalability
+    vps->setScalabilityMask(m_scalabilityMask, true);
     vps->setNumScalabilityTypes(1);
   }