Changeset 1111 in 3DVCSoftware for branches/HTM-12.2-dev2-HHI/source/Lib/TLibCommon/TComSlice.cpp

Timestamp:

7 Nov 2014, 14:12:21 (10 years ago)

Author:

tech

Message:

MV-HEVC related fix for derivation of number of views (H_MV_FIX_NUM_VIEWS).
Initial code for J0107 item 5 (not enabled yet). (HHI_VIEW_ID_LIST_I5_J0107)

File:

• branches/HTM-12.2-dev2-HHI/source/Lib/TLibCommon/TComSlice.cpp (modified) (5 diffs)

branches/HTM-12.2-dev2-HHI/source/Lib/TLibCommon/TComSlice.cpp

@@ -1879 +1879 @@
   m_vpsBaseLayerAvailableFlag = true; 
 
+#if  H_MV_FIX_NUM_VIEWS
+  m_numViews = 0; 
+#endif
 
 #endif
@@ -1924 +1927 @@
   m_vpsNonVuiExtensionLength = 0;
   m_splittingFlag    = false;
+
   
   for( Int i = 0; i < MAX_NUM_SCALABILITY_TYPES; i++ )
@@ -2199 +2203 @@
 
 
+#if H_MV_FIX_NUM_VIEWS
+Void     TComVPS::initNumViews( )
+{
+  Int m_numViews = 1; 
+#if HHI_VIEW_ID_LIST_I5_J0107
+#if H_3D
+  AOF( m_viewOIdxList.size() == 0 ); 
+  m_viewOIdxList.push_back( 0 );        
+#endif
+#endif
+
+  for( Int i = 0; i <=  getMaxLayersMinus1(); i++ )
+  {
+    Int lId = getLayerIdInNuh( i ); 
+    if( i > 0 )
+    {
+      Bool newViewFlag = true; 
+      for( Int j = 0; j < i; j++ )
+      {
+        if( getViewOrderIdx( lId )  ==  getViewOrderIdx( getLayerIdInNuh( j ) )  )
+        {
+          newViewFlag = false;
+        }
+      }
+      if( newViewFlag )
+      {
+        m_numViews++;
+#if HHI_VIEW_ID_LIST_I5_J0107
+#if H_3D
+        m_viewOIdxList.push_back( getViewOrderIdx( lId ) );        
+#endif
+#endif
+      }
+    }
+  }
+}
+#endif
+
+
 Int TComVPS::getScalabilityId( Int layerIdInVps, ScalabilityType scalType )
 {
@@ -2357 +2400 @@
 }
 
+#if !H_MV_FIX_NUM_VIEWS
 Int TComVPS::getNumViews()
 {
@@ -2368 +2412 @@
     }    
   }
-
   return numViews;
 }
+#endif
+
 
 Void TComVPS::deriveLayerSetLayerIdList()