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

Timestamp:

23 May 2013, 15:40:36 (12 years ago)

Author:

tech

Message:

Integrated 3D encoder control, camera parameters, renderer and MV fixes.

File:

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

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

@@ -54 +54 @@
 
 TAppDecTop::TAppDecTop()
+
 #if !H_MV
 : m_iPOCLastDisplay(-MAX_INT)
@@ -59 +60 @@
 : m_numDecoders( 0 )
 #endif
+
 {
   ::memset (m_abDecFlag, 0, sizeof (m_abDecFlag));
@@ -77 +79 @@
     m_pchBitstreamFile = NULL;
   }
+
 #if H_MV
   for (Int decIdx = 0; decIdx < m_numDecoders; decIdx++)
@@ -112 +115 @@
   poc = -1; 
 #endif
+
   TComList<TComPic*>* pcListPic = NULL;
 
@@ -143 +147 @@
   Bool firstSlice        = true; 
 #endif
+
  
   while (!!bitstreamFile)
@@ -151 +156 @@
      * 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;
@@ -251 +250 @@
           bitstreamFile.seekg(location-streamoff(3));
           bytestream.reset();
-#if H_MV
-#if ENC_DEC_TRACE
-          g_nSymbolCounter = symCount;
-#endif
-#endif
-
         }
 #if !H_MV
@@ -283 +276 @@
     }
 #endif
-
     if( pcListPic )
     {
@@ -294 +286 @@
         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
@@ -306 +297 @@
       if ( bNewPicture && 
 #endif
-           (   nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_IDR_W_RADL
+           (   nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_IDR
             || 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_BLA_W_RADL
-            || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_BLA_W_LP ) )
+            || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_BLANT
+            || nalu.m_nalUnitType == NAL_UNIT_CODED_SLICE_BLA ) )
       {
 #if H_MV
@@ -602 +593 @@
 }
 
-#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 ); 
-
-    // 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
 //! \}