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}
This commit is contained in:
Johannes Kron
committed by
Commit Bot
Commit Bot
parent
53382cb19f
commit
09d6588d93
@ -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,77 +457,111 @@ 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;
|
||||
offset += ParseLuminance(data.data() + offset,
|
||||
&hdr_metadata->mastering_metadata.luminance_max,
|
||||
kLuminanceMaxDenominator);
|
||||
offset += ParseLuminance(data.data() + offset,
|
||||
&hdr_metadata->mastering_metadata.luminance_min,
|
||||
kLuminanceMinDenominator);
|
||||
offset += ParseChromaticity(data.data() + offset,
|
||||
&hdr_metadata->mastering_metadata.primary_r);
|
||||
offset += ParseChromaticity(data.data() + offset,
|
||||
&hdr_metadata->mastering_metadata.primary_g);
|
||||
offset += ParseChromaticity(data.data() + offset,
|
||||
&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);
|
||||
// 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,
|
||||
kLuminanceMaxDenominator);
|
||||
offset += ParseLuminance(data.data() + offset,
|
||||
&hdr_metadata.mastering_metadata.luminance_min,
|
||||
kLuminanceMinDenominator);
|
||||
offset += ParseChromaticity(data.data() + offset,
|
||||
&hdr_metadata.mastering_metadata.primary_r);
|
||||
offset += ParseChromaticity(data.data() + offset,
|
||||
&hdr_metadata.mastering_metadata.primary_g);
|
||||
offset += ParseChromaticity(data.data() + offset,
|
||||
&hdr_metadata.mastering_metadata.primary_b);
|
||||
offset += ParseChromaticity(data.data() + offset,
|
||||
&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;
|
||||
offset += WriteLuminance(data.data() + offset,
|
||||
hdr_metadata.mastering_metadata.luminance_max,
|
||||
kLuminanceMaxDenominator);
|
||||
offset += WriteLuminance(data.data() + offset,
|
||||
hdr_metadata.mastering_metadata.luminance_min,
|
||||
kLuminanceMinDenominator);
|
||||
offset += WriteChromaticity(data.data() + offset,
|
||||
hdr_metadata.mastering_metadata.primary_r);
|
||||
offset += WriteChromaticity(data.data() + offset,
|
||||
hdr_metadata.mastering_metadata.primary_g);
|
||||
offset += WriteChromaticity(data.data() + offset,
|
||||
hdr_metadata.mastering_metadata.primary_b);
|
||||
offset += WriteChromaticity(data.data() + offset,
|
||||
hdr_metadata.mastering_metadata.white_point);
|
||||
// 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());
|
||||
|
||||
// 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,
|
||||
hdr_metadata.max_content_light_level);
|
||||
offset += 4;
|
||||
ByteWriter<uint32_t>::WriteBigEndian(
|
||||
data.data() + offset, hdr_metadata.max_frame_average_light_level);
|
||||
RTC_DCHECK_EQ(kValueSizeBytes, offset + 4);
|
||||
// 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);
|
||||
offset += WriteLuminance(data.data() + offset,
|
||||
hdr_metadata.mastering_metadata.luminance_min,
|
||||
kLuminanceMinDenominator);
|
||||
offset += WriteChromaticity(data.data() + offset,
|
||||
hdr_metadata.mastering_metadata.primary_r);
|
||||
offset += WriteChromaticity(data.data() + offset,
|
||||
hdr_metadata.mastering_metadata.primary_g);
|
||||
offset += WriteChromaticity(data.data() + offset,
|
||||
hdr_metadata.mastering_metadata.primary_b);
|
||||
offset += WriteChromaticity(data.data() + offset,
|
||||
hdr_metadata.mastering_metadata.white_point);
|
||||
|
||||
ByteWriter<uint16_t>::WriteBigEndian(data.data() + offset,
|
||||
hdr_metadata.max_content_light_level);
|
||||
offset += 2;
|
||||
ByteWriter<uint16_t>::WriteBigEndian(
|
||||
data.data() + offset, hdr_metadata.max_frame_average_light_level);
|
||||
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,15 +572,15 @@ size_t HdrMetadataExtension::ParseChromaticity(
|
||||
return 4; // Return number of bytes read.
|
||||
}
|
||||
|
||||
size_t HdrMetadataExtension::ParseLuminance(const uint8_t* data,
|
||||
float* f,
|
||||
int denominator) {
|
||||
size_t ColorSpaceExtension::ParseLuminance(const uint8_t* data,
|
||||
float* f,
|
||||
int denominator) {
|
||||
uint32_t luminance_scaled = ByteReader<uint32_t, 3>::ReadBigEndian(data);
|
||||
*f = static_cast<float>(luminance_scaled) / denominator;
|
||||
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,9 +592,9 @@ size_t HdrMetadataExtension::WriteChromaticity(
|
||||
return 4; // Return number of bytes written.
|
||||
}
|
||||
|
||||
size_t HdrMetadataExtension::WriteLuminance(uint8_t* data,
|
||||
float f,
|
||||
int denominator) {
|
||||
size_t ColorSpaceExtension::WriteLuminance(uint8_t* data,
|
||||
float f,
|
||||
int denominator) {
|
||||
RTC_DCHECK_GE(f, 0.0f);
|
||||
ByteWriter<uint32_t, 3>::WriteBigEndian(data, std::round(f * denominator));
|
||||
return 3; // Return number of bytes written.
|
||||
|
||||
Reference in New Issue
Block a user