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

Timestamp:

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

Author:

vidyo

Message:

additional changes to make decoder use VPS parameters

Location:

branches/HTM-3.0-Vidyo/source/App

Files:

• TAppDecoder/TAppDecTop.cpp (modified) (4 diffs)
• TAppDecoder/TAppDecTop.h (modified) (3 diffs)
• TAppEncoder/TAppEncTop.h (modified) (2 diffs)

branches/HTM-3.0-Vidyo/source/App/TAppDecoder/TAppDecTop.cpp

@@ -82 +82 @@
 Void TAppDecTop::decode()
 {
+#if VIDYO_VPS_INTEGRATION
+  increaseNumberOfViews( 0, 0, 0 );
+#else
   increaseNumberOfViews( 1 );
+#endif
+  
 #if SONY_COLPIC_AVAILABILITY
   m_tDecTop[0]->setViewOrderIdx(0);
@@ -141 +146 @@
       read(nalu, nalUnit);
 #if VIDYO_VPS_INTEGRATION
+      Int viewId = 0;
+      Int depth = 0;
+      
+      if(nalu.m_nalUnitType != NAL_UNIT_VPS || nalu.m_layerId)
+      {
+        // code assumes that the first nal unit is VPS
+        // currently, this is a hack that requires non-first VPSs have non-zero layer_id
+        viewId = getVPSAccess()->getActiveVPS()->getViewId(nalu.m_layerId);
+        depth = getVPSAccess()->getActiveVPS()->getDepthFlag(nalu.m_layerId);
+      }
       viewDepthId = nalu.m_layerId;   // coding order T0D0T1D1T2D2
 #else
@@ -151 +166 @@
       if( viewDepthId >= m_tDecTop.size() )      
       {
+#if VIDYO_VPS_INTEGRATION
+        increaseNumberOfViews( viewDepthId, viewId, depth );
+#else
         increaseNumberOfViews( viewDepthId +1 );
+#endif   
       }
       if(m_iMaxTemporalLayer >= 0 && nalu.m_temporalId > m_iMaxTemporalLayer)
@@ -397 +416 @@
   m_pocLastDisplay[viewDepthId] = -MAX_INT;
 }
-
+#if VIDYO_VPS_INTEGRATION
+Void  TAppDecTop::increaseNumberOfViews  ( UInt layerId, UInt viewId, UInt isDepth )
+#else
 Void  TAppDecTop::increaseNumberOfViews  ( Int newNumberOfViewDepth )
-{
+#endif
+{
+#if VIDYO_VPS_INTEGRATION
+  Int newNumberOfViewDepth = layerId + 1;
+#endif
   if ( m_outputBitDepth == 0 )
   {
     m_outputBitDepth = g_uiBitDepth + g_uiBitIncrement;
   }
+#if !VIDYO_VPS_INTEGRATION
   Int viewId = (newNumberOfViewDepth-1)>>1;   // coding order T0D0T1D1T2D2
   Bool isDepth = ((newNumberOfViewDepth % 2) == 0);  // coding order T0D0T1D1T2D2
+#endif
   if( isDepth )
     m_useDepth = true;

branches/HTM-3.0-Vidyo/source/App/TAppDecoder/TAppDecTop.h

@@ -74 +74 @@
   CamParsCollector                m_cCamParsCollector;
 #if DEPTH_MAP_GENERATION
+#if VIDYO_VPS_INTEGRATION
+  TComVPSAccess                   m_cVPSAccess;
+#endif
   TComSPSAccess                   m_cSPSAccess;
   TComAUPicAccess                 m_cAUPicAccess;
@@ -85 +88 @@
   Void  destroy           (); ///< destroy internal members
   Void  decode            (); ///< main decoding function
+#if VIDYO_VPS_INTEGRATION
+  Void  increaseNumberOfViews   (UInt layerId, UInt viewId, UInt isDepth);
+#else
   Void  increaseNumberOfViews   (Int newNumberOfViewDepth);
+#endif
   TDecTop* getTDecTop     ( Int viewId, Bool isDepth );
 
@@ -92 +99 @@
 
 #if DEPTH_MAP_GENERATION
+#if VIDYO_VPS_INTEGRATION
+  TComVPSAccess*    getVPSAccess  () { return &m_cVPSAccess;   }
+#endif
   TComSPSAccess*    getSPSAccess  () { return &m_cSPSAccess;   }
   TComAUPicAccess*  getAUPicAccess() { return &m_cAUPicAccess; }

branches/HTM-3.0-Vidyo/source/App/TAppEncoder/TAppEncTop.h

@@ -80 +80 @@
 
 #if DEPTH_MAP_GENERATION
+#if VIDYO_VPS_INTEGRATION
+  TComVPSAccess               m_cVPSAccess;
+#endif
   TComSPSAccess               m_cSPSAccess;
   TComAUPicAccess             m_cAUPicAccess;
@@ -137 +140 @@
 #if VIDYO_VPS_INTEGRATION
   TComVPS*          getVPS()  { return &m_cVPS; }
+  TComVPSAccess*    getVPSAccess  () { return &m_cVPSAccess;   }
 #endif