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

Timestamp:

20 Jun 2013, 13:04:57 (11 years ago)

Author:

tech

Message:

Integrated DoNBDV provided by Mediatek and applied clean ups.

Location:

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

Files:

• TDecCAVLC.cpp (modified) (2 diffs)
• TDecCu.cpp (modified) (1 diff)
• TDecGop.cpp (modified) (1 diff)

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

@@ -954 +954 @@
     {
 #if H_3D
-#if H_3D_IV_MERGE
+#if H_3D_GEN
       for( Int layer = 0; layer <= pcVPS->getMaxLayers() - 1; layer++ )
       {
@@ -961 +961 @@
           if ( !( pcVPS->getDepthId( layer ) == 1 ) )
           {
-            READ_FLAG( uiCode, "ivMvPredFlag[i]"); pcVPS->setIvMvPredFlag( layer, uiCode == 1 ? true : false );
+#if H_3D_IV_MERGE
+            READ_FLAG( uiCode, "iv_mv_pred_flag[i]");          pcVPS->setIvMvPredFlag         ( layer, uiCode == 1 ? true : false );
+#endif
+#if H_3D_NBDV_REF
+            READ_FLAG( uiCode, "depth_refinement_flag[i]");    pcVPS->setDepthRefinementFlag  ( layer, uiCode == 1 ? true : false );
+#endif
+#if H_3D_VSP
+            READ_FLAG( uiCode, "view_synthesis_pred_flag[i]"); pcVPS->setViewSynthesisPredFlag( layer, uiCode == 1 ? true : false );
+#endif
           }          
         }        

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

@@ -292 +292 @@
       m_ppcCU[uiDepth]->setPartSizeSubParts( SIZE_2Nx2N, 0, uiDepth );     
 #if H_3D_NBDV_REF
-      if(pcCU->getSlice()->getSPS()->getUseDVPRefine())  //Notes from QC: please check the condition for DoNBDV. Remove this comment once it is done.
+      if(pcCU->getSlice()->getVPS()->getDepthRefinementFlag( pcCU->getSlice()->getLayerIdInVps() ))  //Notes from QC: please check the condition for DoNBDV. Remove this comment once it is done.
         DvInfo.bDV = m_ppcCU[uiDepth]->getDisMvpCandNBDV(&DvInfo, true);
       else

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

@@ -159 +159 @@
   }
 #endif
+#if H_3D_GEN
+  pcSlice->setDepthToDisparityLUTs(); 
+#endif
   m_pcSbacDecoders[0].load(m_pcSbacDecoder);
   m_pcSliceDecoder->decompressSlice( ppcSubstreams, rpcPic, m_pcSbacDecoder, m_pcSbacDecoders);