dovi: support level 17 extension metadata block

quietvoid · quietvoid · commit c5aed79135ac · 2025-07-24T12:42:49.000-04:00
diff --git a/dolby_vision/src/c_structs/extension_metadata.rs b/dolby_vision/src/c_structs/extension_metadata.rs
@@ -112,6 +112,9 @@ impl DmData {
                 ExtMetadataBlock::Level16(_) => {
                     // TODO
                 }
+                ExtMetadataBlock::Level17(_) => {
+                    // TODO
+                }
                 ExtMetadataBlock::Level254(b) => {
                     self.level254 =
                         Box::into_raw(Box::new(b.clone())) as *const ExtMetadataBlockLevel254
diff --git a/dolby_vision/src/rpu/extension_metadata/blocks/level17.rs b/dolby_vision/src/rpu/extension_metadata/blocks/level17.rs
@@ -0,0 +1,81 @@
+use anyhow::Result;
+use bitvec_helpers::{
+    bitstream_io_reader::BsIoSliceReader, bitstream_io_writer::BitstreamIoWriter,
+};
+
+#[cfg(feature = "serde")]
+use serde::{Deserialize, Serialize};
+
+use super::{ExtMetadataBlock, ExtMetadataBlockInfo};
+
+/// Up mapping metadata
+#[repr(C)]
+#[derive(Debug, Default, Clone)]
+#[cfg_attr(feature = "serde", derive(Deserialize, Serialize))]
+pub struct ExtMetadataBlockLevel17 {
+    pub mid_boost: u8,
+    pub highlight_stretch: u8,
+    pub shadow_drop: u8,
+    pub contrast_boost: u8,
+    pub saturation_boost: u8,
+    pub detail_boost: u8,
+    pub chroma_indicator: u8,
+
+    /// 12 bits
+    pub intensity_indicator_pq: u16,
+
+    /// 4 bits
+    pub revision: u8,
+}
+
+impl ExtMetadataBlockLevel17 {
+    pub(crate) fn parse(reader: &mut BsIoSliceReader) -> Result<ExtMetadataBlock> {
+        let block = Self {
+            mid_boost: reader.read::<8, u8>()?,
+            highlight_stretch: reader.read::<8, u8>()?,
+            shadow_drop: reader.read::<8, u8>()?,
+            contrast_boost: reader.read::<8, u8>()?,
+            saturation_boost: reader.read::<8, u8>()?,
+            detail_boost: reader.read::<8, u8>()?,
+            chroma_indicator: reader.read::<8, u8>()?,
+            intensity_indicator_pq: reader.read::<12, u16>()?,
+            revision: reader.read::<4, u8>()?,
+        };
+
+        Ok(ExtMetadataBlock::Level17(block))
+    }
+
+    pub fn write(&self, writer: &mut BitstreamIoWriter) -> Result<()> {
+        self.validate()?;
+
+        writer.write::<8, u8>(self.mid_boost)?;
+        writer.write::<8, u8>(self.highlight_stretch)?;
+        writer.write::<8, u8>(self.shadow_drop)?;
+        writer.write::<8, u8>(self.contrast_boost)?;
+        writer.write::<8, u8>(self.saturation_boost)?;
+        writer.write::<8, u8>(self.detail_boost)?;
+        writer.write::<8, u8>(self.chroma_indicator)?;
+        writer.write::<12, u16>(self.intensity_indicator_pq)?;
+        writer.write::<4, u8>(self.revision)?;
+
+        Ok(())
+    }
+
+    pub fn validate(&self) -> Result<()> {
+        Ok(())
+    }
+}
+
+impl ExtMetadataBlockInfo for ExtMetadataBlockLevel17 {
+    fn level(&self) -> u8 {
+        17
+    }
+
+    fn bytes_size(&self) -> u64 {
+        9
+    }
+
+    fn required_bits(&self) -> u64 {
+        9 * 8
+    }
+}
diff --git a/dolby_vision/src/rpu/extension_metadata/blocks/mod.rs b/dolby_vision/src/rpu/extension_metadata/blocks/mod.rs
@@ -11,6 +11,7 @@ pub mod level10;
 pub mod level11;
 pub mod level15;
 pub mod level16;
+pub mod level17;
 pub mod level2;
 pub mod level254;
 pub mod level255;
@@ -34,6 +35,7 @@ pub use level10::ExtMetadataBlockLevel10;
 pub use level11::ExtMetadataBlockLevel11;
 pub use level15::ExtMetadataBlockLevel15;
 pub use level16::ExtMetadataBlockLevel16;
+pub use level17::ExtMetadataBlockLevel17;
 pub use level254::ExtMetadataBlockLevel254;
 pub use level255::ExtMetadataBlockLevel255;
 pub use reserved::ReservedExtMetadataBlock;
@@ -58,6 +60,7 @@ pub enum ExtMetadataBlock {
     Level11(ExtMetadataBlockLevel11),
     Level15(ExtMetadataBlockLevel15),
     Level16(ExtMetadataBlockLevel16),
+    Level17(ExtMetadataBlockLevel17),
     Level254(ExtMetadataBlockLevel254),
     Level255(ExtMetadataBlockLevel255),
     Reserved(ReservedExtMetadataBlock),
@@ -92,6 +95,7 @@ impl ExtMetadataBlock {
             Self::Level11(b) => b.bytes_size(),
             Self::Level15(b) => b.bytes_size(),
             Self::Level16(b) => b.bytes_size(),
+            Self::Level17(b) => b.bytes_size(),
             Self::Level254(b) => b.bytes_size(),
             Self::Level255(b) => b.bytes_size(),
             Self::Reserved(b) => b.bytes_size(),
@@ -112,6 +116,7 @@ impl ExtMetadataBlock {
             Self::Level11(b) => b.bits_size(),
             Self::Level15(b) => b.bits_size(),
             Self::Level16(b) => b.bits_size(),
+            Self::Level17(b) => b.bits_size(),
             Self::Level254(b) => b.bits_size(),
             Self::Level255(b) => b.bits_size(),
             Self::Reserved(b) => b.bits_size(),
@@ -132,6 +137,7 @@ impl ExtMetadataBlock {
             Self::Level11(b) => b.required_bits(),
             Self::Level15(b) => b.required_bits(),
             Self::Level16(b) => b.required_bits(),
+            Self::Level17(b) => b.required_bits(),
             Self::Level254(b) => b.required_bits(),
             Self::Level255(b) => b.required_bits(),
             Self::Reserved(b) => b.required_bits(),
@@ -152,6 +158,7 @@ impl ExtMetadataBlock {
             Self::Level11(b) => b.level(),
             Self::Level15(b) => b.level(),
             Self::Level16(b) => b.level(),
+            Self::Level17(b) => b.level(),
             Self::Level254(b) => b.level(),
             Self::Level255(b) => b.level(),
             Self::Reserved(b) => b.level(),
@@ -172,6 +179,7 @@ impl ExtMetadataBlock {
             Self::Level11(b) => b.sort_key(),
             Self::Level15(b) => b.sort_key(),
             Self::Level16(b) => b.sort_key(),
+            Self::Level17(b) => b.sort_key(),
             Self::Level254(b) => b.sort_key(),
             Self::Level255(b) => b.sort_key(),
             Self::Reserved(b) => b.sort_key(),
@@ -192,6 +200,7 @@ impl ExtMetadataBlock {
             Self::Level11(b) => b.write(writer),
             Self::Level15(b) => b.write(writer),
             Self::Level16(b) => b.write(writer),
+            Self::Level17(b) => b.write(writer),
             Self::Level254(b) => b.write(writer),
             Self::Level255(b) => b.write(writer),
             Self::Reserved(b) => b.write(writer),
diff --git a/dolby_vision/src/rpu/extension_metadata/cmv40.rs b/dolby_vision/src/rpu/extension_metadata/cmv40.rs
@@ -16,7 +16,7 @@ pub struct CmV40DmData {
 
 impl WithExtMetadataBlocks for CmV40DmData {
     const VERSION: &'static str = "CM v4.0";
-    const ALLOWED_BLOCK_LEVELS: &'static [u8] = &[3, 8, 9, 10, 11, 15, 16, 254];
+    const ALLOWED_BLOCK_LEVELS: &'static [u8] = &[3, 8, 9, 10, 11, 15, 16, 17, 254];
 
     fn with_blocks_allocation(num_ext_blocks: u64) -> Self {
         Self {
@@ -53,6 +53,7 @@ impl WithExtMetadataBlocks for CmV40DmData {
             11 => level11::ExtMetadataBlockLevel11::parse(reader)?,
             15 => level15::ExtMetadataBlockLevel15::parse(reader)?,
             16 => level16::ExtMetadataBlockLevel16::parse(reader)?,
+            17 => level17::ExtMetadataBlockLevel17::parse(reader)?,
             254 => level254::ExtMetadataBlockLevel254::parse(reader)?,
             1 | 2 | 4 | 5 | 6 | 255 => bail!(
                 "Invalid block level {} for {} RPU",
diff --git a/dolby_vision/src/rpu/vdr_dm_data.rs b/dolby_vision/src/rpu/vdr_dm_data.rs
@@ -390,6 +390,7 @@ impl VdrDmData {
             ExtMetadataBlock::Level11(_) => self.replace_metadata_level(block),
             ExtMetadataBlock::Level15(_) => self.replace_metadata_level(block),
             ExtMetadataBlock::Level16(_) => self.replace_metadata_level(block),
+            ExtMetadataBlock::Level17(_) => self.replace_metadata_level(block),
             ExtMetadataBlock::Level254(_) => self.replace_metadata_level(block),
             ExtMetadataBlock::Level255(_) => self.replace_metadata_level(block),
             ExtMetadataBlock::Reserved(_) => bail!("Cannot replace specific reserved block"),
