Changeset 1475 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibCommon

Timestamp:

22 Sep 2015, 20:18:26 (10 years ago)

Author:

seregin

Message:

port rev 4600, remove macro Q0074_COLOUR_REMAPPING_SEI

Location:

branches/SHM-dev/source/Lib/TLibCommon

Files:

• SEI.cpp (modified) (2 diffs)
• SEI.h (modified) (3 diffs)
• TypeDef.h (modified) (3 diffs)

branches/SHM-dev/source/Lib/TLibCommon/SEI.cpp

@@ -149 +149 @@
     case SEI::TEMP_MOTION_CONSTRAINED_TILE_SETS:    return "Temporal motion constrained tile sets";
     case SEI::CHROMA_RESAMPLING_FILTER_HINT:        return "Chroma sampling filter hint";
-#if Q0074_COLOUR_REMAPPING_SEI
     case SEI::COLOUR_REMAPPING_INFO:                return "Colour remapping info";
-#endif
 #if SVC_EXTENSION
 #if LAYERS_NOT_PRESENT_SEI
@@ -183 +181 @@
 }
 
-
 #if SUB_BITSTREAM_PROPERTY_SEI
 SEISubBitstreamProperty::SEISubBitstreamProperty()

branches/SHM-dev/source/Lib/TLibCommon/SEI.h

@@ -91 +91 @@
     CHROMA_RESAMPLING_FILTER_HINT        = 140,
     KNEE_FUNCTION_INFO                   = 141,
-#if Q0074_COLOUR_REMAPPING_SEI
     COLOUR_REMAPPING_INFO                = 142,
-#endif
 #if LAYERS_NOT_PRESENT_SEI
     LAYERS_NOT_PRESENT                   = 160,
@@ -459 +457 @@
 };
 
-#if Q0074_COLOUR_REMAPPING_SEI
 class SEIColourRemappingInfo : public SEI
 {
@@ -501 +498 @@
   std::vector<CRIlut> m_postLut[3];
 };
-#endif
 
 class SEIChromaResamplingFilterHint : public SEI

branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h

@@ -165 +165 @@
 #define T0196_SELECTIVE_RDOQ                              1 ///< selective RDOQ
 #define U0040_MODIFIED_WEIGHTEDPREDICTION_WITH_BIPRED_AND_CLIPPING 1
-#define Q0074_COLOUR_REMAPPING_SEI                        1      ///< JCTVC-Q0074, JCTVC-R0344: SEI Colour Remapping Information
 
 // ====================================================================================================================
@@ -378 +377 @@
 };
 
-#if Q0074_COLOUR_REMAPPING_SEI
 enum MATRIX_COEFFICIENTS // Table E.5 (Matrix coefficients)
 {
@@ -393 +391 @@
   MATRIX_COEFFICIENTS_BT2020_CONSTANT_LUMINANCE     = 10,
 };
-#endif
 
 enum DeblockEdgeDir