Changeset 1113 in 3DVCSoftware for branches

Timestamp:

7 Nov 2014, 14:55:10 (10 years ago)

Author:

tech

Message:

Fixed MV only compilation bug.

File:

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

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

@@ -1193 +1193 @@
   Void    setRefLayers(); 
 
+#if H_MV_FIX_NUM_VIEWS
+  // To be aligned with spec naming, getViewIndex will be removed in future versions
+  Int     getViewOrderIdx ( Int layerIdInNuh )                             { return getScalabilityId( getLayerIdInVps(layerIdInNuh), VIEW_ORDER_INDEX  ); }    
+  Int     getViewIndex    ( Int layerIdInNuh )                             { return getViewOrderIdx( layerIdInNuh ); }    
+#else
   Int     getViewIndex    ( Int layerIdInNuh )                             { return getScalabilityId( getLayerIdInVps(layerIdInNuh), VIEW_ORDER_INDEX  ); }    
+#endif
   Int     getAuxId        ( Int layerIdInNuh )                             { return getScalabilityId( getLayerIdInVps(layerIdInNuh), AUX_ID  ); }    
   Int     getDependencyId ( Int layerIdInNuh )                             { return getScalabilityId( getLayerIdInVps(layerIdInNuh), DEPENDENCY_ID  ); }    
@@ -1320 +1326 @@
 
   /// VPS EXTENSION 2 SYNTAX ELEMENTS
+
+
 #if H_3D  
   Int     getDepthId      ( Int layerIdInNuh)                             { return getScalabilityId( getLayerIdInVps(layerIdInNuh), DEPTH_ID ); }
 #if HHI_TOOL_PARAMETERS_I2_J0107
   Bool    getVpsDepthFlag( Int layerIdInNuh)                              { return (getDepthId( layerIdInNuh ) > 0);  }
-  Int     getViewOrderIdx( Int layerIdInNuh)                              { return getViewIndex( layerIdInNuh ); };   
 #endif
   Int     getLayerIdInNuh( Int viewIndex, Bool depthFlag );