Changeset 479 in 3DVCSoftware for branches/HTM-DEV-0.3-dev2/source/Lib/TLibDecoder

Timestamp:

18 Jun 2013, 23:24:53 (12 years ago)

Author:

tech

Message:

• changed IV-MERGE HLS to match Test Model 4 spec
• incorporated iv-refpic list to TComSlice
• removed TComDepthMapGenerator

Location:

branches/HTM-DEV-0.3-dev2/source/Lib/TLibDecoder

Files:

• TDecCAVLC.cpp (modified) (3 diffs)
• TDecGop.cpp (modified) (3 diffs)
• TDecGop.h (modified) (3 diffs)
• TDecTop.cpp (modified) (5 diffs)
• TDecTop.h (modified) (4 diffs)

branches/HTM-DEV-0.3-dev2/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -759 +759 @@
     }
 #endif // !H_MV
-#if H_3D_IV_MERGE
-    READ_FLAG( uiCode, "base_view_flag" );
-    if( uiCode )
-    { // baseview SPS -> set standard values
-      pcSPS->initCamParaSPS         ( 0 );
-      pcSPS->setPredDepthMapGeneration( 0, false );
-    }
-    else
-    {
-      READ_FLAG( uiCode, "depth_flag" ); 
-      if( uiCode )
-      {
-        READ_UVLC( uiCode, "view_idx" ); 
-        pcSPS->initCamParaSPSDepth    ( uiCode );
-        pcSPS->setPredDepthMapGeneration( uiCode, true );
-      }
-      else
-      {
-        UInt  uiViewIndex;
-        READ_UVLC( uiViewIndex, "view_idx" );  uiViewIndex++; 
-        UInt uiPredDepthMapGeneration = 0;
-        UInt uiMultiviewMvPredMode = 0;
-
-        READ_UVLC( uiPredDepthMapGeneration, "Pdm_generation" );
-        if( uiPredDepthMapGeneration )
-        {
-          READ_UVLC( uiMultiviewMvPredMode, "multi_view_mv_pred_mode" );
-        }
-
-        pcSPS->setPredDepthMapGeneration( uiViewIndex, false, uiPredDepthMapGeneration, uiMultiviewMvPredMode);
-
-      }
-    }
-#endif
   }
 }
@@ -987 +953 @@
     if (uiCode)
     {
+#if H_3D
+#if H_3D_IV_MERGE
+      for( Int layer = 0; layer <= pcVPS->getMaxLayers() - 1; layer++ )
+      {
+        if (layer != 0)
+        {
+          if ( !( pcVPS->getDepthId( layer ) == 1 ) )
+          {
+            READ_FLAG( uiCode, "ivMvPredFlag[i]"); pcVPS->setIvMvPredFlag( layer, uiCode == 1 ? true : false );
+          }          
+        }        
+      }
+#endif
+#else
       while ( xMoreRbspData() )
       {
         READ_FLAG( uiCode, "vps_extension2_data_flag");
       }
+#endif
     }
 
@@ -1449 +1430 @@
       READ_UVLC( uiCode, "five_minus_max_num_merge_cand");
 #if H_3D_IV_MERGE
-      rpcSlice->setMaxNumMergeCand(((rpcSlice->getSPS()->getMultiviewMvPredMode() & PDM_USE_FOR_MERGE) == PDM_USE_FOR_MERGE ? MRG_MAX_NUM_CANDS_MEM: MRG_MAX_NUM_CANDS) - uiCode);
+      Bool ivMvPredFlag = rpcSlice->getVPS()->getIvMvPredFlag( rpcSlice->getLayerIdInVps() ) ;
+      rpcSlice->setMaxNumMergeCand(( ivMvPredFlag ? MRG_MAX_NUM_CANDS_MEM : MRG_MAX_NUM_CANDS) - uiCode);
 #else
       rpcSlice->setMaxNumMergeCand(MRG_MAX_NUM_CANDS - uiCode);

branches/HTM-DEV-0.3-dev2/source/Lib/TLibDecoder/TDecGop.cpp

