Changeset 446 in 3DVCSoftware for branches/HTM-DEV-0.2-dev/source/App/TAppDecoder/TAppDecTop.cpp

Timestamp:

26 May 2013, 16:22:23 (13 years ago)

Author:

tech

Message:

Added missing parts.

File:

• branches/HTM-DEV-0.2-dev/source/App/TAppDecoder/TAppDecTop.cpp (modified) (14 diffs)

branches/HTM-DEV-0.2-dev/source/App/TAppDecoder/TAppDecTop.cpp

@@ -54 +54 @@
 
 TAppDecTop::TAppDecTop()
-
 #if !H_MV
 : m_iPOCLastDisplay(-MAX_INT)
@@ -60 +59 @@
 : m_numDecoders( 0 )
 #endif
-
 {
   ::memset (m_abDecFlag, 0, sizeof (m_abDecFlag));
 #if H_MV
   for (Int i = 0; i < MAX_NUM_LAYER_IDS; i++) m_layerIdToDecIdx[i] = -1; 
+#endif
+#if H_3D
+    m_pScaleOffsetFile  = 0;
 #endif
 }
@@ -79 +80 @@
     m_pchBitstreamFile = NULL;
   }
-
 #if H_MV
   for (Int decIdx = 0; decIdx < m_numDecoders; decIdx++)
@@ -115 +115 @@
   poc = -1; 
 #endif
-
   TComList<TComPic*>* pcListPic = NULL;
 
@@ -125 +124 @@
   }
 
+#if H_3D
+  if( m_pchScaleOffsetFile ) 
+  { 
+    m_pScaleOffsetFile = ::fopen( m_pchScaleOffsetFile, "wt" ); 
+    AOF( m_pScaleOffsetFile ); 
+  }
+  m_cCamParsCollector.init( m_pScaleOffsetFile );
+#endif
   InputByteStream bytestream(bitstreamFile);
 
@@ -147 +154 @@
   Bool firstSlice        = true; 
 #endif
-
  
   while (!!bitstreamFile)
@@ -156 +162 @@
      * nal unit. */
     streampos location = bitstreamFile.tellg();
+#if H_MV
+#if ENC_DEC_TRACE
+    Int64 symCount = g_nSymbolCounter;
+#endif
+#endif
     AnnexBStats stats = AnnexBStats();
 #if !H_MV
     Bool bPreviousPictureDecoded = false;
 #endif
+
     vector<uint8_t> nalUnit;
     InputNALUnit nalu;
@@ -250 +262 @@
           bitstreamFile.seekg(location-streamoff(3));
           bytestream.reset();
+#if H_MV
+#if ENC_DEC_TRACE
+          g_nSymbolCounter = symCount;
+#endif
+#endif
         }
 #if !H_MV
@@ -276 +293 @@
     }
 #endif
+
     if( pcListPic )
     {
@@ -286 +304 @@
         if (!m_outputBitDepthY) { m_outputBitDepthY = g_bitDepthY; }
         if (!m_outputBitDepthC) { m_outputBitDepthC = g_bitDepthC; }
+
 #if H_MV
         m_tVideoIOYuvReconFile[decIdxLastPic]->open( m_pchReconFiles[decIdxLastPic], true, m_outputBitDepthY, m_outputBitDepthC, g_bitDepthY, g_bitDepthC ); // write mode
@@ -297 +316 @@
       if ( bNewPicture && 
 #endif
-           (   nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_IDR
+           (   nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_IDR_W_RADL
             || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_IDR_N_LP
             || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_BLA_N_LP
-            || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_BLANT
-            || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_BLA ) )
+            || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_BLA_W_RADL
+            || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_BLA_W_LP ) )
       {
 #if H_MV
@@ -318 +337 @@
   }
 
+#if H_3D
+  if( m_cCamParsCollector.isInitialized() )
+  {
+    m_cCamParsCollector.setSlice( 0 );
+  }
+#endif
   for(UInt decIdx = 0; decIdx < m_numDecoders; decIdx++)
   {
@@ -383 +408 @@
   // destroy decoder class
   m_cTDecTop.destroy();
+#endif
+#if H_3D
+  m_cCamParsCollector.uninit();
+  if( m_pScaleOffsetFile ) 
+  { 
+    ::fclose( m_pScaleOffsetFile ); 
+  }
 #endif
 }
@@ -593 +625 @@
 }
 
+#if H_MV
+Int TAppDecTop::xGetDecoderIdx( Int layerId, Bool createFlag /*= false */ )
+{
+  Int decIdx = -1; 
+  if ( m_layerIdToDecIdx[ layerId ] != -1 ) 
+  {      
+    decIdx = m_layerIdToDecIdx[ layerId ]; 
+  }
+  else
+  {      
+    assert ( createFlag ); 
+    assert( m_numDecoders < MAX_NUM_LAYERS ); 
+
+    decIdx = m_numDecoders; 
+
+    // Init decoder
+    m_tDecTop[ decIdx ] =  new TDecTop;
+    m_tDecTop[ decIdx ]->create();
+    m_tDecTop[ decIdx ]->init( );
+    m_tDecTop[ decIdx ]->setLayerId( layerId );
+    m_tDecTop[ decIdx ]->setDecodedPictureHashSEIEnabled(m_decodedPictureHashSEIEnabled);
+    m_tDecTop[ decIdx ]->setIvPicLists( &m_ivPicLists ); 
+#if H_3D
+   m_tDecTop[ decIdx ]->setCamParsCollector( &m_cCamParsCollector );
+#endif
+
+    // append pic list of new decoder to PicLists 
+    assert( m_ivPicLists.size() == m_numDecoders );
+    m_ivPicLists.push_back( m_tDecTop[ decIdx ]->getListPic() );
+
+    // create recon file related stuff      
+    Char* pchTempFilename = NULL;
+    if ( m_pchReconFile )
+    {      
+      Char buffer[4];      
+      sprintf(buffer,"_%i", layerId );
+      assert ( m_pchReconFile ); 
+      xAppendToFileNameEnd( m_pchReconFile , buffer, pchTempFilename );
+      assert( m_pchReconFiles.size() == m_numDecoders );
+    }
+
+    m_pchReconFiles.push_back( pchTempFilename );   
+
+    m_tVideoIOYuvReconFile[ decIdx ] = new TVideoIOYuv;
+    m_reconOpen           [ decIdx ] = false;
+
+    // set others 
+    m_pocLastDisplay      [ decIdx ] = -MAX_INT;
+    m_layerIdToDecIdx     [ layerId ] = decIdx; 
+
+    m_numDecoders++; 
+  };
+  return decIdx;
+}
+#endif
 //! \}