Changeset 1386 in 3DVCSoftware for trunk/source/Lib/TLibCommon/TComPic.h

Timestamp:

13 Nov 2015, 16:29:39 (9 years ago)

Author:

tech

Message:

Merged 15.1-dev1@1381.

File:

• trunk/source/Lib/TLibCommon/TComPic.h (modified) (6 diffs)

trunk/source/Lib/TLibCommon/TComPic.h

@@ -154 +154 @@
   TComDecodedRps        m_decodedRps;
 #endif
-#if NH_3D
+#if NH_3D_VSO
   Int                   m_viewIndex;
   Bool                  m_isDepth;
@@ -189 +189 @@
 
   TComPicSym*   getPicSym()           { return  &m_picSym;    }
+  const TComPicSym* getPicSym() const { return  &m_picSym;    }
   TComSlice*    getSlice(Int i)       { return  m_picSym.getSlice(i);  }
   Int           getPOC() const        { return  m_picSym.getSlice(m_uiCurrSliceIdx)->getPOC();  }
@@ -247 +248 @@
 #if NH_MV
    Void          setLayerId            ( Int layerId )    { m_layerId      = layerId; }
-   Int           getLayerId            ()                 { return m_layerId;    }
+   Int           getLayerId            () const           { return m_layerId;    }
    
    Void          setViewId             ( Int viewId )     { m_viewId = viewId;   }
-   Int           getViewId             ()                 { return m_viewId;     }
+   Int           getViewId             () const           { return m_viewId;     }
 
    Void          setPicOutputFlag(Bool b)                 { m_bPicOutputFlag = b;      }
-   Bool          getPicOutputFlag()                       { return m_bPicOutputFlag ;  }
+   Bool          getPicOutputFlag() const                 { return m_bPicOutputFlag ;  }
 
    Bool          getPocResetPeriodId();
@@ -310 +311 @@
    Void          print( Int outputLevel );
 
-#if NH_3D
+#if NH_3D_VSO
    Void          setViewIndex          ( Int viewIndex )  { m_viewIndex = viewIndex;   }
-   Int           getViewIndex          ()                 { return m_viewIndex;     }
+   Int           getViewIndex          () const           { return m_viewIndex;     }
 
    Void          setIsDepth            ( Bool isDepth )   { m_isDepth = isDepth; }
@@ -403 +404 @@
   TComList<TComSubDpb*>       m_subDpbs; 
   Bool                        m_printPicOutput; 
-#if NH_3D                     
+#if NH_3D_VSO
   const TComVPS*              m_vps; 
 #endif
@@ -447 +448 @@
   Void                   print(); 
 
-#if NH_3D                                   
+#if NH_3D_VSO
   Void                   setVPS                        ( const TComVPS* vps ) { m_vps = vps;  }; 
-  TComPic*               getPic                        ( Int viewIndex, Bool depthFlag, Int poc );
-  TComPicYuv*            getPicYuv                     ( Int viewIndex, Bool depthFlag, Int poc, Bool recon );
+  TComPic*               getPic                        ( Int viewIndex, Bool depthFlag, Int auxId, Int poc );
+  TComPicYuv*            getPicYuv                     ( Int viewIndex, Bool depthFlag, Int auxId, Int poc, Bool recon );
 #endif