@@ -84 +84 @@
                    TComLoopFilter*         pcLoopFilter,
                    TComSampleAdaptiveOffset* pcSAO
-#if H_3D_IV_MERGE
-                    ,TComDepthMapGenerator*  pcDepthMapGenerator
-#endif
                    )
 {
@@ -96 +93 @@
   m_pcLoopFilter          = pcLoopFilter;
   m_pcSAO  = pcSAO;
-#if H_3D_IV_MERGE
-  m_pcDepthMapGenerator   = pcDepthMapGenerator;
-#endif
 }
 
@@ -158 +152 @@
     m_LFCrossSliceBoundaryFlag.push_back( pcSlice->getLFCrossSliceBoundaryFlag());
   }
-#if H_3D_IV_MERGE
-  if( uiStartCUAddr == 0 )
-  {
-    m_pcDepthMapGenerator->initViewComponent( rpcPic );
-  }
-#endif
 #if H_3D_NBDV 
   if(pcSlice->getViewIndex() && !pcSlice->getIsDepth()) //Notes from QC: this condition shall be changed once the configuration is completed, e.g. in pcSlice->getSPS()->getMultiviewMvPredMode() || ARP in prev. HTM. Remove this comment once it is done.

branches/HTM-DEV-0.3-dev2/source/Lib/TLibDecoder/TDecGop.h

@@ -51 +51 @@
 #include "TLibCommon/TComSampleAdaptiveOffset.h"
 
-#if H_3D_IV_MERGE
-#include "TLibCommon/TComDepthMapGenerator.h"
-#endif
 #include "TDecEntropy.h"
 #include "TDecSlice.h"
@@ -82 +79 @@
   TComLoopFilter*       m_pcLoopFilter;
   
-#if H_3D_IV_MERGE
-  TComDepthMapGenerator*  m_pcDepthMapGenerator;
-#endif
   TComSampleAdaptiveOffset*     m_pcSAO;
   Double                m_dDecTime;
@@ -104 +98 @@
                  TComLoopFilter*         pcLoopFilter,
                  TComSampleAdaptiveOffset* pcSAO
-#if H_3D_IV_MERGE
-                 ,TComDepthMapGenerator* pcDepthMapGenerator
-#endif
                  );
   Void  create  ();

branches/HTM-DEV-0.3-dev2/source/Lib/TLibDecoder/TDecTop.cpp

@@ -37 +37 @@
 
 #include "NALread.h"
-#if H_3D_IV_MERGE
-#include "../../App/TAppDecoder/TAppDecTop.h"
-#endif
 #include "TDecTop.h"
 
@@ -392 +389 @@
 }
 
-#if H_3D_IV_MERGE
-Void TDecTop::init(TAppDecTop* pcTAppDecTop)
-#else
 Void TDecTop::init()
-#endif
 {
   // initialize ROM
@@ -402 +395 @@
   initROM();
 #endif
-  m_cGopDecoder.init( &m_cEntropyDecoder, &m_cSbacDecoder, &m_cBinCABAC, &m_cCavlcDecoder, &m_cSliceDecoder, &m_cLoopFilter, &m_cSAO
-#if H_3D_IV_MERGE
-    , &m_cDepthMapGenerator
-#endif
-    );
+  m_cGopDecoder.init( &m_cEntropyDecoder, &m_cSbacDecoder, &m_cBinCABAC, &m_cCavlcDecoder, &m_cSliceDecoder, &m_cLoopFilter, &m_cSAO );
   m_cSliceDecoder.init( &m_cEntropyDecoder, &m_cCuDecoder );
   m_cEntropyDecoder.init(&m_cPrediction);
-#if H_3D_IV_MERGE
-  m_tAppDecTop = pcTAppDecTop;
-  m_cDepthMapGenerator.init( &m_cPrediction, m_tAppDecTop->getVPSAccess(), m_tAppDecTop->getSPSAccess(), m_tAppDecTop->getAUPicAccess() );
-#endif
 }
 
@@ -769 +754 @@
 
     m_cSliceDecoder.create();
