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

Timestamp:

13 Aug 2015, 20:44:52 (9 years ago)

Author:

seregin

Message:

fix printing out layerId

File:

• branches/SHM-dev/source/App/TAppEncoder/TAppEncTop.cpp (modified) (7 diffs)

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

@@ -1708 +1708 @@
   for(layer = 0; layer < m_numLayers; layer++)
   {
+    const UInt layerId = m_apcTEncTop[layer]->getVPS()->getLayerIdInNuh(layer);
     const BitDepths bitDepths(m_apcLayerCfg[layer]->m_internalBitDepth[CHANNEL_TYPE_LUMA], m_apcLayerCfg[layer]->m_internalBitDepth[CHANNEL_TYPE_CHROMA]);    
-    m_apcTEncTop[layer]->getAnalyzeAll()->printOut('a', m_apcLayerCfg[layer]->m_chromaFormatIDC, printMSEBasedSNR, printSequenceMSE, bitDepths, layer);
+    m_apcTEncTop[layer]->getAnalyzeAll()->printOut('a', m_apcLayerCfg[layer]->m_chromaFormatIDC, printMSEBasedSNR, printSequenceMSE, bitDepths, layerId);
   }
 
@@ -1715 +1716 @@
   for(layer = 0; layer < m_numLayers; layer++)
   {
+    const UInt layerId = m_apcTEncTop[layer]->getVPS()->getLayerIdInNuh(layer);
     const BitDepths bitDepths(m_apcLayerCfg[layer]->m_internalBitDepth[CHANNEL_TYPE_LUMA], m_apcLayerCfg[layer]->m_internalBitDepth[CHANNEL_TYPE_CHROMA]);
-    m_apcTEncTop[layer]->getAnalyzeI()->printOut('i', m_apcLayerCfg[layer]->m_chromaFormatIDC, printMSEBasedSNR, printSequenceMSE, bitDepths, layer);
+    m_apcTEncTop[layer]->getAnalyzeI()->printOut('i', m_apcLayerCfg[layer]->m_chromaFormatIDC, printMSEBasedSNR, printSequenceMSE, bitDepths, layerId);
   }
 
@@ -1722 +1724 @@
   for(layer = 0; layer < m_numLayers; layer++)
   {
+    const UInt layerId = m_apcTEncTop[layer]->getVPS()->getLayerIdInNuh(layer);
     const BitDepths bitDepths(m_apcLayerCfg[layer]->m_internalBitDepth[CHANNEL_TYPE_LUMA], m_apcLayerCfg[layer]->m_internalBitDepth[CHANNEL_TYPE_CHROMA]);
-    m_apcTEncTop[layer]->getAnalyzeP()->printOut('p', m_apcLayerCfg[layer]->m_chromaFormatIDC, printMSEBasedSNR, printSequenceMSE, bitDepths, layer);
+    m_apcTEncTop[layer]->getAnalyzeP()->printOut('p', m_apcLayerCfg[layer]->m_chromaFormatIDC, printMSEBasedSNR, printSequenceMSE, bitDepths, layerId);
   }
 
@@ -1729 +1732 @@
   for(layer = 0; layer < m_numLayers; layer++)
   {
+    const UInt layerId = m_apcTEncTop[layer]->getVPS()->getLayerIdInNuh(layer);
     const BitDepths bitDepths(m_apcLayerCfg[layer]->m_internalBitDepth[CHANNEL_TYPE_LUMA], m_apcLayerCfg[layer]->m_internalBitDepth[CHANNEL_TYPE_CHROMA]);
-    m_apcTEncTop[layer]->getAnalyzeB()->printOut('b', m_apcLayerCfg[layer]->m_chromaFormatIDC, printMSEBasedSNR, printSequenceMSE, bitDepths, layer);
+    m_apcTEncTop[layer]->getAnalyzeB()->printOut('b', m_apcLayerCfg[layer]->m_chromaFormatIDC, printMSEBasedSNR, printSequenceMSE, bitDepths, layerId);
   }
 
@@ -1759 +1763 @@
     for(layer = 0; layer < m_numLayers; layer++)
     {
+      const UInt layerId = m_apcTEncTop[layer]->getVPS()->getLayerIdInNuh(layer);
       const BitDepths bitDepths(m_apcLayerCfg[layer]->m_internalBitDepth[CHANNEL_TYPE_LUMA], m_apcLayerCfg[layer]->m_internalBitDepth[CHANNEL_TYPE_CHROMA]);
       TEncAnalyze *analyze = m_apcTEncTop[layer]->getAnalyzeAllin();
@@ -1768 +1773 @@
 
       printf( "\n\nSUMMARY INTERLACED ---------------------------------------------\n" );
-      analyze->printOut('a', m_apcLayerCfg[layer]->m_chromaFormatIDC, printMSEBasedSNR, printSequenceMSE, bitDepths, layer);
+      analyze->printOut('a', m_apcLayerCfg[layer]->m_chromaFormatIDC, printMSEBasedSNR, printSequenceMSE, bitDepths, layerId);
 
       if (!m_apcTEncTop[layer]->getSummaryOutFilename().empty())
@@ -1780 +1785 @@
   for( layer = 0; layer < m_numLayers; layer++ )
   {
-    printf("RVM[L%d]: %.3lf\n", layer, m_apcTEncTop[layer]->calculateRVM());
+    const UInt layerId = m_apcTEncTop[layer]->getVPS()->getLayerIdInNuh(layer);
+    printf("RVM[L%d]: %.3lf\n", layerId, m_apcTEncTop[layer]->calculateRVM());
   }
   printf("\n");