codec/av1/parser: turn max_frame_height_minus_1 into u16

This member is read from 16 bits max. Doing so allows us to avoid some
type conversions and optimize the code.

src/codec/av1/parser.rs

@@ -401,7 +401,7 @@ pub struct SequenceHeaderObu {
     pub max_frame_width_minus_1: u16,
     /// Specifies the maximum frame height minus 1 for the frames represented by
     /// this sequence header.
-    pub max_frame_height_minus_1: u32,
+    pub max_frame_height_minus_1: u16,
     /// Specifies whether frame id numbers are present in the coded video
     /// sequence.
     pub frame_id_numbers_present_flag: bool,
@@ -1394,7 +1394,7 @@ impl Parser {
             fh.frame_height = r.read_bits(n)? + 1;
         } else {
             fh.frame_width = seq.max_frame_width_minus_1 as u32 + 1;
-            fh.frame_height = seq.max_frame_height_minus_1 + 1;
+            fh.frame_height = seq.max_frame_height_minus_1 as u32 + 1;
         }
 
         Self::parse_superres_params(fh, r, seq)?;
@@ -1825,7 +1825,8 @@ impl Parser {
         s.frame_height_bits_minus_1 = r.read_bits(4)? as u8;
         // frame_width_bits_minus_1 has been read from 4 bits, meaning we can read 16 bits at most.
         s.max_frame_width_minus_1 = r.read_bits(s.frame_width_bits_minus_1 + 1)? as u16;
-        s.max_frame_height_minus_1 = r.read_bits(s.frame_height_bits_minus_1 + 1)?;
+        // frame_height_bits_minus_1 has been read from 4 bits, meaning we can read 16 bits at most.
+        s.max_frame_height_minus_1 = r.read_bits(s.frame_height_bits_minus_1 + 1)? as u16;
         if s.reduced_still_picture_header {
             s.frame_id_numbers_present_flag = false;
         } else {

src/codec/av1/synthesizer.rs

@@ -297,7 +297,7 @@ where
             self.invalid_element_value("frame_width_bits_minus_1")?;
         }
 
-        let bits = u32::BITS - self.obu.max_frame_height_minus_1.leading_zeros();
+        let bits = u16::BITS - self.obu.max_frame_height_minus_1.leading_zeros();
         if self.obu.frame_height_bits_minus_1 as u32 + 1 < bits {
             self.invalid_element_value("frame_height_bits_minus_1")?;
         }
@@ -312,7 +312,7 @@ where
         self.f(n, self.obu.max_frame_width_minus_1)?;
 
         let n = self.obu.frame_height_bits_minus_1 as usize + 1;
-        if (n as u32) < 32 - self.obu.max_frame_height_minus_1.leading_zeros() {
+        if (n as u32) < u16::BITS - self.obu.max_frame_height_minus_1.leading_zeros() {
             self.invalid_element_value("max_frame_height_minus_1")?;
         }
         self.f(n, self.obu.max_frame_height_minus_1)?;
@@ -966,7 +966,7 @@ where
             if self.obu.frame_width != sequence.max_frame_width_minus_1 as u32 + 1 {
                 self.invalid_element_value("FrameWidth")?;
             }
-            if self.obu.frame_height != sequence.max_frame_height_minus_1 + 1 {
+            if self.obu.frame_height != sequence.max_frame_height_minus_1 as u32 + 1 {
                 self.invalid_element_value("FrameHeight")?;
             }
 
@@ -1711,7 +1711,7 @@ mod tests {
             frame_width_bits_minus_1: 16 - 1,
             frame_height_bits_minus_1: 16 - 1,
             max_frame_width_minus_1: (WIDTH - 1) as u16,
-            max_frame_height_minus_1: HEIGHT - 1,
+            max_frame_height_minus_1: (HEIGHT - 1) as u16,
 
             seq_force_integer_mv: SELECT_INTEGER_MV as u32,
 

src/decoder/stateless/av1.rs

@@ -437,7 +437,7 @@ where
                             "Found new sequence, resolution: {:?}, profile: {:?}, bit depth: {:?}",
                             Resolution::from((
                                 sequence.max_frame_width_minus_1 as u32 + 1,
-                                sequence.max_frame_height_minus_1 + 1
+                                sequence.max_frame_height_minus_1 as u32 + 1
                             )),
                             sequence.seq_profile,
                             sequence.bit_depth

src/decoder/stateless/av1/vaapi.rs

@@ -94,7 +94,7 @@ impl VaStreamInfo for &Rc<SequenceHeaderObu> {
     fn coded_size(&self) -> (u32, u32) {
         (
             self.max_frame_width_minus_1 as u32 + 1,
-            self.max_frame_height_minus_1 + 1,
+            self.max_frame_height_minus_1 as u32 + 1,
         )
     }
 
@@ -514,7 +514,7 @@ impl<M: SurfaceMemoryDescriptor + 'static> StatelessAV1DecoderBackend for VaapiB
                  * accomodate the other case. See 6.7.5 in the spec */
                 let layers = (0..=highest_layer).map(|layer| Resolution {
                     width: (sequence.max_frame_width_minus_1 as u32 + 1) / (layer + 1),
-                    height: (sequence.max_frame_height_minus_1 + 1) / (layer + 1),
+                    height: (sequence.max_frame_height_minus_1 as u32 + 1) / (layer + 1),
                 });
 
                 PoolCreationMode::Layers(layers.collect())

src/encoder/stateless/av1/predictor.rs

@@ -93,7 +93,7 @@ impl<Picture, Reference> LowDelayAV1<Picture, Reference> {
 
             // Current resolution is the maximum resolution
             max_frame_width_minus_1: (width - 1) as u16,
-            max_frame_height_minus_1: height - 1,
+            max_frame_height_minus_1: (height - 1) as u16,
 
             seq_force_integer_mv: SELECT_INTEGER_MV as u32,
 

src/encoder/stateless/av1/vaapi.rs

@@ -717,7 +717,7 @@ mod tests {
             frame_width_bits_minus_1: 16 - 1,
             frame_height_bits_minus_1: 16 - 1,
             max_frame_width_minus_1: (WIDTH - 1) as u16,
-            max_frame_height_minus_1: HEIGHT - 1,
+            max_frame_height_minus_1: (HEIGHT - 1) as u16,
 
             enable_order_hint: true,
             order_hint_bits: 8,