Changeset 711 in SHVCSoftware for branches/SHM-6-dev/source/App

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/App/TAppDecoder

Files:

• TAppDecCfg.cpp (modified) (1 diff)
• TAppDecCfg.h (modified) (3 diffs)
• TAppDecTop.cpp (modified) (1 diff)

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

@@ -92 +92 @@
 #if AVC_BASE
   ("BLReconFile,-ibl",    cfg_BLReconFile,  string(""), "BL reconstructed YUV input file name")
+#if !REPN_FORMAT_IN_VPS
   ("BLSourceWidth,-wdt",    m_iBLSourceWidth,        0, "BL source picture width")
   ("BLSourceHeight,-hgt",   m_iBLSourceHeight,       0, "BL source picture height")
+#endif
 #if AVC_SYNTAX
   ("BLSyntaxFile,-ibs",    cfg_BLSyntaxFile,  string(""), "BL syntax input file name")  

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

@@ -74 +74 @@
 #if AVC_BASE
   Char*         m_pchBLReconFile;                     ///< input BL reconstruction file name
+#if !REPN_FORMAT_IN_VPS
   Int           m_iBLSourceWidth;
   Int           m_iBLSourceHeight;
+#endif
 #if AVC_SYNTAX
   Char*         m_pchBLSyntaxFile;                     ///< input BL syntax file name  
@@ -84 +86 @@
 #if SYNTAX_OUTPUT
   Char*         m_pchBLSyntaxFile;                     ///< input BL syntax file name
+#if !REPN_FORMAT_IN_VPS
   Int           m_iBLSourceWidth;
   Int           m_iBLSourceHeight;
+#endif
   Int           m_iBLFrames;
 #endif
@@ -108 +112 @@
 #if SVC_EXTENSION
   , m_tgtLayerId(0)
-#if AVC_BASE
+#if AVC_BASE && !REPN_FORMAT_IN_VPS
   , m_iBLSourceWidth(0)
   , m_iBLSourceHeight(0)

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

@@ -163 +163 @@
   }
   TComList<TComPic*> *cListPic = m_acTDecTop[0].getListPic();
+#if AVC_SYNTAX || !REPN_FORMAT_IN_VPS
   m_acTDecTop[0].setBLsize( m_iBLSourceWidth, m_iBLSourceHeight );
+#endif
   m_acTDecTop[0].setBLReconFile( &streamYUV );
   pcBLPic.setLayerId( 0 );