Changeset 310 in SHVCSoftware for trunk/source/Lib/TLibEncoder/TEncTop.h

Timestamp:

22 Jul 2013, 21:40:00 (11 years ago)

Author:

seregin

Message:

reintegrate SHM-2.1-dev branch

Location:

trunk

Files:

• . (modified) (1 prop)
• source (modified) (1 prop)
• source/Lib/TLibEncoder/TEncTop.h (modified) (5 diffs)

trunk/source/Lib/TLibEncoder/TEncTop.h

@@ -139 +139 @@
   Bool                    m_bMFMEnabledFlag;
 #endif
+#if M0457_IL_SAMPLE_PRED_ONLY_FLAG
+  Int                     m_ilSampleOnlyPred;
+#endif
 #if SCALED_REF_LAYER_OFFSETS
-  Window                  m_scaledRefLayerWindow;
+  UInt                    m_numScaledRefLayerOffsets;
+  Window                  m_scaledRefLayerWindow[MAX_LAYERS];
 #endif
 protected:
@@ -195 +199 @@
   TComPPS*                getPPS                () { return  &m_cPPS;                 }
   Void selectReferencePictureSet(TComSlice* slice, Int POCCurr, Int GOPid );
-#if L0208_SOP_DESCRIPTION_SEI
   Int getReferencePictureSetIdxForSOP(TComSlice* slice, Int POCCurr, Int GOPid );
-#endif
   TComScalingList*        getScalingList        () { return  &m_scalingList;         }
 #if SVC_EXTENSION
@@ -207 +209 @@
 #endif
 #if SCALED_REF_LAYER_OFFSETS
-  Window&  getScaledRefLayerWindow()            { return m_scaledRefLayerWindow; }
+  Void                    setNumScaledRefLayerOffsets(Int x) { m_numScaledRefLayerOffsets = x; }
+  UInt                    getNumScaledRefLayerOffsets() { return m_numScaledRefLayerOffsets; }
+  Window&  getScaledRefLayerWindow(Int x)            { return m_scaledRefLayerWindow[x]; }
 #endif
 
@@ -224 +228 @@
   Bool      getMFMEnabledFlag()                   {return m_bMFMEnabledFlag;}    
 #endif
+#if M0457_IL_SAMPLE_PRED_ONLY_FLAG
+  Void      setIlSampleOnlyPred( Int i )          { m_ilSampleOnlyPred = i;    }
+  Int       getIlSampleOnlyPred()                 { return m_ilSampleOnlyPred; }
+#endif
 #if AVC_SYNTAX
   Void      setBLSyntaxFile( fstream* pFile ) { m_pBLSyntaxFile = pFile; }
@@ -230 +238 @@
   Void      encode( TComPicYuv* pcPicYuvOrg, TComList<TComPicYuv*>& rcListPicYuvRecOut, std::list<AccessUnit>& accessUnitsOut, Int iPicIdInGOP  );
   Void      encodePrep( TComPicYuv* pcPicYuvOrg );
-#if VPS_EXTN_DIRECT_REF_LAYERS_CONTINUE
-  TEncTop*  getRefLayerEnc(UInt layerId);
+#if VPS_EXTN_DIRECT_REF_LAYERS
+  TEncTop*  getRefLayerEnc(UInt refLayerIdc);
 #endif
 #else