Changeset 407 in SHVCSoftware for branches/SHM-3.1-dev/source/Lib/TLibCommon/TComSlice.cpp

Timestamp:

1 Oct 2013, 22:08:33 (11 years ago)

Author:

qualcomm

Message:

Signal view ID-related syntax elements in VPS (Macro: VIEW_ID_RELATED_SIGNALING)

Introduce signaling of view_id_len_minus1 and view_id_val.

From: Adarsh K. Ramasubramonian <aramasub@…>

File:

• branches/SHM-3.1-dev/source/Lib/TLibCommon/TComSlice.cpp (modified) (3 diffs)

branches/SHM-3.1-dev/source/Lib/TLibCommon/TComSlice.cpp

@@ -1755 +1755 @@
 , m_vpsNumRepFormats          (1)
 #endif
+#if VIEW_ID_RELATED_SIGNALING 
+, m_viewIdLenMinus1           (0)
+#endif
 {
   for( Int i = 0; i < MAX_TLAYER; i++)
@@ -1832 +1835 @@
   ::memset( m_vpsRepFormatIdx, 0, sizeof(m_vpsRepFormatIdx) );
 #endif
+#if VIEW_ID_RELATED_SIGNALING 
+  ::memset(m_viewIdVal, 0, sizeof(m_viewIdVal));
+#endif
 }
 
@@ -1862 +1868 @@
     setNumLayersInIdList(i, n);
   }
+}
+#endif
+#if VIEW_ID_RELATED_SIGNALING 
+Int TComVPS::getNumViews()
+{
+  Int numViews = 1; 
+  for( Int i = 0; i <= getMaxLayers() - 1; i++ )
+  {
+    Int lId = getLayerIdInNuh( i ); 
+    if ( i > 0 && ( getViewIndex( lId ) != getScalabilityId( i - 1, VIEW_ORDER_INDEX ) ) )
+    {
+      numViews++; 
+    }    
+  }
+
+  return numViews;
+}
+Int TComVPS::getScalabilityId( Int layerIdInVps, ScalabilityType scalType )
+{
+  return getScalabilityMask( scalType ) ? getDimensionId( layerIdInVps, scalTypeToScalIdx( scalType ) ) : 0;
+}  
+Int TComVPS::scalTypeToScalIdx( ScalabilityType scalType )
+{
+  assert( scalType >= 0 && scalType <= MAX_VPS_NUM_SCALABILITY_TYPES ); 
+  assert( scalType == MAX_VPS_NUM_SCALABILITY_TYPES || getScalabilityMask( scalType ) );
+  Int scalIdx = 0; 
+  for( Int curScalType = 0; curScalType < scalType; curScalType++ )
+  {
+    scalIdx += ( getScalabilityMask( curScalType ) ? 1 : 0 );
+
+  }
+
+  return scalIdx; 
 }
 #endif