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

Timestamp:

24 Jul 2015, 21:05:03 (9 years ago)

Author:

seregin

Message:

make scaling list layer-specific

Location:

branches/SHM-dev/source/App/TAppEncoder

Files:

• TAppEncCfg.cpp (modified) (10 diffs)
• TAppEncCfg.h (modified) (1 diff)
• TAppEncLayerCfg.cpp (modified) (3 diffs)
• TAppEncLayerCfg.h (modified) (2 diffs)
• TAppEncTop.cpp (modified) (1 diff)

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

@@ -119 +119 @@
 , m_snrInternalColourSpace(false)
 , m_outputInternalColourSpace(false)
-, m_scalingListFile()
 , m_elRapSliceBEnabled(0)
 {
@@ -172 +171 @@
   free(m_pchReconFile);
   free(m_pchdQPFile);
-#endif
   free(m_scalingListFile);
+#endif
 }
 
@@ -900 +899 @@
   Int*    cfg_layerSwitchOffEnd[MAX_LAYERS];
   Int*    cfg_layerPTLIdx[MAX_VPS_LAYER_IDX_PLUS1];
+  string  cfg_ScalingListFile[MAX_LAYERS];
+  ScalingListMode*   cfg_UseScalingListId[MAX_LAYERS];
 
   for( UInt layer = 0; layer < m_numLayers; layer++ )
@@ -989 +990 @@
     cfg_layerSwitchOffBegin[layer]  = &m_apcLayerCfg[layer]->m_layerSwitchOffBegin;
     cfg_layerSwitchOffEnd[layer]    = &m_apcLayerCfg[layer]->m_layerSwitchOffEnd;
-    cfg_layerPTLIdx[layer]          = &m_apcLayerCfg[layer]->m_layerPTLIdx; 
+    cfg_layerPTLIdx[layer]          = &m_apcLayerCfg[layer]->m_layerPTLIdx;
+
+    cfg_UseScalingListId[layer]     = &m_apcLayerCfg[layer]->m_useScalingListId;
   }
 
@@ -1025 +1028 @@
   string cfg_colourRemapSEIFileRoot;
 #endif
+  string cfg_ScalingListFile;
 #endif //SVC_EXTENSION
-  string cfg_ScalingListFile;
 
   Int tmpChromaFormat;
@@ -1459 +1462 @@
 #if SVC_EXTENSION
   ("WaveFrontSynchro%d",                              cfg_waveFrontSynchro,                   0,  m_numLayers, "0: no synchro; 1 synchro with TR; 2 TRR etc")
+  ("ScalingList%d",                                   cfg_UseScalingListId,     SCALING_LIST_OFF, m_numLayers, "0/off: no scaling list, 1/default: default scaling lists, 2/file: scaling lists specified in ScalingListFile")
+  ("ScalingListFile%d",                               cfg_ScalingListFile,            string(""), m_numLayers, "Scaling list file name. Use an empty string to produce help.")
 #else
   ("WaveFrontSynchro",                                m_iWaveFrontSynchro,                                  0, "0: no synchro; 1 synchro with top-right-right")
-#endif
   ("ScalingList",                                     m_useScalingListId,                    SCALING_LIST_OFF, "0/off: no scaling list, 1/default: default scaling lists, 2/file: scaling lists specified in ScalingListFile")
   ("ScalingListFile",                                 cfg_ScalingListFile,                         string(""), "Scaling list file name. Use an empty string to produce help.")
+#endif
   ("SignHideFlag,-SBH",                               m_signHideFlag,                                    true)
   ("MaxNumMergeCand",                                 m_maxNumMergeCand,                                   5u, "Maximum number of merge candidates")
@@ -1897 +1902 @@
     m_tileRowHeight.clear();
   }
-
-  m_scalingListFile = cfg_ScalingListFile.empty() ? NULL : strdup(cfg_ScalingListFile.c_str());
-
-
-  
+    
   /* rules for input, output and internal bitdepths as per help text */
 #if SVC_EXTENSION
   for( Int layer = 0; layer < m_numLayers; layer++ )
   {
+    m_apcLayerCfg[layer]->m_scalingListFile = cfg_ScalingListFile[layer].empty() ? NULL : strdup(cfg_ScalingListFile[layer].c_str());
+
     if( m_apcLayerCfg[layer]->m_layerId < 0 )
     {
@@ -2026 +2029 @@
   }
 #else
+  m_scalingListFile = cfg_ScalingListFile.empty() ? NULL : strdup(cfg_ScalingListFile.c_str());
+
  /* rules for input, output and internal bitdepths as per help text */
   if (m_MSBExtendedBitDepth[CHANNEL_TYPE_LUMA  ] == 0)
@@ -4379 +4384 @@
   }
   printf("=== Common configuration settings === \n");
