Changeset 1394 in 3DVCSoftware for branches/HTM-16.0-dev1/source/Lib/TLibCommon/TComPic.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/TComPic.h (modified) (4 diffs)

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

@@ -154 +154 @@
   TComDecodedRps        m_decodedRps;
 #endif
-#if NH_3D_VSO
+#if NH_3D_VSO || NH_3D
   Int                   m_viewIndex;
   Bool                  m_isDepth;
@@ -311 +311 @@
    Void          print( Int outputLevel );
 
-#if NH_3D_VSO
+#if NH_3D_VSO ||  NH_3D
    Void          setViewIndex          ( Int viewIndex )  { m_viewIndex = viewIndex;   }
    Int           getViewIndex          () const           { return m_viewIndex;     }
@@ -404 +404 @@
   TComList<TComSubDpb*>       m_subDpbs; 
   Bool                        m_printPicOutput; 
-#if NH_3D_VSO
+#if NH_3D_VSO || NH_3D
   const TComVPS*              m_vps; 
 #endif
@@ -448 +448 @@
   Void                   print(); 
 
-#if NH_3D_VSO
+#if NH_3D_VSO || NH_3D
   Void                   setVPS                        ( const TComVPS* vps ) { m_vps = vps;  }; 
+#endif
+
+#if NH_3D || NH_3D_VSO
   TComPic*               getPic                        ( Int viewIndex, Bool depthFlag, Int auxId, Int poc );
   TComPicYuv*            getPicYuv                     ( Int viewIndex, Bool depthFlag, Int auxId, Int poc, Bool recon );