Changeset 593 in SHVCSoftware for branches/SHM-5.0-dev/source/Lib/TLibEncoder/TEncTop.h

Timestamp:

2 Feb 2014, 04:51:29 (11 years ago)

Author:

seregin

Message:

update to HM-13.0

File:

• branches/SHM-5.0-dev/source/Lib/TLibEncoder/TEncTop.h (modified) (7 diffs)

branches/SHM-5.0-dev/source/Lib/TLibEncoder/TEncTop.h

@@ -4 +4 @@
  * granted under this license.  
  *
- * Copyright (c) 2010-2013, ITU/ISO/IEC
+ * Copyright (c) 2010-2014, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -73 +73 @@
   UInt                    m_uiNumAllPicCoded;             ///< number of coded pictures
   TComList<TComPic*>      m_cListPic;                     ///< dynamic list of pictures
-#if SVC_EXTENSION 
-  static Int              m_iSPSIdCnt;                    ///< next Id number for SPS    
-  static Int              m_iPPSIdCnt;                    ///< next Id number for PPS    
-#if AVC_SYNTAX
-  fstream*                m_pBLSyntaxFile;
-#endif
-#endif
-  
+ 
   // encoder search
   TEncSearch              m_cSearch;                      ///< encoder search class
@@ -130 +123 @@
   
 #if SVC_EXTENSION
-
+  static Int              m_iSPSIdCnt;                    ///< next Id number for SPS    
+  static Int              m_iPPSIdCnt;                    ///< next Id number for PPS    
+#if AVC_SYNTAX
+  fstream*                m_pBLSyntaxFile;
+#endif
   TEncTop**               m_ppcTEncTop;
   TEncTop*                getLayerEnc(UInt layer)   { return m_ppcTEncTop[layer]; }
@@ -163 +160 @@
   Void  xInitRPS          (Bool isFieldCoding);           ///< initialize PPS from encoder options
 #if SVC_EXTENSION
-  Void xInitILRP();
+  Void  xInitILRP();
 #endif
 public:
@@ -210 +207 @@
   Int getReferencePictureSetIdxForSOP(TComSlice* slice, Int POCCurr, Int GOPid );
   TComScalingList*        getScalingList        () { return  &m_scalingList;         }
+  // -------------------------------------------------------------------------------------------------------------------
+  // encoder function
+  // -------------------------------------------------------------------------------------------------------------------
+
+  /// encode several number of pictures until end-of-sequence
 #if SVC_EXTENSION
   Void                    setLayerEnc(TEncTop** p) {m_ppcTEncTop = p;}
@@ -224 +226 @@
 #endif
   Window&  getScaledRefLayerWindow(Int x)            { return m_scaledRefLayerWindow[x]; }
-#endif //SVC_EXTENSION
-
-  // -------------------------------------------------------------------------------------------------------------------
-  // encoder function
-  // -------------------------------------------------------------------------------------------------------------------
-
-  /// encode several number of pictures until end-of-sequence
-#if SVC_EXTENSION
   TComPic** getIlpList() { return m_cIlpPic; }
 #if REF_IDX_MFM
@@ -281 +275 @@
 
 #endif // __TENCTOP__
+