Changeset 711 in SHVCSoftware for branches


Ignore:
Timestamp:
20 Apr 2014, 22:16:29 (11 years ago)
Author:
seregin
Message:

remove decoder AVC BL size input

Location:
branches/SHM-6-dev/source
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • branches/SHM-6-dev/source/App/TAppDecoder/TAppDecCfg.cpp

    r595 r711  
    9292#if AVC_BASE
    9393  ("BLReconFile,-ibl",    cfg_BLReconFile,  string(""), "BL reconstructed YUV input file name")
     94#if !REPN_FORMAT_IN_VPS
    9495  ("BLSourceWidth,-wdt",    m_iBLSourceWidth,        0, "BL source picture width")
    9596  ("BLSourceHeight,-hgt",   m_iBLSourceHeight,       0, "BL source picture height")
     97#endif
    9698#if AVC_SYNTAX
    9799  ("BLSyntaxFile,-ibs",    cfg_BLSyntaxFile,  string(""), "BL syntax input file name") 

  • branches/SHM-6-dev/source/App/TAppDecoder/TAppDecCfg.h

    r595 r711  
    7474#if AVC_BASE
    7575  Char*         m_pchBLReconFile;                     ///< input BL reconstruction file name
     76#if !REPN_FORMAT_IN_VPS
    7677  Int           m_iBLSourceWidth;
    7778  Int           m_iBLSourceHeight;
     79#endif
    7880#if AVC_SYNTAX
    7981  Char*         m_pchBLSyntaxFile;                     ///< input BL syntax file name 
    … …  
    8486#if SYNTAX_OUTPUT
    8587  Char*         m_pchBLSyntaxFile;                     ///< input BL syntax file name
     88#if !REPN_FORMAT_IN_VPS
    8689  Int           m_iBLSourceWidth;
    8790  Int           m_iBLSourceHeight;
     91#endif
    8892  Int           m_iBLFrames;
    8993#endif
    … …  
    108112#if SVC_EXTENSION
    109113  , m_tgtLayerId(0)
    110 #if AVC_BASE
     114#if AVC_BASE && !REPN_FORMAT_IN_VPS
    111115  , m_iBLSourceWidth(0)
    112116  , m_iBLSourceHeight(0)

  • branches/SHM-6-dev/source/App/TAppDecoder/TAppDecTop.cpp

    r704 r711  
    163163  }
    164164  TComList<TComPic*> *cListPic = m_acTDecTop[0].getListPic();
     165#if AVC_SYNTAX || !REPN_FORMAT_IN_VPS
    165166  m_acTDecTop[0].setBLsize( m_iBLSourceWidth, m_iBLSourceHeight );
     167#endif
    166168  m_acTDecTop[0].setBLReconFile( &streamYUV );
    167169  pcBLPic.setLayerId( 0 );

  • branches/SHM-6-dev/source/Lib/TLibDecoder/TDecTop.h

    r698 r711  
    172172#if AVC_BASE
    173173  fstream*                m_pBLReconFile;
     174#if !REPN_FORMAT_IN_VPS
    174175  Int                     m_iBLSourceWidth;
    175   Int                     m_iBLSourceHeight; 
     176  Int                     m_iBLSourceHeight;
     177#endif
    176178#endif
    177179#if VPS_EXTN_DIRECT_REF_LAYERS
    … …  
    281283  Void      setBLReconFile( fstream* pFile ) { m_pBLReconFile = pFile; }
    282284  fstream*  getBLReconFile() { return m_pBLReconFile; }
     285#if !REPN_FORMAT_IN_VPS
    283286  Void      setBLsize( Int iWidth, Int iHeight ) { m_iBLSourceWidth = iWidth; m_iBLSourceHeight = iHeight; }
    284287  Int       getBLWidth() { return  m_iBLSourceWidth; }
    285288  Int       getBLHeight() { return  m_iBLSourceHeight; }
     289#endif
    286290#endif
    287291#if REPN_FORMAT_IN_VPS
Note: See TracChangeset for help on using the changeset viewer.