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

Timestamp:

11 Aug 2014, 19:11:02 (10 years ago)

Author:

seregin

Message:

CRI SEI patch provided by Andrivon Pierre <Pierre.Andrivon@…>

Changes:

• General code cleaning-up and improvement
• Alignment of code with latest spec (JCTVC-R1013_v3)
• Tested successfully for macro SVC_EXTENSION=1 and SVC_EXTENSION=0

At the encoder, parameters of the SEI are input through a file.
At the decoder, when present, CRI SEI is applied with the runtime parameter --SEIColourRemappingInfo (same as --SEIDecodedPictureHash)

Location:

branches/SHM-dev/source/Lib/TLibCommon

Files:

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

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

@@ -98 +98 @@
 #endif
 #endif
-#if Q0074_SEI_COLOR_MAPPING
-    COLOR_MAPPING_INFO                   = 143,
+#if Q0074_COLOUR_REMAPPING_SEI
+    COLOUR_REMAPPING_INFO                = 143,
 #endif
 #if Q0078_ADD_LAYER_SETS
@@ -447 +447 @@
 };
 #endif
-#if Q0074_SEI_COLOR_MAPPING
-class SEIColorMappingInfo : public SEI
-{
-public:
-  PayloadType payloadType() const { return COLOR_MAPPING_INFO; }
-  SEIColorMappingInfo() {
-  }
-  virtual ~SEIColorMappingInfo() {}
-
-  Int   m_colorMapId;
-  Bool  m_colorMapCancelFlag;
-  Bool  m_colorMapPersistenceFlag;
-  Bool  m_colorMap_video_signal_type_present_flag;
-  Bool  m_colorMap_video_full_range_flag;
-  Int   m_colorMap_primaries;
-  Int   m_colorMap_transfer_characteristics;
-  Int   m_colorMap_matrix_coeffs;
-  Int   m_colorMapModelId;
-
-  Int   m_colour_map_coded_data_bit_depth;
-  Int   m_colour_map_target_bit_depth;
-
-  Int   m_num_input_pivots[3];
-  Int*  m_coded_input_pivot_value[3];
-  Int*  m_target_input_pivot_value[3];
-  
-  Bool  m_matrix_flag;
-  Int   m_log2_matrix_denom;
-  Int   m_matrix_coef[3][3];
-
-  Int   m_num_output_pivots[3];
-  Int*  m_coded_output_pivot_value[3];
-  Int*  m_target_output_pivot_value[3];
+#if Q0074_COLOUR_REMAPPING_SEI
+class SEIColourRemappingInfo : public SEI
+{
+public:
+  PayloadType payloadType() const { return COLOUR_REMAPPING_INFO; }
+  SEIColourRemappingInfo() {}
+  ~SEIColourRemappingInfo() {}
+ 
+  Int   m_colourRemapId;
+  Bool  m_colourRemapCancelFlag;
+  Bool  m_colourRemapPersistenceFlag;
+  Bool  m_colourRemapVideoSignalTypePresentFlag;
+  Bool  m_colourRemapVideoFullRangeFlag;
+  Int   m_colourRemapPrimaries;
+  Int   m_colourRemapTransferCharacteristics;
+  Int   m_colourRemapMatrixCoeffs;
+  Int   m_colourRemapCodedDataBitDepth;
+  Int   m_colourRemapTargetBitDepth;
+  Int   m_preLutNumValMinus1[3];
+  std::vector<Int> m_preLutCodedValue[3];
+  std::vector<Int> m_preLutTargetValue[3];
+  Bool  m_colourRemapMatrixPresentFlag;
+  Int   m_log2MatrixDenom;
+  Int   m_colourRemapCoeffs[3][3];
+  Int   m_postLutNumValMinus1[3];
+  std::vector<Int> m_postLutCodedValue[3];
+  std::vector<Int> m_postLutTargetValue[3];
 };
 #endif

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

@@ -366 +366 @@
 }
 
-#if SVC_EXTENSION
 Void TComPicYuv::dump( Char* pFileName, Bool bAdd, Int bitDepth )
 {
@@ -431 +430 @@
 }
 
-#endif
-
 //! \}

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

@@ -191 +191 @@
   Void convertToMonochrome();
 #endif
+#endif //SVC_EXTENSION
   Void dump( Char* pFileName, Bool bAdd, Int bitDepth );
-#endif //SVC_EXTENSION
 
 };// END CLASS DEFINITION TComPicYuv

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

@@ -109 +109 @@
 #define R0300_CGS_RES_COEFF_CODING       1      ///< JCTVC-R0300: improved residual coefficient coding for R0151
 #endif
-#define O0194_WEIGHTED_PREDICTION_CGS    1      ///< JCTVC-O0194: Weighted prediciton for color gamut scalability
+#define O0194_WEIGHTED_PREDICTION_CGS    1      ///< JCTVC-O0194: Weighted prediction for colour gamut scalability
 #define POC_RESET_FLAG                   0      ///< JCTVC-N0244: POC reset flag for  layer pictures.
 #define POC_RESET_IDC                    1      ///< JCTVC-P0041: Include poc_reset_idc and related derivation - eventually will replace POC_RESET_FLAG
@@ -280 +280 @@
 #define MAX_SUB_STREAMS                  1024
 #endif
-#define Q0074_SEI_COLOR_MAPPING          1      ///< JCTVC-Q0074, SEI Color Mapping
 #define LAYERS_NOT_PRESENT_SEI           1      ///< JCTVC-M0043: add layers not present SEI.
 #define N0383_IL_CONSTRAINED_TILE_SETS_SEI  1
@@ -288 +287 @@
 
 #endif // SVC_EXTENSION
+#define Q0074_COLOUR_REMAPPING_SEI       1      ///< JCTVC-Q0074, JCTVC-R0344: SEI Colour Remapping Information