Changeset 1447 in SHVCSoftware for branches


Ignore:
Timestamp:
13 Aug 2015, 20:44:52 (9 years ago)
Author:
seregin
Message:

fix printing out layerId

Location:
branches/SHM-dev/source
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r1442 r1447  
    17081708  for(layer = 0; layer < m_numLayers; layer++)
    17091709  {
     1710    const UInt layerId = m_apcTEncTop[layer]->getVPS()->getLayerIdInNuh(layer);
    17101711    const BitDepths bitDepths(m_apcLayerCfg[layer]->m_internalBitDepth[CHANNEL_TYPE_LUMA], m_apcLayerCfg[layer]->m_internalBitDepth[CHANNEL_TYPE_CHROMA]);   
    1711     m_apcTEncTop[layer]->getAnalyzeAll()->printOut('a', m_apcLayerCfg[layer]->m_chromaFormatIDC, printMSEBasedSNR, printSequenceMSE, bitDepths, layer);
     1712    m_apcTEncTop[layer]->getAnalyzeAll()->printOut('a', m_apcLayerCfg[layer]->m_chromaFormatIDC, printMSEBasedSNR, printSequenceMSE, bitDepths, layerId);
    17121713  }
    17131714
    … …  
    17151716  for(layer = 0; layer < m_numLayers; layer++)
    17161717  {
     1718    const UInt layerId = m_apcTEncTop[layer]->getVPS()->getLayerIdInNuh(layer);
    17171719    const BitDepths bitDepths(m_apcLayerCfg[layer]->m_internalBitDepth[CHANNEL_TYPE_LUMA], m_apcLayerCfg[layer]->m_internalBitDepth[CHANNEL_TYPE_CHROMA]);
    1718     m_apcTEncTop[layer]->getAnalyzeI()->printOut('i', m_apcLayerCfg[layer]->m_chromaFormatIDC, printMSEBasedSNR, printSequenceMSE, bitDepths, layer);
     1720    m_apcTEncTop[layer]->getAnalyzeI()->printOut('i', m_apcLayerCfg[layer]->m_chromaFormatIDC, printMSEBasedSNR, printSequenceMSE, bitDepths, layerId);
    17191721  }
    17201722
    … …  
    17221724  for(layer = 0; layer < m_numLayers; layer++)
    17231725  {
     1726    const UInt layerId = m_apcTEncTop[layer]->getVPS()->getLayerIdInNuh(layer);
    17241727    const BitDepths bitDepths(m_apcLayerCfg[layer]->m_internalBitDepth[CHANNEL_TYPE_LUMA], m_apcLayerCfg[layer]->m_internalBitDepth[CHANNEL_TYPE_CHROMA]);
    1725     m_apcTEncTop[layer]->getAnalyzeP()->printOut('p', m_apcLayerCfg[layer]->m_chromaFormatIDC, printMSEBasedSNR, printSequenceMSE, bitDepths, layer);
     1728    m_apcTEncTop[layer]->getAnalyzeP()->printOut('p', m_apcLayerCfg[layer]->m_chromaFormatIDC, printMSEBasedSNR, printSequenceMSE, bitDepths, layerId);
    17261729  }
    17271730
    … …  
    17291732  for(layer = 0; layer < m_numLayers; layer++)
    17301733  {
     1734    const UInt layerId = m_apcTEncTop[layer]->getVPS()->getLayerIdInNuh(layer);
    17311735    const BitDepths bitDepths(m_apcLayerCfg[layer]->m_internalBitDepth[CHANNEL_TYPE_LUMA], m_apcLayerCfg[layer]->m_internalBitDepth[CHANNEL_TYPE_CHROMA]);
    1732     m_apcTEncTop[layer]->getAnalyzeB()->printOut('b', m_apcLayerCfg[layer]->m_chromaFormatIDC, printMSEBasedSNR, printSequenceMSE, bitDepths, layer);
     1736    m_apcTEncTop[layer]->getAnalyzeB()->printOut('b', m_apcLayerCfg[layer]->m_chromaFormatIDC, printMSEBasedSNR, printSequenceMSE, bitDepths, layerId);
    17331737  }
    17341738
    … …  
    17591763    for(layer = 0; layer < m_numLayers; layer++)
    17601764    {
     1765      const UInt layerId = m_apcTEncTop[layer]->getVPS()->getLayerIdInNuh(layer);
    17611766      const BitDepths bitDepths(m_apcLayerCfg[layer]->m_internalBitDepth[CHANNEL_TYPE_LUMA], m_apcLayerCfg[layer]->m_internalBitDepth[CHANNEL_TYPE_CHROMA]);
    17621767      TEncAnalyze *analyze = m_apcTEncTop[layer]->getAnalyzeAllin();
    … …  
    17681773
    17691774      printf( "\n\nSUMMARY INTERLACED ---------------------------------------------\n" );
    1770       analyze->printOut('a', m_apcLayerCfg[layer]->m_chromaFormatIDC, printMSEBasedSNR, printSequenceMSE, bitDepths, layer);
     1775      analyze->printOut('a', m_apcLayerCfg[layer]->m_chromaFormatIDC, printMSEBasedSNR, printSequenceMSE, bitDepths, layerId);
    17711776
    17721777      if (!m_apcTEncTop[layer]->getSummaryOutFilename().empty())
    … …  
    17801785  for( layer = 0; layer < m_numLayers; layer++ )
    17811786  {
    1782     printf("RVM[L%d]: %.3lf\n", layer, m_apcTEncTop[layer]->calculateRVM());
     1787    const UInt layerId = m_apcTEncTop[layer]->getVPS()->getLayerIdInNuh(layer);
     1788    printf("RVM[L%d]: %.3lf\n", layerId, m_apcTEncTop[layer]->calculateRVM());
    17831789  }
    17841790  printf("\n");

  • branches/SHM-dev/source/Lib/TLibEncoder/TEncAnalyze.h

    r1442 r1447  
    137137
    138138#if SVC_EXTENSION
    139   Void    printOut ( TChar cDelim, const ChromaFormat chFmt, const Bool printMSEBasedSNR, const Bool printSequenceMSE, const BitDepths &bitDepths, UInt layer = 0 )
     139  Void    printOut ( TChar cDelim, const ChromaFormat chFmt, const Bool printMSEBasedSNR, const Bool printSequenceMSE, const BitDepths &bitDepths, UInt layerId = 0 )
    140140#else
    141141  Void    printOut ( TChar cDelim, const ChromaFormat chFmt, const Bool printMSEBasedSNR, const Bool printSequenceMSE, const BitDepths &bitDepths )
    … …  
    173173        {
    174174#if SVC_EXTENSION
    175           if( layer == 0 )
     175          if( layerId == 0 )
    176176          {
    177177#endif
    … …  
    192192
    193193          printf( "Average:  L%d \t %8d    %c "          "%12.4lf  "    "%8.4lf",
    194                  layer,
     194                 layerId,
    195195
    196196#else
    … …  
    212212#if SVC_EXTENSION
    213213          printf( "From MSE:  L%d \t %8d    %c "          "%12.4lf  "    "%8.4lf\n",
    214                  layer,
     214                 layerId,
    215215#else
    216216          printf( "From MSE:\t %8d    %c "          "%12.4lf  "    "%8.4lf\n",
    … …  
    236236#if SVC_EXTENSION
    237237          printf( "  L%d \t %8d    %c "          "%12.4lf  "    "%8.4lf",
    238                  layer,
     238                 layerId,
    239239#else
    240240          printf( "\t %8d    %c "          "%12.4lf  "    "%8.4lf",
    … …  
    266266          {
    267267#if SVC_EXTENSION
    268             if( layer == 0 )
     268            if( layerId == 0 )
    269269            {
    270270#endif
    … …  
    284284            }
    285285            printf( "Average:  L%d \t %8d    %c "          "%12.4lf  "    "%8.4lf  "   "%8.4lf  "    "%8.4lf  "   "%8.4lf",
    286                    layer,
     286                   layerId,
    287287#else
    288288            printf( "Average: \t %8d    %c "          "%12.4lf  "    "%8.4lf  "   "%8.4lf  "    "%8.4lf  "   "%8.4lf",
    … …  
    310310#if SVC_EXTENSION
    311311            printf( "From MSE:  L%d \t %8d    %c "          "%12.4lf  "    "%8.4lf  "   "%8.4lf  "    "%8.4lf  "   "%8.4lf\n",
    312                    layer,
     312                   layerId,
    313313#else
    314314            printf( "From MSE:\t %8d    %c "          "%12.4lf  "    "%8.4lf  "   "%8.4lf  "    "%8.4lf  "   "%8.4lf\n",
    … …  
    324324          {
    325325#if SVC_EXTENSION
    326             if( layer == 0 )
     326            if( layerId == 0 )
    327327            {
    328328#endif
    … …  
    342342            }
    343343            printf( "  L%d \t %8d    %c "          "%12.4lf  "    "%8.4lf  "   "%8.4lf  "    "%8.4lf  "   "%8.4lf",
    344                    layer,
     344                   layerId,
    345345#else
    346346            printf( "\t %8d    %c "          "%12.4lf  "    "%8.4lf  "   "%8.4lf  "    "%8.4lf  "   "%8.4lf",
Note: See TracChangeset for help on using the changeset viewer.