dovi: support level 18 extension metadata block

Author: quietvoid

dolby_vision/src/c_structs/extension_metadata.rs

@@ -115,6 +115,9 @@ impl DmData {
                 ExtMetadataBlock::Level17(_) => {
                     // TODO
                 }
+                ExtMetadataBlock::Level18(_) => {
+                    // TODO
+                }
                 ExtMetadataBlock::Level254(b) => {
                     self.level254 =
                         Box::into_raw(Box::new(b.clone())) as *const ExtMetadataBlockLevel254

dolby_vision/src/rpu/extension_metadata/blocks/level15.rs

@@ -87,6 +87,6 @@ impl ExtMetadataBlockInfo for ExtMetadataBlockLevel15 {
     }
 
     fn required_bits(&self) -> u64 {
-        11 * 8
+        88
     }
 }

dolby_vision/src/rpu/extension_metadata/blocks/level17.rs

@@ -76,6 +76,6 @@ impl ExtMetadataBlockInfo for ExtMetadataBlockLevel17 {
     }
 
     fn required_bits(&self) -> u64 {
-        9 * 8
+        72
     }
 }

dolby_vision/src/rpu/extension_metadata/blocks/level18.rs

@@ -0,0 +1,73 @@
+use anyhow::{Result, ensure};
+use bitvec_helpers::{
+    bitstream_io_reader::BsIoSliceReader, bitstream_io_writer::BitstreamIoWriter,
+};
+
+#[cfg(feature = "serde")]
+use serde::{Deserialize, Serialize};
+
+use super::{ExtMetadataBlock, ExtMetadataBlockInfo};
+
+/// Creative environment metadata
+#[repr(C)]
+#[derive(Debug, Default, Clone)]
+#[cfg_attr(feature = "serde", derive(Deserialize, Serialize))]
+pub struct ExtMetadataBlockLevel18 {
+    pub surround_luminance_pq: u16,
+    pub min_preserved_luminance_pq: u16,
+    pub adaptation_luminance_pq: u16,
+    pub max_preserved_luminance_pq: u16,
+
+    /// 4 bits
+    pub revision: u8,
+    /// 4 bits
+    pub reserved: u8,
+}
+
+impl ExtMetadataBlockLevel18 {
+    pub(crate) fn parse(reader: &mut BsIoSliceReader) -> Result<ExtMetadataBlock> {
+        let block = Self {
+            surround_luminance_pq: reader.read::<12, u16>()?,
+            min_preserved_luminance_pq: reader.read::<12, u16>()?,
+            adaptation_luminance_pq: reader.read::<12, u16>()?,
+            max_preserved_luminance_pq: reader.read::<12, u16>()?,
+            revision: reader.read::<4, u8>()?,
+            reserved: reader.read::<4, u8>()?,
+        };
+
+        Ok(ExtMetadataBlock::Level18(block))
+    }
+
+    pub fn write(&self, writer: &mut BitstreamIoWriter) -> Result<()> {
+        self.validate()?;
+
+        writer.write::<12, u16>(self.surround_luminance_pq)?;
+        writer.write::<12, u16>(self.min_preserved_luminance_pq)?;
+        writer.write::<12, u16>(self.adaptation_luminance_pq)?;
+        writer.write::<12, u16>(self.max_preserved_luminance_pq)?;
+        writer.write::<4, u8>(self.revision)?;
+        writer.write::<4, u8>(self.reserved)?;
+
+        Ok(())
+    }
+
+    pub fn validate(&self) -> Result<()> {
+        ensure!(self.reserved == 0);
+
+        Ok(())
+    }
+}
+
+impl ExtMetadataBlockInfo for ExtMetadataBlockLevel18 {
+    fn level(&self) -> u8 {
+        18
+    }
+
+    fn bytes_size(&self) -> u64 {
+        7
+    }
+
+    fn required_bits(&self) -> u64 {
+        56
+    }
+}

dolby_vision/src/rpu/extension_metadata/blocks/mod.rs

@@ -12,6 +12,7 @@ pub mod level11;
 pub mod level15;
 pub mod level16;
 pub mod level17;
+pub mod level18;
 pub mod level2;
 pub mod level254;
 pub mod level255;
@@ -36,6 +37,7 @@ pub use level11::ExtMetadataBlockLevel11;
 pub use level15::ExtMetadataBlockLevel15;
 pub use level16::ExtMetadataBlockLevel16;
 pub use level17::ExtMetadataBlockLevel17;
