Changeset 1164 in 3DVCSoftware for branches/HTM-13.1-dev0/source/Lib/TLibDecoder

Timestamp:

16 Mar 2015, 12:52:20 (10 years ago)

Author:

tech

Message:

Merged 13.1-dev2-Sony

Location:

branches/HTM-13.1-dev0/source/Lib/TLibDecoder

Files:

• TDecCu.cpp (modified) (1 diff)
• TDecTop.cpp (modified) (1 diff)

branches/HTM-13.1-dev0/source/Lib/TLibDecoder/TDecCu.cpp

@@ -954 +954 @@
   // compute mask by segmenting depth block
   Bool pMask[MAX_CU_SIZE*MAX_CU_SIZE];
+#if HS_DBBP_CLEAN_K0048
+  Bool bValidMask = m_pcPrediction->getSegmentMaskFromDepth(pDepthPels, uiDepthStride, pcCU->getWidth(0), pcCU->getHeight(0), pMask, pcCU);
+#else
   Bool bValidMask = m_pcPrediction->getSegmentMaskFromDepth(pDepthPels, uiDepthStride, pcCU->getWidth(0), pcCU->getHeight(0), pMask);
+#endif
   AOF(bValidMask);
   

branches/HTM-13.1-dev0/source/Lib/TLibDecoder/TDecTop.cpp

@@ -954 +954 @@
 
   xActivateParameterSets();
+
+#if SONY_MV_V_CONST_C0078
+  //Check Multiview Main profile constraint in G.11.1.1
+  //  When ViewOrderIdx[ i ] derived according to any active VPS is equal to 1 
+  //  for the layer with nuh_layer_id equal to i in subBitstream, 
+  //  inter_view_mv_vert_constraint_flag shall be equal to 1 
+  //  in the sps_multilayer_extension( ) syntax structure in each active SPS for that layer.
+  if( m_apcSlicePilot->getSPS()->getPTL()->getGeneralPTL()->getProfileIdc()==Profile::MULTIVIEWMAIN
+      &&
+      m_apcSlicePilot->getVPS()->getViewOrderIdx(m_apcSlicePilot->getVPS()->getLayerIdInNuh(getLayerId()))==1 
+     )
+  {
+    assert( m_apcSlicePilot->getSPS()->getInterViewMvVertConstraintFlag()==1 );
+  }
+#endif
 
   if (m_apcSlicePilot->isNextSlice())