Changeset 1534 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibDecoder

Timestamp:

22 Mar 2016, 19:58:32 (9 years ago)

Author:

seregin

Message:

integration of multi-view support from JCTVC-W0134

Location:

branches/SHM-dev/source/Lib/TLibDecoder

Files:

• TDecCAVLC.cpp (modified) (2 diffs)
• TDecTop.cpp (modified) (1 diff)

branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp ¶

@@ -2186 +2186 @@
     READ_CODE(32, uiCode, "reserved_zero_34bits");  READ_CODE(2, uiCode, "reserved_zero_34bits");
   }
+#if VIEW_SCALABILITY
+  else if( ptl->getProfileIdc() == Profile::MULTIVIEWMAIN )
+  {
+    READ_FLAG(    uiCode, "general_max_12bit_constraint_flag" ); assert (uiCode == 1);
+    READ_FLAG(    uiCode, "general_max_10bit_constraint_flag" ); assert (uiCode == 1);
+    READ_FLAG(    uiCode, "general_max_8bit_constraint_flag"  ); assert (uiCode == 1);
+    READ_FLAG(    uiCode, "general_max_422chroma_constraint_flag"  ); assert (uiCode == 1);
+    READ_FLAG(    uiCode, "general_max_420chroma_constraint_flag"  ); assert (uiCode == 1);
+    READ_FLAG(    uiCode, "general_max_monochrome_constraint_flag" ); assert (uiCode == 0);
+    READ_FLAG(    uiCode, "general_intra_constraint_flag"); assert (uiCode == 0);
+    READ_FLAG(    uiCode, "general_one_picture_only_constraint_flag"); assert (uiCode == 0);
+    READ_FLAG(    uiCode, "general_lower_bit_rate_constraint_flag"); assert (uiCode == 1);
+    READ_CODE(32, uiCode, "general_reserved_zero_34bits");  READ_CODE(2, uiCode, "general_reserved_zero_34bits");
+  }
+#endif
   else
   {
@@ -3556 +3571 @@
 
   READ_FLAG( uiCode, "inter_view_mv_vert_constraint_flag" );
+  
+#if VIEW_SCALABILITY 
+  pcSPS->setInterViewMvVertConstraintFlag(uiCode == 1 ? true : false);
+#else
+  // Vertical MV component restriction is not used in SHVC CTC
+  assert( uiCode == 0 );
+#endif
 }
 

branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp ¶

@@ -839 +839 @@
   // set motion mapping flag
   m_apcSlicePilot->setMFMEnabledFlag( ( m_apcSlicePilot->getNumMotionPredRefLayers() > 0 && m_apcSlicePilot->getActiveNumILRRefIdx() && !m_apcSlicePilot->isIntra() ) ? true : false );
+
+#if VIEW_SCALABILITY
+  if( vps->getViewIndex(nalu.m_nuhLayerId) == 1 && sps->getPTL()->getGeneralPTL()->getProfileIdc() == Profile::MULTIVIEWMAIN )
+  {
+    assert( sps->getInterViewMvVertConstraintFlag() == 1 );
+  }
+#endif
 #endif