From bd91ebd6e49505538c56b718cfc3285539870493 Mon Sep 17 00:00:00 2001
From: Seungha Yang <seungha.yang@navercorp.com>
Date: Fri, 26 Apr 2019 20:11:12 +0900
Subject: [PATCH] h265parser: Add parsing mastering display colour volume SEI
 message

... and content light level SEI message. Those SEI messages are required
for HDR rendering.
---
 gst-libs/gst/codecparsers/gsth265parser.c | 49 +++++++++++++++++++++++
 gst-libs/gst/codecparsers/gsth265parser.h | 42 +++++++++++++++++++
 2 files changed, 91 insertions(+)

diff --git a/gst-libs/gst/codecparsers/gsth265parser.c b/gst-libs/gst/codecparsers/gsth265parser.c
index 972691896f..fdad4dc5ae 100644
--- a/gst-libs/gst/codecparsers/gsth265parser.c
+++ b/gst-libs/gst/codecparsers/gsth265parser.c
@@ -1182,6 +1182,47 @@ error:
   return GST_H265_PARSER_ERROR;
 }
 
+static GstH265ParserResult
+gst_h265_parser_parse_mastering_display_colour_volume (GstH265Parser * parser,
+    GstH265MasteringDisplayColourVolume * mdcv, NalReader * nr)
+{
+  guint i;
+
+  GST_DEBUG ("parsing \"Mastering display colour volume\"");
+
+  for (i = 0; i < 3; i++) {
+    READ_UINT16 (nr, mdcv->display_primaries_x[i], 16);
+    READ_UINT16 (nr, mdcv->display_primaries_y[i], 16);
+  }
+
+  READ_UINT16 (nr, mdcv->white_point_x, 16);
+  READ_UINT16 (nr, mdcv->white_point_y, 16);
+  READ_UINT32 (nr, mdcv->max_display_mastering_luminance, 32);
+  READ_UINT32 (nr, mdcv->min_display_mastering_luminance, 32);
+
+  return GST_H265_PARSER_OK;
+
+error:
+  GST_WARNING ("error parsing \"Mastering display colour volume\"");
+  return GST_H265_PARSER_ERROR;
+}
+
+static GstH265ParserResult
+gst_h265_parser_parse_content_light_level_info (GstH265Parser * parser,
+    GstH265ContentLightLevel * cll, NalReader * nr)
+{
+  GST_DEBUG ("parsing \"Content light level\"");
+
+  READ_UINT16 (nr, cll->max_content_light_level, 16);
+  READ_UINT16 (nr, cll->max_pic_average_light_level, 16);
+
+  return GST_H265_PARSER_OK;
+
+error:
+  GST_WARNING ("error parsing \"Content light level\"");
+  return GST_H265_PARSER_ERROR;
+}
+
 /******** API *************/
 
 /**
@@ -2441,6 +2482,14 @@ gst_h265_parser_parse_sei_message (GstH265Parser * parser,
         res = gst_h265_parser_parse_time_code (parser,
             &sei->payload.time_code, nr);
         break;
+      case GST_H265_SEI_MASTERING_DISPLAY_COLOUR_VOLUME:
+        res = gst_h265_parser_parse_mastering_display_colour_volume (parser,
+            &sei->payload.mastering_display_colour_volume, nr);
+        break;
+      case GST_H265_SEI_CONTENT_LIGHT_LEVEL:
+        res = gst_h265_parser_parse_content_light_level_info (parser,
+            &sei->payload.content_light_level, nr);
+        break;
       default:
         /* Just consume payloadSize bytes, which does not account for
            emulation prevention bytes */
diff --git a/gst-libs/gst/codecparsers/gsth265parser.h b/gst-libs/gst/codecparsers/gsth265parser.h
index bd9a19c90c..d5a5728864 100644
--- a/gst-libs/gst/codecparsers/gsth265parser.h
+++ b/gst-libs/gst/codecparsers/gsth265parser.h
@@ -222,6 +222,8 @@ typedef enum
  * @GST_H265_SEI_PIC_TIMING: Picture Timing SEI Message
  * @GST_H265_SEI_RECOVERY_POINT: Recovery Point SEI Message (D.3.8)
  * @GST_H265_SEI_TIME_CODE: Time code SEI message (D.2.27) (Since: 1.16)
+ * @GST_H265_SEI_MASTERING_DISPLAY_COLOUR_VOLUME: Mastering display colour volume information SEI message (D.2.28) (Since: 1.18)
+ * @GST_H265_SEI_CONTENT_LIGHT_LEVEL: Content light level information SEI message (D.2.35) (Since: 1.18)
  * ...
  *
  * The type of SEI message.
@@ -232,6 +234,8 @@ typedef enum
   GST_H265_SEI_PIC_TIMING = 1,
   GST_H265_SEI_RECOVERY_POINT = 6,
   GST_H265_SEI_TIME_CODE = 136,
+  GST_H265_SEI_MASTERING_DISPLAY_COLOUR_VOLUME = 137,
+  GST_H265_SEI_CONTENT_LIGHT_LEVEL = 144,
       /* and more...  */
 } GstH265SEIPayloadType;
 
@@ -321,6 +325,8 @@ typedef struct _GstH265PicTiming                GstH265PicTiming;
 typedef struct _GstH265BufferingPeriod          GstH265BufferingPeriod;
 typedef struct _GstH265RecoveryPoint            GstH265RecoveryPoint;
 typedef struct _GstH265TimeCode                 GstH265TimeCode;
+typedef struct _GstH265MasteringDisplayColourVolume GstH265MasteringDisplayColourVolume;
+typedef struct _GstH265ContentLightLevel        GstH265ContentLightLevel;
 typedef struct _GstH265SEIMessage               GstH265SEIMessage;
 
 /**
@@ -1199,6 +1205,40 @@ struct _GstH265TimeCode
   guint32 time_offset_value[3];
 };
 
+/**
+ * GstH265MasteringDisplayColourVolume:
+ * The colour volume (primaries, white point and luminance range) of display
+ * defined by SMPTE ST 2086.
+ *
+ * D.2.28
+ *
+ * Since: 1.18
+ */
+struct _GstH265MasteringDisplayColourVolume
+{
+  guint16 display_primaries_x[3];
+  guint16 display_primaries_y[3];
+  guint16 white_point_x;
+  guint16 white_point_y;
+  guint32 max_display_mastering_luminance;
+  guint32 min_display_mastering_luminance;
+};
+
+/**
+ * GstH265ContentLightLevel:
+ * The upper bounds for the nominal target brightness light level
+ * as specified in CEA-861.3
+ *
+ * D.2.35
+ *
+ * Since: 1.18
+ */
+struct _GstH265ContentLightLevel
+{
+  guint16 max_content_light_level;
+  guint16 max_pic_average_light_level;
+};
+
 struct _GstH265SEIMessage
 {
   GstH265SEIPayloadType payloadType;
@@ -1208,6 +1248,8 @@ struct _GstH265SEIMessage
     GstH265PicTiming pic_timing;
     GstH265RecoveryPoint recovery_point;
     GstH265TimeCode time_code;
+    GstH265MasteringDisplayColourVolume mastering_display_colour_volume;
+    GstH265ContentLightLevel content_light_level;
     /* ... could implement more */
   } payload;
 };