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

Timestamp:

18 Apr 2014, 19:14:51 (12 years ago)

Author:

seregin

Message:

commit the patch implementing JCTVC-Q0074 provided by Bordes Philippe <philippe.bordes@…>

Location:

branches/SHM-6-dev/source/Lib/TLibCommon

Files:

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

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

@@ -79 +79 @@
 #endif
 #if N0383_IL_CONSTRAINED_TILE_SETS_SEI
-    INTER_LAYER_CONSTRAINED_TILE_SETS    = 138
+    INTER_LAYER_CONSTRAINED_TILE_SETS    = 138,
 #endif
 #if SUB_BITSTREAM_PROPERTY_SEI
-   ,SUB_BITSTREAM_PROPERTY               = 139    // Final PayloadType to be defined after finalization
+    SUB_BITSTREAM_PROPERTY               = 139,    // Final PayloadType to be defined after finalization
 #endif
 #if O0164_MULTI_LAYER_HRD
-   ,BSP_NESTING                          = 140
-   ,BSP_INITIAL_ARRIVAL_TIME             = 141
-   ,BSP_HRD                              = 142
+    BSP_NESTING                          = 140,
+    BSP_INITIAL_ARRIVAL_TIME             = 141,
+    BSP_HRD                              = 142,
+#endif
+#if Q0074_SEI_COLOR_MAPPING
+    COLOR_MAPPING_INFO                   = 143,
 #endif
   };
@@ -405 +408 @@
 };
 
+#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;
+  UChar m_colorMap_primaries;
+  UChar m_colorMap_transfer_characteristics;
+  UChar m_colorMap_matrix_coeffs;
+  UChar 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];
+};
+#endif
+
 #if N0383_IL_CONSTRAINED_TILE_SETS_SEI
 class SEIInterLayerConstrainedTileSets : public SEI

branches/SHM-6-dev/source/Lib/TLibCommon/TComDataCU.cpp

@@ -3504 +3504 @@
   Int topStartL  = baseColPic->getSlice(0)->getSPS()->getScaledRefLayerWindowForLayer(baseColPic->getSlice(0)->getVPS()->getRefLayerId(getSlice()->getLayerId(), refLayerIdc)).getWindowTopOffset();
 #if Q0200_CONFORMANCE_BL_SIZE
-leftStartL+=baseColPic->getConformanceWindow().getWindowLeftOffset();
-topStartL+=baseColPic->getConformanceWindow().getWindowTopOffset();
+  leftStartL += baseColPic->getConformanceWindow().getWindowLeftOffset();
+  topStartL  += baseColPic->getConformanceWindow().getWindowTopOffset();
 #endif
 #else

branches/SHM-6-dev/source/Lib/TLibCommon/TComUpsampleFilter.cpp

@@ -127 +127 @@
   Int strideEL  = pcUsPic->getStride();
 #if Q0200_CONFORMANCE_BL_SIZE
-const Window &confBL = currSlice->getBaseColPic(refLayerIdc)->getConformanceWindow();
-widthBL-= (confBL.getWindowLeftOffset()+confBL.getWindowRightOffset());
-heightBL-=(confBL.getWindowBottomOffset()+confBL.getWindowTopOffset());
+  const Window &confBL = currSlice->getBaseColPic(refLayerIdc)->getConformanceWindow();
+  widthBL  -= (confBL.getWindowLeftOffset() + confBL.getWindowRightOffset());
+  heightBL -= (confBL.getWindowBottomOffset() + confBL.getWindowTopOffset());
 #endif
 #if P0312_VERT_PHASE_ADJ
@@ -322 +322 @@
     Int leftOffset = leftStartL > 0 ? leftStartL : 0;
 #if Q0200_CONFORMANCE_BL_SIZE
-leftStartL+= confBL.getWindowLeftOffset()<<4;
-topStartL+= confBL.getWindowTopOffset()<<4;
+    leftStartL += confBL.getWindowLeftOffset() << 4;
+    topStartL  += confBL.getWindowTopOffset() << 4;
 #endif
 #if N0214_INTERMEDIATE_BUFFER_16BITS
@@ -419 +419 @@
     heightBL  = pcBasePic->getHeight();
 #if Q0200_CONFORMANCE_BL_SIZE
-widthBL-= confBL.getWindowLeftOffset()+confBL.getWindowRightOffset();
-heightBL-=confBL.getWindowBottomOffset()+confBL.getWindowTopOffset();
+    widthBL  -= confBL.getWindowLeftOffset()+confBL.getWindowRightOffset();
+    heightBL -= confBL.getWindowBottomOffset()+confBL.getWindowTopOffset();
 #endif
     widthEL   = pcUsPic->getWidth () - scalEL.getWindowLeftOffset() - scalEL.getWindowRightOffset();

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

@@ -84 +84 @@
 
 #define O0164_MULTI_LAYER_HRD            1      ///< JCTVC-O0164: Multi-layer HRD operation
+#define Q0074_SEI_COLOR_MAPPING          1      ///< JCTVC-Q0074, SEI Color Mapping
 
 #define O0194_DIFFERENT_BITDEPTH_EL_BL   1      ///< JCTVC-O0194: Support for different bitdepth values for BL and EL, add required configuration parameters (and Some bugfixes when REPN_FORMAT_IN_VPS (JCTVC-N0092) is enabled)