Changeset 622 in 3DVCSoftware for trunk/source/Lib/TLibEncoder/TEncCfg.h

Timestamp:

11 Sep 2013, 14:40:25 (12 years ago)

Author:

tech

Message:

Merged 8.0-dev0@621 (MV-HEVC 5 HLS).

File:

• trunk/source/Lib/TLibEncoder/TEncCfg.h (modified) (5 diffs)

trunk/source/Lib/TLibEncoder/TEncCfg.h

@@ -77 +77 @@
   Int m_interLayerPredLayerIdc [MAX_NUM_REF_PICS];
   Int m_interViewRefPosL[2][MAX_NUM_REF_PICS];  
+#if !H_MV5
   Int m_collocatedRefLayerIdx; 
+#endif
 #endif
   GOPEntry()
@@ -95 +97 @@
 #if H_MV
   , m_numActiveRefLayerPics(0)
+#if !H_MV5
   , m_collocatedRefLayerIdx(-1)
+#endif
 #endif
   {
@@ -357 +361 @@
   Int       m_layerIdInVps;
   Int       m_viewId;
+#if H_MV5
+  Int       m_viewIndex; 
+#endif
 #endif 
 
 #if H_3D
+#if !H_MV5
   Int       m_viewIndex; 
+#endif
   Bool      m_isDepth;
 
@@ -417 +426 @@
   , m_layerIdInVps(-1)
   , m_viewId(-1)
+#if H_MV5
+  , m_viewIndex(-1)
+#endif
 #if H_3D
+#if !H_MV5
   , m_viewIndex(-1)
+#endif
   , m_isDepth(false)
   , m_bUseVSO(false)
@@ -451 +465 @@
   Void      setViewId                        ( Int viewId  )      { m_viewId  = viewId;  }
   Int       getViewId                        ()                   { return m_viewId;    }
-#if H_3D
+#if H_MV5
   Void      setViewIndex                     ( Int viewIndex  )   { m_viewIndex  = viewIndex;  }
   Int       getViewIndex                     ()                   { return m_viewIndex;    }
+#endif
+#if H_3D
+#if !H_MV5
+  Void      setViewIndex                     ( Int viewIndex  )   { m_viewIndex  = viewIndex;  }
+  Int       getViewIndex                     ()                   { return m_viewIndex;    }
+#endif
   Void      setIsDepth                       ( Bool isDepth )   { m_isDepth = isDepth; }
   Bool      getIsDepth                       ()                 { return m_isDepth; }