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


Ignore:
Timestamp:
15 Apr 2016, 20:20:45 (9 years ago)
Author:
seregin
Message:

fix the output for picture size

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.cpp

    r1549 r1559  
    26532653  {
    26542654    Int& m_conformanceWindowMode    = m_apcLayerCfg[layer]->m_conformanceWindowMode;
    2655     UInt&  m_uiMaxCUHeight          = m_apcLayerCfg[layer]->m_uiMaxCUHeight;
     2655    UInt& m_uiMaxCUHeight           = m_apcLayerCfg[layer]->m_uiMaxCUHeight;
    26562656    UInt& m_uiMaxCUDepth            = m_apcLayerCfg[layer]->m_uiMaxCUDepth;
    26572657    ChromaFormat& m_chromaFormatIDC = m_apcLayerCfg[layer]->m_chromaFormatIDC;
    26582658
    2659 #if SCALABLE_REXT
    26602659    Int& m_confWinLeft              = m_apcLayerCfg[layer]->m_confWinLeft;
    26612660    Int& m_confWinRight             = m_apcLayerCfg[layer]->m_confWinRight;
    26622661    Int& m_confWinTop               = m_apcLayerCfg[layer]->m_confWinTop;
    26632662    Int& m_confWinBottom            = m_apcLayerCfg[layer]->m_confWinBottom;
    2664 #else
    2665     Int& m_confWinLeft              = m_apcLayerCfg[layer]->m_confWinLeft;
    2666     Int& m_confWinRight             = m_apcLayerCfg[layer]->m_confWinLeft;
    2667     Int& m_confWinTop               = m_apcLayerCfg[layer]->m_confWinLeft;
    2668     Int& m_confWinBottom            = m_apcLayerCfg[layer]->m_confWinLeft;
    2669 #endif
     2663
    26702664    Int* m_aiPad                    = m_apcLayerCfg[layer]->m_aiPad;
    26712665    Int*& m_aidQP                   = m_apcLayerCfg[layer]->m_aidQP;
     
    42564250    UInt& m_uiMaxCUDepth                   = m_apcLayerCfg[layerIdx]->m_uiMaxCUDepth;
    42574251
    4258 #if SCALABLE_REXT
    42594252    Int& m_confWinLeft                     = m_apcLayerCfg[layerIdx]->m_confWinLeft;
    42604253    Int& m_confWinRight                    = m_apcLayerCfg[layerIdx]->m_confWinRight;
    42614254    Int& m_confWinTop                      = m_apcLayerCfg[layerIdx]->m_confWinTop;
    42624255    Int& m_confWinBottom                   = m_apcLayerCfg[layerIdx]->m_confWinBottom;
    4263 #else
    4264     Int& m_confWinLeft                     = m_apcLayerCfg[layerIdx]->m_confWinLeft;
    4265     Int& m_confWinRight                    = m_apcLayerCfg[layerIdx]->m_confWinLeft;
    4266     Int& m_confWinTop                      = m_apcLayerCfg[layerIdx]->m_confWinLeft;
    4267     Int& m_confWinBottom                   = m_apcLayerCfg[layerIdx]->m_confWinLeft;
    4268 #endif
    42694256
    42704257    Int& m_iSourceWidth                    = m_apcLayerCfg[layerIdx]->m_iSourceWidth;
     
    43374324 
    43384325  printf("Reconstruction File                    : %s\n", m_reconFileName.c_str()          );
     4326#if SVC_EXTENSION
     4327  printf("Real     Format                        : %dx%d %gHz\n", m_iSourceWidth - ( m_confWinLeft + m_confWinRight ) * TComSPS::getWinUnitX( m_apcLayerCfg[layerIdx]->m_chromaFormatIDC ), m_iSourceHeight - ( m_confWinTop + m_confWinBottom ) * TComSPS::getWinUnitY( m_apcLayerCfg[layerIdx]->m_chromaFormatIDC ), (Double)m_iFrameRate/m_temporalSubsampleRatio );
     4328#else
    43394329  printf("Real     Format                        : %dx%d %gHz\n", m_iSourceWidth - m_confWinLeft - m_confWinRight, m_iSourceHeight - m_confWinTop - m_confWinBottom, (Double)m_iFrameRate/m_temporalSubsampleRatio );
     4330#endif
    43404331  printf("Internal Format                        : %dx%d %gHz\n", m_iSourceWidth, m_iSourceHeight, (Double)m_iFrameRate/m_temporalSubsampleRatio );
    43414332
Note: See TracChangeset for help on using the changeset viewer.