Changeset 21 in 3DVCSoftware for trunk/source/Lib/TLibDecoder

Timestamp:

15 Feb 2012, 19:05:04 (13 years ago)

Author:

hschwarz

Message:

updated with HHI branch (0.2-HHI)

Location:

trunk/source/Lib/TLibDecoder

Files:

• TDecTop.cpp (modified) (8 diffs)
• TDecTop.h (modified) (3 diffs)

trunk/source/Lib/TLibDecoder/TDecTop.cpp

@@ -250 +250 @@
   m_bIsDepth = false ;
   m_iViewIdx = 0 ;
+#if SONY_COLPIC_AVAILABILITY
+  m_iViewOrderIdx = 0;
+#endif
 #if ENC_DEC_TRACE
   g_hTrace = fopen( "TraceDec.txt", "wb" );
@@ -382 +385 @@
 
 #if DEPTH_MAP_GENERATION
-  Bool bNeedPrdDepthMapBuffer = ( !pcSlice->getSPS()->isDepth() && ( pcSlice->getSPS()->getViewId() == 0 || pcSlice->getSPS()->getPredDepthMapGeneration() > 0 ) );
+  UInt uiPdm                  = ( pcSlice->getSPS()->getViewId() ? pcSlice->getSPS()->getPredDepthMapGeneration() : m_pcTAppDecTop->getSPSAccess()->getPdm() );
+  Bool bNeedPrdDepthMapBuffer = ( !pcSlice->getSPS()->isDepth() && uiPdm > 0 );
 #endif
 
@@ -392 +396 @@
     if( bNeedPrdDepthMapBuffer )
     {
-      rpcPic->addPrdDepthMapBuffer();
+      rpcPic->addPrdDepthMapBuffer( PDM_SUB_SAMP_EXP_X(uiPdm), PDM_SUB_SAMP_EXP_Y(uiPdm) );
     }
 #endif
@@ -426 +430 @@
   if( bNeedPrdDepthMapBuffer && !rpcPic->getPredDepthMap() )
   {
-    rpcPic->addPrdDepthMapBuffer();
+    rpcPic->addPrdDepthMapBuffer( PDM_SUB_SAMP_EXP_X(uiPdm), PDM_SUB_SAMP_EXP_Y(uiPdm) );
   }
 #endif
@@ -593 +597 @@
       m_apcSlicePilot->setSliceIdx(m_uiSliceIdx);
       m_apcSlicePilot->setViewIdx( m_cSPS.getViewId() );
+#if SONY_COLPIC_AVAILABILITY
+      m_apcSlicePilot->setViewOrderIdx( m_cSPS.getViewOrderIdx());
+#endif
       if (!m_bFirstSliceInPicture)
       {
@@ -633 +640 @@
         pcPic->setViewIdx( m_cSPS.getViewId() );
 
+#if SONY_COLPIC_AVAILABILITY
+        pcPic->setViewOrderIdx( m_cSPS.getViewOrderIdx() );
+#endif
+
         /* transfer any SEI messages that have been received to the picture */
         pcPic->setSEIs(m_SEIs);
@@ -645 +656 @@
 
 #if DEPTH_MAP_GENERATION
-        m_cDepthMapGenerator.create( true, m_apcSlicePilot->getSPS()->getWidth(), m_apcSlicePilot->getSPS()->getHeight(), g_uiMaxCUDepth, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiBitDepth + g_uiBitIncrement );
+        UInt uiPdm = ( m_cSPS.getViewId() ? m_cSPS.getPredDepthMapGeneration() : getDecTop()->getSPSAccess()->getPdm() );
+        m_cDepthMapGenerator.create( true, m_apcSlicePilot->getSPS()->getWidth(), m_apcSlicePilot->getSPS()->getHeight(), g_uiMaxCUDepth, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiBitDepth + g_uiBitIncrement, PDM_SUB_SAMP_EXP_X(uiPdm), PDM_SUB_SAMP_EXP_Y(uiPdm) );
+        TComDepthMapGenerator* pcDMG0 = getDecTop()->getDecTop0()->getDepthMapGenerator();
+        if( m_cSPS.getViewId() == 1 && ( pcDMG0->getSubSampExpX() != PDM_SUB_SAMP_EXP_X(uiPdm) || pcDMG0->getSubSampExpY() != PDM_SUB_SAMP_EXP_Y(uiPdm) ) )
+        {
+          pcDMG0->create( true, m_apcSlicePilot->getSPS()->getWidth(), m_apcSlicePilot->getSPS()->getHeight(), g_uiMaxCUDepth, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiBitDepth + g_uiBitIncrement, PDM_SUB_SAMP_EXP_X(uiPdm), PDM_SUB_SAMP_EXP_Y(uiPdm) );
+        }
 #endif
 #if HHI_INTER_VIEW_RESIDUAL_PRED
@@ -683 +700 @@
         pcSlice->setTexturePic( pcTexturePic );
         pcSlice->setViewIdx( pcPic->getViewIdx() );
+#if SONY_COLPIC_AVAILABILITY
+        pcSlice->setViewOrderIdx( pcPic->getViewOrderIdx() );
+#endif
         pcSlice->setRefPicListExplicitlyDecoderSided(m_cListPic, apcSpatRefPics) ;// temporary solution
 

trunk/source/Lib/TLibDecoder/TDecTop.h

@@ -140 +140 @@
   Bool                    m_bIsDepth;
   Int                     m_iViewIdx;
+#if SONY_COLPIC_AVAILABILITY
+  Int                     m_iViewOrderIdx;
+#endif
   TAppDecTop*             m_pcTAppDecTop;
   CamParsCollector*       m_pcCamParsCollector;
@@ -180 +183 @@
   Void setViewIdx(Int i)                                        { m_iViewIdx = i ;}
   Int  getViewIdx()                                                             { return m_iViewIdx ; }
+#if SONY_COLPIC_AVAILABILITY
+  Void setViewOrderIdx(Int i)                                   { m_iViewOrderIdx = i ;}
+  Int  getViewOrderIdx()                                                        { return m_iViewOrderIdx ; }
+#endif
 
   Void setToDepth(Bool b)         { m_bIsDepth = b ;}
@@ -187 +194 @@
 
   TComList<TComPic*>*     getListPic            () { return  &m_cListPic;             }
-  TAppDecTop*             getDecTop           ( ){ return  m_pcTAppDecTop ;};
+  TAppDecTop*             getDecTop           ( ){ return  m_pcTAppDecTop ;}
+#if DEPTH_MAP_GENERATION
+  TComDepthMapGenerator*  getDepthMapGenerator  () { return &m_cDepthMapGenerator; }
+#endif
 
   Void                    setSPS                (TComSPS cSPS );