commit 09d6588d9373bb4c7eaa53483f7a22cc19af4188
author Johannes Kron <kron@webrtc.org> Tue Nov 27 14:36:41 2018 +0100
committer Commit Bot <commit-bot@chromium.org> Tue Nov 27 14:05:31 2018 +0000
tree 7a045207c4e0c77a53cb5f89213afff3b882cd12
parent 53382cb19f94d9b969bd99642323d26fa4bfa3d7

Change HdrMetadataExtension to ColorSpaceExtension

Bug: webrtc:8651
Change-Id: Ica6f8c6bd13bb07f89700b9c0a359b9a58feefbb
Reviewed-on: https://webrtc-review.googlesource.com/c/111758
Commit-Queue: Johannes Kron <kron@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Åsa Persson <asapersson@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25800}

modules/rtp_rtcp/source/rtp_header_extensions.h

diff --git a/modules/rtp_rtcp/source/rtp_header_extensions.h b/modules/rtp_rtcp/source/rtp_header_extensions.h
index ba43415..42a6216 100644
--- a/modules/rtp_rtcp/source/rtp_header_extensions.h
+++ b/modules/rtp_rtcp/source/rtp_header_extensions.h
@@ -16,7 +16,7 @@
 
 #include "api/array_view.h"
 #include "api/rtp_headers.h"
-#include "api/video/hdr_metadata.h"
+#include "api/video/color_space.h"
 #include "api/video/video_content_type.h"
 #include "api/video/video_frame_marking.h"
 #include "api/video/video_rotation.h"
@@ -182,19 +182,23 @@
   static bool IsScalable(uint8_t temporal_id, uint8_t layer_id);
 };
 
-class HdrMetadataExtension {
+class ColorSpaceExtension {
  public:
-  using value_type = HdrMetadata;
-  static constexpr RTPExtensionType kId = kRtpExtensionHdrMetadata;
+  using value_type = ColorSpace;
+  static constexpr RTPExtensionType kId = kRtpExtensionColorSpace;
   static constexpr uint8_t kValueSizeBytes = 30;
+  static constexpr uint8_t kValueSizeBytesWithoutHdrMetadata = 4;
   // TODO(webrtc:8651): Change to a valid uri.
-  static constexpr const char kUri[] = "rtp-hdr-metadata-uri-placeholder";
+  static constexpr const char kUri[] = "rtp-colorspace-uri-placeholder";
 
   static bool Parse(rtc::ArrayView<const uint8_t> data,
-                    HdrMetadata* hdr_metadata);
-  static size_t ValueSize(const HdrMetadata&) { return kValueSizeBytes; }
+                    ColorSpace* color_space);
+  static size_t ValueSize(const ColorSpace& color_space) {
+    return color_space.hdr_metadata() ? kValueSizeBytes
+                                      : kValueSizeBytesWithoutHdrMetadata;
+  }
   static bool Write(rtc::ArrayView<uint8_t> data,
-                    const HdrMetadata& hdr_metadata);
+                    const ColorSpace& color_space);
 
  private:
   static constexpr int kChromaticityDenominator = 10000;  // 0.0001 resolution.