Changeset 1374 in 3DVCSoftware for branches/HTM-15.2-dev/source/Lib/TLibCommon/SEI.h

Timestamp:

9 Nov 2015, 21:13:05 (8 years ago)

Author:

tech

Message:

Macro cleanups.

File:

• branches/HTM-15.2-dev/source/Lib/TLibCommon/SEI.h (modified) (10 diffs)

branches/HTM-15.2-dev/source/Lib/TLibCommon/SEI.h

@@ -44 +44 @@
 
 
-#if NH_MV_SEI
+#if NH_MV
 #include "TAppCommon/program_options_lite.h"
 using namespace std;
@@ -53 +53 @@
 //! \{
 class TComSPS;
-#if NH_MV_SEI
+#if NH_MV
 class TComSlice;
 class SEIScalableNesting;
@@ -97 +97 @@
     KNEE_FUNCTION_INFO                   = 141,
     COLOUR_REMAPPING_INFO                = 142,
-#if NH_MV_SEI
     DEINTERLACED_FIELD_IDENTIFICATION         = 143,
     LAYERS_NOT_PRESENT                        = 160,
@@ -116 +115 @@
     ,ALTERNATIVE_DEPTH_INFO                    = 181
 #endif
-#endif
 
   };
@@ -133 +131 @@
   virtual PayloadType payloadType() const = 0;
 
-#if NH_MV_SEI
+#if NH_MV
   virtual SEI*       getCopy( ) const;
   static SEI*        getNewSEIMessage         ( SEI::PayloadType payloadType );
@@ -551 +549 @@
 };
 
-#if NH_MV
-#if !NH_MV_SEI
-class SEISubBitstreamProperty : public SEI
-{
-public:
-  PayloadType payloadType() const { return SUB_BITSTREAM_PROPERTY; }
-
-  SEISubBitstreamProperty():   m_activeVpsId(-1), m_numAdditionalSubStreams(0) {}
-  virtual ~SEISubBitstreamProperty() {}
-
-  Int  m_activeVpsId;
-  Int  m_numAdditionalSubStreams;
-  std::vector<Int>  m_subBitstreamMode;
-  std::vector<Int>  m_outputLayerSetIdxToVps;
-  std::vector<Int>  m_highestSublayerId;
-  std::vector<Int>  m_avgBitRate;
-  std::vector<Int>  m_maxBitRate;
-};
-#endif
-#endif
-
 typedef std::list<SEI*> SEIMessages;
 
@@ -678 +655 @@
 
 };
-#if NH_MV_SEI
-#if NH_MV_LAYERS_NOT_PRESENT_SEI
+#if NH_MV
 class SEILayersNotPresent : public SEI
 {
@@ -700 +676 @@
   }
 };
-#endif
 
 class SEIInterLayerConstrainedTileSets : public SEI
@@ -943 +918 @@
 };
 
-#if SEI_DRI_F0169
 class SEIDepthRepresentationInfo : public SEI
 {
@@ -1012 +986 @@
         IntAry2d       m_depth_nonlinear_representation_model;
 };
-#endif
+
 
 class SEIMultiviewSceneInfo : public SEI