Changeset 1394 in 3DVCSoftware for branches/HTM-16.0-dev1/source/Lib/TLibCommon/TComSlice.h

Timestamp:

4 Mar 2016, 09:42:34 (9 years ago)

Author:

tech

Message:

Clean-up VSO.

File:

• branches/HTM-16.0-dev1/source/Lib/TLibCommon/TComSlice.h (modified) (3 diffs)

branches/HTM-16.0-dev1/source/Lib/TLibCommon/TComSlice.h

@@ -1384 +1384 @@
   /// VPS EXTENSION 2 SYNTAX ELEMENTS
   Int     getDepthId                   ( Int layerIdInNuh)             const    { return getScalabilityId( getLayerIdInVps(layerIdInNuh), DEPTH_ID ); }
-#if NH_3D_VSO                                                             
+#if NH_3D_VSO || NH_3D
   Bool    getVpsDepthFlag              ( Int layerIdInNuh)             const    { return (getDepthId( layerIdInNuh ) > 0);  }
   Int     getLayerIdInNuh              ( Int viewIndex, Bool depthFlag, Int auxId ) const;   
@@ -2701 +2701 @@
   Int        m_viewId;
   Int        m_viewIndex; 
-#if NH_3D_VSO
+#if NH_3D_VSO || NH_3D
   Bool       m_isDepth;
 #endif
@@ -3168 +3168 @@
 #endif                        
 #endif
-#if NH_3D_VSO
+#if NH_3D_VSO || NH_3D
   Void                        setIsDepth            ( Bool isDepth )                 { m_isDepth = isDepth;                                          }
   Bool                        getIsDepth            () const                         { return m_isDepth;                                             }