zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change HdrMetadataExtension to ColorSpaceExtension

Browse Source 
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}
This commit is contained in:
Johannes Kron
2018-11-27 14:36:41 +01:00
committed by Commit Bot
parent 53382cb19f
commit 09d6588d93
9 changed files with 158 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/rtp_headers.h
View File

@ -17,7 +17,7 @@
#include "absl/types/optional.h"
#include "api/array_view.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"
@ -129,7 +129,7 @@ struct RTPHeaderExtension {
// https://tools.ietf.org/html/draft-ietf-mmusic-sdp-bundle-negotiation-38
Mid mid;
absl::optional<HdrMetadata> hdr_metadata;
absl::optional<ColorSpace> color_space;
};
struct RTPHeader {

2
modules/rtp_rtcp/include/rtp_rtcp_defines.h
View File

@ -104,7 +104,7 @@ enum RTPExtensionType : int {
kRtpExtensionRepairedRtpStreamId,
kRtpExtensionMid,
kRtpExtensionGenericFrameDescriptor,
kRtpExtensionHdrMetadata,
kRtpExtensionColorSpace,
kRtpExtensionNumberOfExtensions // Must be the last entity in the enum.
};

2
modules/rtp_rtcp/source/rtp_header_extension_map.cc
View File

@ -43,7 +43,7 @@ constexpr ExtensionInfo kExtensions[] = {
CreateExtensionInfo<RepairedRtpStreamId>(),
CreateExtensionInfo<RtpMid>(),
CreateExtensionInfo<RtpGenericFrameDescriptorExtension>(),
CreateExtensionInfo<HdrMetadataExtension>(),
CreateExtensionInfo<ColorSpaceExtension>(),
};
// Because of kRtpExtensionNone, NumberOfExtension is 1 bigger than the actual

113
modules/rtp_rtcp/source/rtp_header_extensions.cc
View File

@ -434,15 +434,18 @@ bool FrameMarkingExtension::Write(rtc::ArrayView<uint8_t> data,
return true;
}
// HDR Metadata.
// Color space including HDR metadata as an optional field.
//
// RTP header extension to carry HDR metadata.
// Float values are upscaled by a static factor and transmitted as integers.
//
// Data layout with HDR metadata
// 0 1 2 3
// 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
// | ID | length | luminance_max |
// | ID | length=30 | Primaries | Transfer |
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
// | Matrix | Range | luminance_max |
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
// | | luminance_min |
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
@ -454,50 +457,84 @@ bool FrameMarkingExtension::Write(rtc::ArrayView<uint8_t> data,
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
// | mastering_metadata.white.x and .y |
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
// | max_content_light_level |
// | max_content_light_level | max_frame_average_light_level |
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
// | max_frame_average_light_level |
//
// Data layout without HDR metadata
// 0 1 2 3
// 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
constexpr RTPExtensionType HdrMetadataExtension::kId;
constexpr uint8_t HdrMetadataExtension::kValueSizeBytes;
constexpr const char HdrMetadataExtension::kUri[];
// | ID | length=4 | Primaries | Transfer |
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
// | Matrix | Range |
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-
bool HdrMetadataExtension::Parse(rtc::ArrayView<const uint8_t> data,
HdrMetadata* hdr_metadata) {
RTC_DCHECK(hdr_metadata);
if (data.size() != kValueSizeBytes)
constexpr RTPExtensionType ColorSpaceExtension::kId;
constexpr uint8_t ColorSpaceExtension::kValueSizeBytes;
constexpr const char ColorSpaceExtension::kUri[];
bool ColorSpaceExtension::Parse(rtc::ArrayView<const uint8_t> data,
ColorSpace* color_space) {
RTC_DCHECK(color_space);
if (data.size() != kValueSizeBytes &&
data.size() != kValueSizeBytesWithoutHdrMetadata)
return false;
size_t offset = 0;
// Read color space information.
if (!color_space->set_primaries_from_uint8(data.data()[offset++]))
return false;
if (!color_space->set_transfer_from_uint8(data.data()[offset++]))
return false;
if (!color_space->set_matrix_from_uint8(data.data()[offset++]))
return false;
if (!color_space->set_range_from_uint8(data.data()[offset++]))
return false;
// Read HDR metadata if it exists, otherwise clear it.
if (data.size() == kValueSizeBytesWithoutHdrMetadata) {
color_space->set_hdr_metadata(nullptr);
} else {
HdrMetadata hdr_metadata;
offset += ParseLuminance(data.data() + offset,
&hdr_metadata->mastering_metadata.luminance_max,
&hdr_metadata.mastering_metadata.luminance_max,
kLuminanceMaxDenominator);
offset += ParseLuminance(data.data() + offset,
&hdr_metadata->mastering_metadata.luminance_min,
&hdr_metadata.mastering_metadata.luminance_min,
kLuminanceMinDenominator);
offset += ParseChromaticity(data.data() + offset,
&hdr_metadata->mastering_metadata.primary_r);
&hdr_metadata.mastering_metadata.primary_r);
offset += ParseChromaticity(data.data() + offset,
&hdr_metadata->mastering_metadata.primary_g);
&hdr_metadata.mastering_metadata.primary_g);
offset += ParseChromaticity(data.data() + offset,
&hdr_metadata->mastering_metadata.primary_b);
&hdr_metadata.mastering_metadata.primary_b);
offset += ParseChromaticity(data.data() + offset,
&hdr_metadata->mastering_metadata.white_point);
// TODO(kron): Do we need 32 bit here or is it enough with 16 bits?
// Also, what resolution is needed?
hdr_metadata->max_content_light_level =
ByteReader<uint32_t>::ReadBigEndian(data.data() + offset);
offset += 4;
hdr_metadata->max_frame_average_light_level =
ByteReader<uint32_t>::ReadBigEndian(data.data() + offset);
RTC_DCHECK_EQ(kValueSizeBytes, offset + 4);
&hdr_metadata.mastering_metadata.white_point);
hdr_metadata.max_content_light_level =
ByteReader<uint16_t>::ReadBigEndian(data.data() + offset);
offset += 2;
hdr_metadata.max_frame_average_light_level =
ByteReader<uint16_t>::ReadBigEndian(data.data() + offset);
offset += 2;
color_space->set_hdr_metadata(&hdr_metadata);
}
RTC_DCHECK_EQ(ValueSize(*color_space), offset);
return true;
}
bool HdrMetadataExtension::Write(rtc::ArrayView<uint8_t> data,
const HdrMetadata& hdr_metadata) {
RTC_DCHECK_EQ(data.size(), kValueSizeBytes);
bool ColorSpaceExtension::Write(rtc::ArrayView<uint8_t> data,
const ColorSpace& color_space) {
RTC_DCHECK(data.size() >= ValueSize(color_space));
size_t offset = 0;
// Write color space information.
data.data()[offset++] = static_cast<uint8_t>(color_space.primaries());
data.data()[offset++] = static_cast<uint8_t>(color_space.transfer());
data.data()[offset++] = static_cast<uint8_t>(color_space.matrix());
data.data()[offset++] = static_cast<uint8_t>(color_space.range());
// Write HDR metadata if it exists.
if (color_space.hdr_metadata()) {
const HdrMetadata& hdr_metadata = *color_space.hdr_metadata();
offset += WriteLuminance(data.data() + offset,
hdr_metadata.mastering_metadata.luminance_max,
kLuminanceMaxDenominator);
@ -513,18 +550,18 @@ bool HdrMetadataExtension::Write(rtc::ArrayView<uint8_t> data,
offset += WriteChromaticity(data.data() + offset,
hdr_metadata.mastering_metadata.white_point);
// TODO(kron): Do we need 32 bit here or is it enough with 16 bits?
// Also, what resolution is needed?
ByteWriter<uint32_t>::WriteBigEndian(data.data() + offset,
ByteWriter<uint16_t>::WriteBigEndian(data.data() + offset,
hdr_metadata.max_content_light_level);
offset += 4;
ByteWriter<uint32_t>::WriteBigEndian(
offset += 2;
ByteWriter<uint16_t>::WriteBigEndian(
data.data() + offset, hdr_metadata.max_frame_average_light_level);
RTC_DCHECK_EQ(kValueSizeBytes, offset + 4);
offset += 2;
}
RTC_DCHECK_EQ(ValueSize(color_space), offset);
return true;
}
size_t HdrMetadataExtension::ParseChromaticity(
size_t ColorSpaceExtension::ParseChromaticity(
const uint8_t* data,
HdrMasteringMetadata::Chromaticity* p) {
uint16_t chromaticity_x_scaled = ByteReader<uint16_t>::ReadBigEndian(data);
@ -535,7 +572,7 @@ size_t HdrMetadataExtension::ParseChromaticity(
return 4; // Return number of bytes read.
}
size_t HdrMetadataExtension::ParseLuminance(const uint8_t* data,
size_t ColorSpaceExtension::ParseLuminance(const uint8_t* data,
float* f,
int denominator) {
uint32_t luminance_scaled = ByteReader<uint32_t, 3>::ReadBigEndian(data);
@ -543,7 +580,7 @@ size_t HdrMetadataExtension::ParseLuminance(const uint8_t* data,
return 3; // Return number of bytes read.
}
size_t HdrMetadataExtension::WriteChromaticity(
size_t ColorSpaceExtension::WriteChromaticity(
uint8_t* data,
const HdrMasteringMetadata::Chromaticity& p) {
RTC_DCHECK_GE(p.x, 0.0f);
@ -555,7 +592,7 @@ size_t HdrMetadataExtension::WriteChromaticity(
return 4; // Return number of bytes written.
}
size_t HdrMetadataExtension::WriteLuminance(uint8_t* data,
size_t ColorSpaceExtension::WriteLuminance(uint8_t* data,
float f,
int denominator) {
RTC_DCHECK_GE(f, 0.0f);

20
modules/rtp_rtcp/source/rtp_header_extensions.h
View File

@ -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 @@ class FrameMarkingExtension {
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.

2
modules/rtp_rtcp/source/rtp_packet_received.cc
View File

@ -69,7 +69,7 @@ void RtpPacketReceived::GetHeader(RTPHeader* header) const {
GetExtension<RepairedRtpStreamId>(&header->extension.repaired_stream_id);
GetExtension<RtpMid>(&header->extension.mid);
GetExtension<PlayoutDelayLimits>(&header->extension.playout_delay);
header->extension.hdr_metadata = GetExtension<HdrMetadataExtension>();
header->extension.color_space = GetExtension<ColorSpaceExtension>();
}
} // namespace webrtc

47
modules/rtp_rtcp/source/rtp_packet_unittest.cc
View File

@ -203,6 +203,34 @@ HdrMetadata CreateTestHdrMetadata() {
hdr_metadata.max_frame_average_light_level = 1789;
return hdr_metadata;
}
ColorSpace CreateTestColorSpace(bool with_hdr_metadata) {
ColorSpace color_space(
ColorSpace::PrimaryID::kBT709, ColorSpace::TransferID::kGAMMA22,
ColorSpace::MatrixID::kSMPTE2085, ColorSpace::RangeID::kFull);
if (with_hdr_metadata) {
HdrMetadata hdr_metadata = CreateTestHdrMetadata();
color_space.set_hdr_metadata(&hdr_metadata);
}
return color_space;
}
void TestCreateAndParseColorSpaceExtension(bool with_hdr_metadata) {
// Create packet with extension.
RtpPacket::ExtensionManager extensions(/*extmap-allow-mixed=*/true);
extensions.Register<ColorSpaceExtension>(1);
RtpPacket packet(&extensions);
const ColorSpace kColorSpace = CreateTestColorSpace(with_hdr_metadata);
EXPECT_TRUE(packet.SetExtension<ColorSpaceExtension>(kColorSpace));
packet.SetPayloadSize(42);
// Read packet with the extension.
RtpPacketReceived parsed(&extensions);
EXPECT_TRUE(parsed.Parse(packet.Buffer()));
ColorSpace parsed_color_space;
EXPECT_TRUE(parsed.GetExtension<ColorSpaceExtension>(&parsed_color_space));
EXPECT_EQ(kColorSpace, parsed_color_space);
}
} // namespace
TEST(RtpPacketTest, CreateMinimum) {
@ -819,21 +847,12 @@ TEST(RtpPacketTest, ParseLegacyTimingFrameExtension) {
EXPECT_EQ(receivied_timing.flags, 0);
}
TEST(RtpPacketTest, CreateAndParseHdrMetadataExtension) {
// Create packet with extension.
RtpPacket::ExtensionManager extensions(/*extmap-allow-mixed=*/true);
extensions.Register<HdrMetadataExtension>(1);
RtpPacket packet(&extensions);
const HdrMetadata kHdrMetadata = CreateTestHdrMetadata();
EXPECT_TRUE(packet.SetExtension<HdrMetadataExtension>(kHdrMetadata));
packet.SetPayloadSize(42);
TEST(RtpPacketTest, CreateAndParseColorSpaceExtension) {
TestCreateAndParseColorSpaceExtension(/*with_hdr_metadata=*/true);
}
// Read packet with the extension.
RtpPacketReceived parsed(&extensions);
EXPECT_TRUE(parsed.Parse(packet.Buffer()));
HdrMetadata parsed_hdr_metadata;
EXPECT_TRUE(parsed.GetExtension<HdrMetadataExtension>(&parsed_hdr_metadata));
EXPECT_EQ(kHdrMetadata, parsed_hdr_metadata);
TEST(RtpPacketTest, CreateAndParseColorSpaceExtensionWithoutHdrMetadata) {
TestCreateAndParseColorSpaceExtension(/*with_hdr_metadata=*/false);
}
} // namespace webrtc

4
modules/rtp_rtcp/source/rtp_utility.cc
View File

@ -507,9 +507,9 @@ void RtpHeaderParser::ParseOneByteExtensionHeader(
RTC_LOG(WARNING)
<< "RtpGenericFrameDescriptor unsupported by rtp header parser.";
break;
case kRtpExtensionHdrMetadata:
case kRtpExtensionColorSpace:
RTC_LOG(WARNING)
<< "RtpExtensionHdrMetadata unsupported by rtp header parser.";
<< "RtpExtensionColorSpace unsupported by rtp header parser.";
break;
case kRtpExtensionNone:
case kRtpExtensionNumberOfExtensions: {

6
test/fuzzers/rtp_packet_fuzzer.cc
View File

@ -121,9 +121,9 @@ void FuzzOneInput(const uint8_t* data, size_t size) {
packet.GetExtension<RtpGenericFrameDescriptorExtension>(&descriptor);
break;
}
case kRtpExtensionHdrMetadata: {
HdrMetadata hdr_metadata;
packet.GetExtension<HdrMetadataExtension>(&hdr_metadata);
case kRtpExtensionColorSpace: {
ColorSpace color_space;
packet.GetExtension<ColorSpaceExtension>(&color_space);
break;
}
}