-  printf("Bitstream      File               : %s\n", m_pchBitstreamFile      );
+  printf("Bitstream File                         : %s\n", m_pchBitstreamFile      );
 #else //SVC_EXTENSION
   printf("\n");
@@ -4563 +4568 @@
   printf(" WaveFrontSynchro:%d WaveFrontSubstreams:%d",
           m_iWaveFrontSynchro, iWaveFrontSubstreams);
-#endif
   printf(" ScalingList:%d ", m_useScalingListId );
+#endif
   printf("TMVPMode:%d ", m_TMVPModeId     );
 #if ADAPTIVE_QP_SELECTION

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

@@ -400 +400 @@
   Bool      m_RCForceIntraQP;                     ///< force all intra picture to use initial QP or not
 #endif
+#if !SVC_EXTENSION
   ScalingListMode m_useScalingListId;                         ///< using quantization matrix
   Char*     m_scalingListFile;                                ///< quantization matrix file name
+#endif
 
   Bool      m_TransquantBypassEnableFlag;                     ///< transquant_bypass_enable_flag setting in PPS.

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

@@ -42 +42 @@
 #if SVC_EXTENSION
 TAppEncLayerCfg::TAppEncLayerCfg()
-  :m_cInputFile(string("")),
-  m_cReconFile(string("")),
-  m_conformanceMode( 0 ),
-  m_aidQP(NULL),
-  m_repFormatIdx (-1)
-#if Q0074_COLOUR_REMAPPING_SEI
-,  m_colourRemapSEIFileRoot(string(""))
+: m_cInputFile(string(""))
+, m_cReconFile(string(""))
+, m_conformanceMode( 0 )
+, m_scalingListFile(NULL)
+, m_aidQP(NULL)
+, m_repFormatIdx(-1)
+#if Q0074_COLOUR_REMAPPING_SEI
+, m_colourRemapSEIFileRoot(string(""))
 #endif
 {
@@ -108 +109 @@
   }
 #endif
+  free(m_scalingListFile);
 }
 
@@ -270 +272 @@
   const Int iWaveFrontSubstreams = m_waveFrontSynchro ? (m_iSourceHeight + m_uiMaxCUHeight - 1) / m_uiMaxCUHeight : 1;
   printf("WaveFrontSubstreams               : %d\n", iWaveFrontSubstreams);
-  printf("PCM                               : %d ", (m_cAppEncCfg->getUsePCM() && (1<<m_cAppEncCfg->getPCMLog2MinSize()) <= m_uiMaxCUWidth)? 1 : 0);
+  printf("ScalingList                       : %d\n", m_useScalingListId );
+  printf("PCM                               : %d\n", (m_cAppEncCfg->getUsePCM() && (1<<m_cAppEncCfg->getPCMLog2MinSize()) <= m_uiMaxCUWidth)? 1 : 0);
 }
 

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

@@ -87 +87 @@
 #endif
 
+  ScalingListMode m_useScalingListId;                         ///< using quantization matrix
+  Char*     m_scalingListFile;                                ///< quantization matrix file name
+
   Int       m_maxTidIlRefPicsPlus1;
   Int       m_waveFrontSynchro;                   ///< 0: no WPP. >= 1: WPP is enabled, the "Top right" from which inheritance occurs is this LCU offset in the line above the current.
@@ -92 +95 @@
 
   Int       m_iQP;                                            ///< QP value of key-picture (integer)
-  char*     m_pchdQPFile;                                     ///< QP offset for each slice (initialized from external file)
+  Char*     m_pchdQPFile;                                     ///< QP offset for each slice (initialized from external file)
   Int*      m_aidQP;                                          ///< array of slice QP values
   TAppEncCfg* m_cAppEncCfg;                                   ///< pointer to app encoder config

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

@@ -487 +487 @@
     Int           m_RCInitialQP                                = m_apcLayerCfg[layer]->getRCInitialQP();
     Bool          m_RCForceIntraQP                             = m_apcLayerCfg[layer]->getRCForceIntraQP();
+
+    ScalingListMode m_useScalingListId                         = m_apcLayerCfg[layer]->m_useScalingListId;
+    Char*         m_scalingListFile                            = m_apcLayerCfg[layer]->m_scalingListFile;
 #endif