+pub use level18::ExtMetadataBlockLevel18;
 pub use level254::ExtMetadataBlockLevel254;
 pub use level255::ExtMetadataBlockLevel255;
 pub use reserved::ReservedExtMetadataBlock;
@@ -61,6 +63,7 @@ pub enum ExtMetadataBlock {
     Level15(ExtMetadataBlockLevel15),
     Level16(ExtMetadataBlockLevel16),
     Level17(ExtMetadataBlockLevel17),
+    Level18(ExtMetadataBlockLevel18),
     Level254(ExtMetadataBlockLevel254),
     Level255(ExtMetadataBlockLevel255),
     Reserved(ReservedExtMetadataBlock),
@@ -96,6 +99,7 @@ impl ExtMetadataBlock {
             Self::Level15(b) => b.bytes_size(),
             Self::Level16(b) => b.bytes_size(),
             Self::Level17(b) => b.bytes_size(),
+            Self::Level18(b) => b.bytes_size(),
             Self::Level254(b) => b.bytes_size(),
             Self::Level255(b) => b.bytes_size(),
             Self::Reserved(b) => b.bytes_size(),
@@ -117,6 +121,7 @@ impl ExtMetadataBlock {
             Self::Level15(b) => b.bits_size(),
             Self::Level16(b) => b.bits_size(),
             Self::Level17(b) => b.bits_size(),
+            Self::Level18(b) => b.bits_size(),
             Self::Level254(b) => b.bits_size(),
             Self::Level255(b) => b.bits_size(),
             Self::Reserved(b) => b.bits_size(),
@@ -138,6 +143,7 @@ impl ExtMetadataBlock {
             Self::Level15(b) => b.required_bits(),
             Self::Level16(b) => b.required_bits(),
             Self::Level17(b) => b.required_bits(),
+            Self::Level18(b) => b.required_bits(),
             Self::Level254(b) => b.required_bits(),
             Self::Level255(b) => b.required_bits(),
             Self::Reserved(b) => b.required_bits(),
@@ -159,6 +165,7 @@ impl ExtMetadataBlock {
             Self::Level15(b) => b.level(),
             Self::Level16(b) => b.level(),
             Self::Level17(b) => b.level(),
+            Self::Level18(b) => b.level(),
             Self::Level254(b) => b.level(),
             Self::Level255(b) => b.level(),
             Self::Reserved(b) => b.level(),
@@ -180,6 +187,7 @@ impl ExtMetadataBlock {
             Self::Level15(b) => b.sort_key(),
             Self::Level16(b) => b.sort_key(),
             Self::Level17(b) => b.sort_key(),
+            Self::Level18(b) => b.sort_key(),
             Self::Level254(b) => b.sort_key(),
             Self::Level255(b) => b.sort_key(),
             Self::Reserved(b) => b.sort_key(),
@@ -201,6 +209,7 @@ impl ExtMetadataBlock {
             Self::Level15(b) => b.write(writer),
             Self::Level16(b) => b.write(writer),
             Self::Level17(b) => b.write(writer),
+            Self::Level18(b) => b.write(writer),
             Self::Level254(b) => b.write(writer),
             Self::Level255(b) => b.write(writer),
             Self::Reserved(b) => b.write(writer),

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, 17, 254];
+    const ALLOWED_BLOCK_LEVELS: &'static [u8] = &[3, 8, 9, 10, 11, 15, 16, 17, 18, 254];
 
     fn with_blocks_allocation(num_ext_blocks: u64) -> Self {
         Self {
@@ -54,6 +54,7 @@ impl WithExtMetadataBlocks for CmV40DmData {
             15 => level15::ExtMetadataBlockLevel15::parse(reader)?,
             16 => level16::ExtMetadataBlockLevel16::parse(reader)?,
             17 => level17::ExtMetadataBlockLevel17::parse(reader)?,
+            18 => level18::ExtMetadataBlockLevel18::parse(reader)?,
             254 => level254::ExtMetadataBlockLevel254::parse(reader)?,
             1 | 2 | 4 | 5 | 6 | 255 => bail!(
                 "Invalid block level {} for {} RPU",

dolby_vision/src/rpu/vdr_dm_data.rs

@@ -391,6 +391,7 @@ impl VdrDmData {
             ExtMetadataBlock::Level15(_) => self.replace_metadata_level(block),
             ExtMetadataBlock::Level16(_) => self.replace_metadata_level(block),
             ExtMetadataBlock::Level17(_) => self.replace_metadata_level(block),
+            ExtMetadataBlock::Level18(_) => 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"),