const DAV1D_MAX_{THREADS,FRAME_DELAY}: add missing consts that weren't transpiled (#1455)

Author: kkysen

.gitignore

@@ -20,3 +20,5 @@ target/
 
 .gdb_history
 .gdbinit
+
+.cache/clangd/index

src/include/dav1d/dav1d.rs

@@ -16,6 +16,12 @@ pub type Dav1dContext = RawArc<Rav1dContext>;
 
 pub type Dav1dRef = ();
 
+pub const RAV1D_MAX_THREADS: usize = 256;
+pub const RAV1D_MAX_FRAME_DELAY: usize = 256;
+
+pub const DAV1D_MAX_THREADS: c_int = RAV1D_MAX_THREADS as _;
+pub const DAV1D_MAX_FRAME_DELAY: c_int = RAV1D_MAX_FRAME_DELAY as _;
+
 pub type Dav1dInloopFilterType = c_uint;
 pub const DAV1D_INLOOPFILTER_ALL: Dav1dInloopFilterType =
     Rav1dInloopFilterType::all().bits() as Dav1dInloopFilterType;
@@ -144,8 +150,8 @@ pub struct Dav1dSettings {
 
 #[repr(C)]
 pub(crate) struct Rav1dSettings {
-    pub n_threads: InRange<u16, 0, 256>,
-    pub max_frame_delay: InRange<u16, 0, 256>,
+    pub n_threads: InRange<u16, 0, { RAV1D_MAX_THREADS as _ }>,
+    pub max_frame_delay: InRange<u16, 0, { RAV1D_MAX_FRAME_DELAY as _ }>,
     pub apply_grain: bool,
     pub operating_point: InRange<u8, 0, 31>,
     pub all_layers: bool,
@@ -177,9 +183,12 @@ impl TryFrom<Dav1dSettings> for Rav1dSettings {
             decode_frame_type,
             reserved: _,
         } = value;
-        validate_input!(((0..=256).contains(&n_threads), Rav1dError::InvalidArgument))?;
         validate_input!((
-            (0..=256).contains(&max_frame_delay),
+            (0..=DAV1D_MAX_THREADS).contains(&n_threads),
+            Rav1dError::InvalidArgument
+        ))?;
+        validate_input!((
+            (0..=DAV1D_MAX_FRAME_DELAY).contains(&max_frame_delay),
             Rav1dError::InvalidArgument
         ))?;
         validate_input!((

src/lib.rs

@@ -171,7 +171,7 @@ use crate::include::dav1d::common::{Dav1dDataProps, Rav1dDataProps};
 use crate::include::dav1d::data::{Dav1dData, Rav1dData};
 use crate::include::dav1d::dav1d::{
     Dav1dContext, Dav1dEventFlags, Dav1dSettings, Rav1dDecodeFrameType, Rav1dInloopFilterType,
-    Rav1dSettings,
+    Rav1dSettings, RAV1D_MAX_THREADS,
 };
 use crate::include::dav1d::headers::{Dav1dSequenceHeader, Rav1dFilmGrainData};
 use crate::include::dav1d::picture::{Dav1dPicture, Rav1dPicture};
@@ -230,10 +230,10 @@ pub extern "C" fn dav1d_version_api() -> c_uint {
 impl Default for Rav1dSettings {
     fn default() -> Self {
         Self {
-            n_threads: InRange::<u16, 0, 256>::new(0).unwrap(),
-            max_frame_delay: InRange::<u16, 0, 256>::new(0).unwrap(),
+            n_threads: InRange::new(0).unwrap(),
+            max_frame_delay: InRange::new(0).unwrap(),
             apply_grain: true,
-            operating_point: InRange::<u8, 0, 31>::new(0).unwrap(),
+            operating_point: InRange::new(0).unwrap(),
             all_layers: true,
             frame_size_limit: 0,
             allocator: Default::default(),
@@ -268,7 +268,9 @@ fn get_num_threads(s: &Rav1dSettings) -> NumThreads {
     let n_tc = if s.n_threads.get() != 0 {
         s.n_threads.get() as usize // TODO propagate `InRange`
     } else {
-        rav1d_num_logical_processors().get().clamp(1, 256)
+        rav1d_num_logical_processors()
+            .get()
+            .clamp(1, RAV1D_MAX_THREADS)
     };
     let n_fc = if s.max_frame_delay.get() != 0 {
         cmp::min(s.max_frame_delay.get() as usize, n_tc) // TODO propagate `InRange`