-#if H_3D_IV_MERGE
-    UInt uiPdm = ( m_apcSlicePilot->getSPS()->getViewIndex() ? m_apcSlicePilot->getSPS()->getPredDepthMapGeneration() : m_tAppDecTop->getSPSAccess()->getPdm() );
-    m_cDepthMapGenerator.create( true, m_apcSlicePilot->getSPS()->getPicWidthInLumaSamples(), m_apcSlicePilot->getSPS()->getPicHeightInLumaSamples(), g_uiMaxCUDepth, g_uiMaxCUWidth, g_uiMaxCUHeight, g_bitDepthY, PDM_SUB_SAMP_EXP_X(uiPdm), PDM_SUB_SAMP_EXP_Y(uiPdm) );
-    TComDepthMapGenerator* pcDMG0 = m_tAppDecTop->getDecTop0()->getDepthMapGenerator();
-    if( m_apcSlicePilot->getSPS()->getViewIndex() == 1 && ( pcDMG0->getSubSampExpX() != PDM_SUB_SAMP_EXP_X(uiPdm) || pcDMG0->getSubSampExpY() != PDM_SUB_SAMP_EXP_Y(uiPdm) ) )
-    {
-      pcDMG0->create( true, m_apcSlicePilot->getSPS()->getPicWidthInLumaSamples(), m_apcSlicePilot->getSPS()->getPicHeightInLumaSamples(), g_uiMaxCUDepth, g_uiMaxCUWidth, g_uiMaxCUHeight, g_bitDepthY, PDM_SUB_SAMP_EXP_X(uiPdm), PDM_SUB_SAMP_EXP_Y(uiPdm) );
-    }
-#endif
   }
   else
@@ -918 +894 @@
 
 #endif
-#if H_3D_IV_MERGE
-    TComPic * const pcTexturePic = m_isDepth ? m_tAppDecTop->getPicFromView(  m_viewIndex, pcSlice->getPOC(), false ) : NULL;
-    assert( !m_isDepth || pcTexturePic != NULL );
-    pcSlice->setTexturePic( pcTexturePic );
+#if H_3D_GEN
+    pcSlice->setIvPicLists( m_ivPicLists );         
+#if H_3D_IV_MERGE    
+    assert( !getIsDepth() || ( pcSlice->getTexturePic() != 0 ) );
+#endif    
 #endif
     // For generalized B

branches/HTM-DEV-0.3-dev2/source/Lib/TLibDecoder/TDecTop.h

@@ -45 +45 @@
 #include "TLibCommon/TComTrQuant.h"
 #include "TLibCommon/SEI.h"
-#if H_3D_IV_MERGE
-#include "TLibCommon/TComDepthMapGenerator.h"
-#endif
 
 #include "TDecGop.h"
@@ -225 +222 @@
   Bool                    m_isDepth;
   CamParsCollector*       m_pcCamParsCollector;
-#if H_3D_IV_MERGE
-  TComDepthMapGenerator   m_cDepthMapGenerator;
-  TAppDecTop*             m_tAppDecTop;
-#endif
 #endif
 #endif
@@ -241 +234 @@
   void setDecodedPictureHashSEIEnabled(Int enabled) { m_cGopDecoder.setDecodedPictureHashSEIEnabled(enabled); }
 
-#if H_3D_IV_MERGE
-  Void  init(TAppDecTop* pcTAppDecTop);
-#else
   Void  init();
-#endif
 #if H_MV  
   Bool  decode(InputNALUnit& nalu, Int& iSkipFrame, Int& iPOCLastDisplay, Bool newLayer );
@@ -276 +265 @@
   Bool                    getIsDepth            ()               { return m_isDepth;    }
   Void                    setCamParsCollector( CamParsCollector* pcCamParsCollector ) { m_pcCamParsCollector = pcCamParsCollector; }
-#if H_3D_IV_MERGE
-  TComDepthMapGenerator*  getDepthMapGenerator  () { return &m_cDepthMapGenerator; }
-#endif
 #endif
 #endif