Changeset 38 in SHVCSoftware for branches/SHM-1.1-dev/source/App/TAppDecoder

Timestamp:

20 Feb 2013, 21:24:20 (12 years ago)

Author:

seregin

Message:

AVC_SYNTAX: initial porting of the AVC metadata file reading

Location:

branches/SHM-1.1-dev/source/App/TAppDecoder

Files:

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

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

@@ -75 +75 @@
   string cfg_ReconFile;
 #endif
+#if AVC_SYNTAX || SYNTAX_OUTPUT
+  string cfg_BLSyntaxFile;
+#endif
 #if TARGET_DECLAYERID_SET
   string cfg_TargetDecLayerIdSetFile;
@@ -90 +93 @@
   ("BLSourceWidth,-wdt",    m_iBLSourceWidth,        0, "BL source picture width")
   ("BLSourceHeight,-hgt",   m_iBLSourceHeight,       0, "BL source picture height")
+#if AVC_SYNTAX
+  ("BLSyntaxFile,-ibs",    cfg_BLSyntaxFile,  string(""), "BL syntax input file name")  
+#endif
 #endif
 #else
   ("ReconFile,o",     cfg_ReconFile,     string(""), "reconstructed YUV output file name\n"
                                                      "YUV writing is skipped if omitted")
+#endif
+#if SYNTAX_OUTPUT
+  ("BLSyntaxFile,-ibs",    cfg_BLSyntaxFile,  string(""), "BL syntax input file name")
+  ("BLSourceWidth,-wdt",    m_iBLSourceWidth,        0, "BL source picture width")
+  ("BLSourceHeight,-hgt",   m_iBLSourceHeight,       0, "BL source picture height")
+  ("BLFrames,-fr",          m_iBLFrames,       0, "BL number of frames")
 #endif
   ("SkipFrames,s", m_iSkipFrame, 0, "number of frames to skip before random access")
@@ -138 +150 @@
 #else
   m_pchReconFile = cfg_ReconFile.empty() ? NULL : strdup(cfg_ReconFile.c_str());
+#endif
+#if AVC_SYNTAX || SYNTAX_OUTPUT
+  m_pchBLSyntaxFile = cfg_BLSyntaxFile.empty() ? NULL : strdup(cfg_BLSyntaxFile.c_str());
 #endif
 

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

@@ -66 +66 @@
   Int           m_iBLSourceWidth;
   Int           m_iBLSourceHeight;
+#if AVC_SYNTAX
+  char*         m_pchBLSyntaxFile;                     ///< input BL syntax file name  
+#endif
 #endif
 #else
   char*         m_pchReconFile;                       ///< output reconstruction file name
+#endif
+#if SYNTAX_OUTPUT
+  char*         m_pchBLSyntaxFile;                     ///< input BL syntax file name
+  Int           m_iBLSourceWidth;
+  Int           m_iBLSourceHeight;
+  Int           m_iBLFrames;
 #endif
   Int           m_iSkipFrame;                         ///< counter for frames prior to the random access point to skip

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

@@ -102 +102 @@
   }
 #endif
+#if AVC_SYNTAX || SYNTAX_OUTPUT
+  if( m_pchBLSyntaxFile )
+  {
+    free ( m_pchBLSyntaxFile );
+    m_pchBLSyntaxFile = NULL;
+  }
+#endif
 }
 
@@ -147 +154 @@
 #if AVC_BASE
   TComPic pcBLPic;
-  FILE* pFile = fopen( m_pchBLReconFile, "rb" );
-  if( !pFile )
-  {
-    printf( "BL input reading error\n" );
-    exit(0);
+  if( !m_pchBLReconFile )
+  {
+    printf( "Wrong base layer YUV input file\n" );
+    exit(EXIT_FAILURE);
+  }
+  fstream streamYUV( m_pchBLReconFile, fstream::in | fstream::binary );
+  if( !streamYUV.good() )
+  {
+    printf( "Base layer YUV input reading error\n" );
+    exit(EXIT_FAILURE);
   }
   TComList<TComPic*> *cListPic = m_acTDecTop[0].getListPic();
   m_acTDecTop[0].setBLsize( m_iBLSourceWidth, m_iBLSourceHeight );
-  m_acTDecTop[0].setBLReconFile( pFile );
+  m_acTDecTop[0].setBLReconFile( &streamYUV );
   pcBLPic.setLayerId( 0 );
   cListPic->pushBack( &pcBLPic );
+#if AVC_SYNTAX
+  if( !m_pchBLSyntaxFile )
+  {
+    printf( "Wrong base layer syntax file\n" );
+    exit(EXIT_FAILURE);
+  }
+  fstream streamSyntaxFile( m_pchBLSyntaxFile, fstream::in | fstream::binary );
+  if( !streamSyntaxFile.good() )
+  {
+    printf( "Base layer syntax input reading error\n" );
+    exit(EXIT_FAILURE);
+  }
+  m_acTDecTop[0].setBLSyntaxFile( &streamSyntaxFile );
+#endif
 #endif
 
@@ -254 +280 @@
   // delete buffers
 #if AVC_BASE
-  if( pFile )
-  {
-    fclose( pFile );
-  }
+  if( streamYUV.is_open() )
+  {
+    streamYUV.close();
+  }
+#if AVC_SYNTAX
+  if( streamSyntaxFile.is_open() )
+  {
+    streamSyntaxFile.close();
+  }
+#endif
   pcBLPic.destroy();
 
@@ -293 +325 @@
   // main decoder loop
   bool recon_opened = false; // reconstruction file not yet opened. (must be performed after SPS is seen)
+
+#if SYNTAX_OUTPUT
+  if( !m_pchBLSyntaxFile )
+  {
+    printf( "Wrong base layer syntax file\n" );
+    exit(EXIT_FAILURE);
+  }
+  fstream streamSyntaxFile( m_pchBLSyntaxFile, fstream::out | fstream::binary );
+  if( !streamSyntaxFile.good() )
+  {
+    printf( "Base layer syntax input reading error\n" );
+    exit(EXIT_FAILURE);
+  }
+  m_cTDecTop.setBLSyntaxFile( &streamSyntaxFile );
+
+  for( Int i = m_iBLFrames * m_iBLSourceWidth * m_iBLSourceHeight * SYNTAX_BYTES / 16; i >= 0; i-- )
+  {
+    streamSyntaxFile.put( 0 );
+  }
+  streamSyntaxFile.seekp( 0 );
+#endif
 
   while (!!bitstreamFile)
@@ -389 +442 @@
     }
   }
+
+#if SYNTAX_OUTPUT
+  if( streamSyntaxFile.is_open() )
+  {
+    streamSyntaxFile.close();
+  }
+#endif
   
   xFlushOutput( pcListPic );