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

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.cpp (modified) (9 diffs)

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

@@ -38 +38 @@
 #include "CommonDef.h"
 #include "SEI.h"
-#if NH_MV_SEI
+#if NH_MV
 #include "TComSlice.h"
 #endif
@@ -178 +178 @@
 }
 
-#if NH_MV_SEI
+#if NH_MV
 SEI::SEI()
 {
@@ -224 +224 @@
     case SEI::CHROMA_SAMPLING_FILTER_HINT:          return new SEIChromaSamplingFilterHint
 #endif
-#if NH_MV_SEI
-#if NH_MV_LAYERS_NOT_PRESENT_SEI
   case SEI::LAYERS_NOT_PRESENT                    :               return new SEILayersNotPresent;
-#endif
   case SEI::INTER_LAYER_CONSTRAINED_TILE_SETS     :               return new SEIInterLayerConstrainedTileSets;
 #if NH_MV_SEI_TBD
@@ -241 +238 @@
 #endif
   case SEI::THREE_DIMENSIONAL_REFERENCE_DISPLAYS_INFO:            return new SEIThreeDimensionalReferenceDisplaysInfo;
-#if SEI_DRI_F0169
   case SEI::DEPTH_REPRESENTATION_INFO             :               return new SEIDepthRepresentationInfo;
-#endif
   case SEI::MULTIVIEW_SCENE_INFO                  :               return new SEIMultiviewSceneInfo;
   case SEI::MULTIVIEW_ACQUISITION_INFO            :               return new SEIMultiviewAcquisitionInfo;
@@ -249 +244 @@
 #if NH_3D
   case SEI::ALTERNATIVE_DEPTH_INFO                :               return new SEIAlternativeDepthInfo;
-#endif
 #endif
   default:                                        assert( false ); return NULL;
@@ -340 +334 @@
 }
 
-
-#if NH_MV_LAYERS_NOT_PRESENT_SEI
 Void SEILayersNotPresent::setupFromCfgFile(const TChar* cfgFile)
 {
@@ -399 +391 @@
       return wrongConfig;
   };
-#endif
+
 
 
@@ -1019 +1011 @@
 };
 
-#if SEI_DRI_F0169
 Void SEIDepthRepresentationInfo::setupFromSlice  ( const TComSlice* slice )
 {
@@ -1196 +1187 @@
     return wrongConfig;
 }
-#endif
+
 
 Void SEIMultiviewSceneInfo::setupFromCfgFile(const TChar* cfgFile)