From 4ec308c98439cfa03203273ba39fb1d7c96169c9 Mon Sep 17 00:00:00 2001 From: James Almer Date: Thu, 1 Jun 2023 21:50:54 -0300 Subject: [PATCH 1/2] headers: reduce the size of Dav1dContentLightLevel Signed-off-by: James Almer --- include/dav1d/headers.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/dav1d/headers.h b/include/dav1d/headers.h index 948e152ab..32eb4cb98 100644 --- a/include/dav1d/headers.h +++ b/include/dav1d/headers.h @@ -178,8 +178,8 @@ enum Dav1dChromaSamplePosition { }; typedef struct Dav1dContentLightLevel { - int max_content_light_level; - int max_frame_average_light_level; + uint16_t max_content_light_level; + uint16_t max_frame_average_light_level; } Dav1dContentLightLevel; typedef struct Dav1dMasteringDisplay { From 2fb025b91a18ff1500fc9c68f3cead27cc06c7d7 Mon Sep 17 00:00:00 2001 From: Frank Bossen Date: Sun, 17 Mar 2024 13:56:32 -0400 Subject: [PATCH 2/2] Port C code changes to Rust --- include/dav1d/headers.rs | 4 ++-- src/obu.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/dav1d/headers.rs b/include/dav1d/headers.rs index 6e6f0b9ee..e6a6a0df2 100644 --- a/include/dav1d/headers.rs +++ b/include/dav1d/headers.rs @@ -611,8 +611,8 @@ impl TryFrom for Rav1dChromaSamplePosition { #[repr(C)] pub struct Rav1dContentLightLevel { - pub max_content_light_level: c_int, - pub max_frame_average_light_level: c_int, + pub max_content_light_level: u16, + pub max_frame_average_light_level: u16, } pub type Dav1dContentLightLevel = Rav1dContentLightLevel; diff --git a/src/obu.rs b/src/obu.rs index 27d3714ea..ddadb702e 100644 --- a/src/obu.rs +++ b/src/obu.rs @@ -2342,12 +2342,12 @@ unsafe fn parse_obus( match ObuMetaType::from_repr(meta_type as usize) { Some(ObuMetaType::HdrCll) => { let debug = debug.named("CLLOBU"); - let max_content_light_level = gb.get_bits(16) as c_int; + let max_content_light_level = gb.get_bits(16) as u16; debug.log( &gb, format_args!("max-content-light-level: {max_content_light_level}"), ); - let max_frame_average_light_level = gb.get_bits(16) as c_int; + let max_frame_average_light_level = gb.get_bits(16) as u16; debug.log( &gb, format_args!(