Changeset 310 in SHVCSoftware for trunk/source/Lib/TLibEncoder/TEncGOP.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/TEncGOP.h (modified) (4 diffs)

trunk/source/Lib/TLibEncoder/TEncGOP.h

@@ -127 +127 @@
   UInt                    m_tl0Idx;
   UInt                    m_rapIdx;
-#if L0045_NON_NESTED_SEI_RESTRICTIONS
   Bool                    m_activeParameterSetSEIPresentInAU;
   Bool                    m_bufferingPeriodSEIPresentInAU;
   Bool                    m_pictureTimingSEIPresentInAU;
-#if K0180_SCALABLE_NESTING_SEI
   Bool                    m_nestedBufferingPeriodSEIPresentInAU;
   Bool                    m_nestedPictureTimingSEIPresentInAU;
-#endif
-#endif
 public:
   TEncGOP();
@@ -180 +176 @@
 
   SEIActiveParameterSets* xCreateSEIActiveParameterSets (TComSPS *sps);
+#if M0043_LAYERS_PRESENT_SEI
+  SEILayersPresent*       xCreateSEILayersPresent ();
+#endif
   SEIFramePacking*        xCreateSEIFramePacking();
   SEIDisplayOrientation*  xCreateSEIDisplayOrientation();
 
-#if J0149_TONE_MAPPING_SEI
   SEIToneMappingInfo*     xCreateSEIToneMappingInfo();
-#endif
 
   Void xCreateLeadingSEIMessages (/*SEIMessages seiMessages,*/ AccessUnit &accessUnit, TComSPS *sps);
-#if L0045_NON_NESTED_SEI_RESTRICTIONS
   Int xGetFirstSeiLocation (AccessUnit &accessUnit);
   Void xResetNonNestedSEIPresentFlags()
@@ -196 +192 @@
     m_pictureTimingSEIPresentInAU      = false;
   }
-#if K0180_SCALABLE_NESTING_SEI
   Void xResetNestedSEIPresentFlags()
   {
@@ -202 +197 @@
     m_nestedPictureTimingSEIPresentInAU      = false;
   }
-#endif
-#endif
-#if L0386_DB_METRIC
   Void dblMetric( TComPic* pcPic, UInt uiNumSlices );
+#if M0457_COL_PICTURE_SIGNALING
+  TComPic* getMotionPredIlp(TComSlice* pcSlice);
 #endif
 };// END CLASS DEFINITION TEncGOP