Changeset 71 in 3DVCSoftware for branches/HTM-3.0-Vidyo/source/Lib/TLibDecoder

Timestamp:

5 Jun 2012, 04:47:14 (13 years ago)

Author:

vidyo

Message:

additional changes to make decoder use VPS parameters

Location:

branches/HTM-3.0-Vidyo/source/Lib/TLibDecoder

Files:

• TDecCAVLC.cpp (modified) (2 diffs)
• TDecTop.cpp (modified) (3 diffs)

branches/HTM-3.0-Vidyo/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -1349 +1349 @@
   READ_FLAG( uiCode,  "temporal_id_nesting_flag" );       pcVPS->setTemporalNestingFlag( uiCode ? true:false );
   READ_UVLC( uiCode,  "video_parameter_set_id" );         pcVPS->setVPSId( uiCode );
-  for(UInt i=0; i <= pcVPS->getMaxTLayers()-1; i++)
+  for(UInt i = 0; i <= pcVPS->getMaxTLayers()-1; i++)
   {
     READ_UVLC( uiCode,  "max_dec_pic_buffering[i]" );     pcVPS->setMaxDecPicBuffering( uiCode, i );
@@ -1362 +1362 @@
     READ_UVLC( uiCode,  "extension_type" );               pcVPS->setExtensionType( uiCode );
     
-    if( pcVPS->getExtensionType() == 0)
-      READ_SVLC( iCode,  "view_order_idx[0]" );           pcVPS->setViewOrderIdx( iCode, 0 );
-    
-    for(UInt i=0; i <= pcVPS->getMaxLayers()-1; i++)
+    pcVPS->setViewOrderIdx( 0, 0 );
+    pcVPS->setViewId( 0, 0 );
+    pcVPS->setDepthFlag( 0, 0 );
+    for(UInt i = 1; i <= pcVPS->getMaxLayers()-1; i++)
     {
       READ_FLAG( uiCode, "dependent_flag[i]" );           pcVPS->setDependentFlag( uiCode ? true:false, i);

branches/HTM-3.0-Vidyo/source/Lib/TLibDecoder/TDecTop.cpp

@@ -319 +319 @@
   m_tAppDecTop = pcTAppDecTop;
 #if DEPTH_MAP_GENERATION
+#if VIDYO_VPS_INTEGRATION
+  m_cDepthMapGenerator.init( &m_cPrediction, m_tAppDecTop->getVPSAccess(), m_tAppDecTop->getSPSAccess(), m_tAppDecTop->getAUPicAccess() );
+#else
   m_cDepthMapGenerator.init( &m_cPrediction, m_tAppDecTop->getSPSAccess(), m_tAppDecTop->getAUPicAccess() );
+#endif
 #endif
 #if HHI_INTER_VIEW_RESIDUAL_PRED
@@ -574 +578 @@
   TComVPS *vps = m_parameterSetManagerDecoder.getVPS(sps->getVPSId());
   assert (vps != 0);
+  if( m_apcSlicePilot->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR || m_apcSlicePilot->getNalUnitType() == NAL_UNIT_CODED_SLICE_CRA )
+    // VPS can only be activated on IDR or CRA...
+    getTAppDecTop()->getVPSAccess()->setActiveVPSId( sps->getVPSId() );
 #endif
   m_apcSlicePilot->setPPS(pps);
@@ -1082 +1089 @@
   m_cEntropyDecoder.decodeVPS( vps );
   m_parameterSetManagerDecoder.storePrefetchedVPS(vps);  
-
+  getTAppDecTop()->getVPSAccess()->addVPS( vps );
 }
 #endif