Changeset 77 in 3DVCSoftware for trunk/source/Lib/TLibDecoder/NALread.cpp

Timestamp:

14 Jun 2012, 16:38:29 (13 years ago)

Author:

tech

Message:

Merged with branch/HTM-3.0Samsung REV74 including:

• restricted residual prediction m24766
• Inter-view residual prediction m24938
• VPS concept m24714,m24878, m24945,m24896, m2491
• reference list modification, restriction on IDR m24876, m24874
• depth based motion parameter prediction m24829

Fixed bugs:

• interview prediction
• VSO

Added:

• xcode project

File:

• trunk/source/Lib/TLibDecoder/NALread.cpp (modified) (3 diffs)

trunk/source/Lib/TLibDecoder/NALread.cpp

@@ -136 +136 @@
  //  unsigned reserved_one_5bits = bs.read(5);
  //  assert(reserved_one_5bits == 1);
+#if VIDYO_VPS_INTEGRATION
+  nalu.m_layerId  = bs.read(5) - 1;
+#else
   nalu.m_viewId   = bs.read(4)-1;
   nalu.m_isDepth  = bs.read(1);
-
+#endif
 #if H0566_TLA
   if ( nalu.m_temporalId )
@@ -159 +162 @@
     {
       nalu.m_temporalId = bs.read(3);
+#if VIDYO_VPS_INTEGRATION
+      nalu.m_layerId    = bs.read(5) - 1;
+#else
       nalu.m_OutputFlag = bs.read(1);
   //    unsigned reserved_one_4bits = bs.read(4);
@@ -164 +170 @@
       nalu.m_viewId   = bs.read(3)-1;
       nalu.m_isDepth  = bs.read(1);
+#endif
 
 #if H0566_TLA