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

Timestamp:

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

Author:

tech

Message:

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

File:

• trunk/source/Lib/TLibEncoder/TEncGOP.h (modified) (2 diffs)

trunk/source/Lib/TLibEncoder/TEncGOP.h

@@ -99 +99 @@
 #if H_MV
   TComPicLists*           m_ivPicLists;
+#if H_MV5
+  std::vector<TComPic*>   m_refPicSetInterLayer0; 
+  std::vector<TComPic*>   m_refPicSetInterLayer1; 
+#else
   std::vector<TComPic*>   m_refPicSetInterLayer; 
+#endif
 
   Int                     m_pocLastCoded;
@@ -211 +216 @@
   }
 #if H_MV
+#if H_MV5
+   Void  xSetRefPicListModificationsMv( std::vector<TComPic*> tempPicLists[2], TComSlice* pcSlice, UInt iGOPid );
+#else
    Void  xSetRefPicListModificationsMv( TComSlice* pcSlice, UInt iGOPid );
+#endif
 #endif
   Void dblMetric( TComPic* pcPic, UInt uiNumSlices );