chore: Make OPPTYPE_OPTIONS and MPPTYPE_OPTIONS as bit flag and remove lazy_static

Author: CrazyboyQCD

Cargo.lock

@@ -9,4 +9,3 @@ license = "MIT OR Apache-2.0"
 bitflags = "2.4.0"
 thiserror = "2.0.3"
 num-traits = "0.2.16"
-lazy_static = "1.4.0"

h263/Cargo.toml

@@ -7,7 +7,7 @@ use crate::error::{Error, Result};
 use crate::parser::{decode_block, decode_gob, decode_macroblock, decode_picture, H263Reader};
 use crate::types::{
     DecodedDctBlock, GroupOfBlocks, Macroblock, MacroblockType, MotionVector, Picture,
-    PictureOption, PictureTypeCode, MPPTYPE_OPTIONS, OPPTYPE_OPTIONS,
+    PictureOption, PictureTypeCode,
 };
 use std::collections::HashMap;
 use std::io::Read;
@@ -147,11 +147,14 @@ impl H263State {
             let next_running_options = if next_picture.has_plusptype && next_picture.has_opptype {
                 next_picture.options
             } else if next_picture.has_plusptype {
-                (next_picture.options & !*OPPTYPE_OPTIONS)
-                    | (self.running_options & *OPPTYPE_OPTIONS)
+                (next_picture.options & !PictureOption::OPPTYPE_OPTIONS)
+                    | (self.running_options & PictureOption::OPPTYPE_OPTIONS)
             } else {
-                (next_picture.options & !*OPPTYPE_OPTIONS & !*MPPTYPE_OPTIONS)
-                    | (self.running_options & (*OPPTYPE_OPTIONS | *MPPTYPE_OPTIONS))
+                (next_picture.options
+                    & !PictureOption::OPPTYPE_OPTIONS
+                    & !PictureOption::MPPTYPE_OPTIONS)
+                    | (self.running_options
+                        & (PictureOption::OPPTYPE_OPTIONS | PictureOption::MPPTYPE_OPTIONS))
             };
 
             let format = if let Some(format) = next_picture.format {

h263/src/decoder/state.rs

@@ -3,9 +3,6 @@
 #[macro_use]
 extern crate bitflags;
 
-#[macro_use]
-extern crate lazy_static;
-
 mod decoder;
 mod error;
 pub mod parser;

h263/src/lib.rs

@@ -114,23 +114,6 @@ pub type PlusPType = (
     bool,
 );
 
-lazy_static! {
-    /// The set of picture options defined by an `OPPTYPE` record.
-    ///
-    /// If a picture does not contain an `OPPTYPE`, then all of these options
-    /// will be carried forward from the previous picture's options.
-    static ref OPPTYPE_OPTIONS: PictureOption = PictureOption::UNRESTRICTED_MOTION_VECTORS
-        | PictureOption::SYNTAX_BASED_ARITHMETIC_CODING
-        | PictureOption::ADVANCED_PREDICTION
-        | PictureOption::ADVANCED_INTRA_CODING
-        | PictureOption::DEBLOCKING_FILTER
-        | PictureOption::SLICE_STRUCTURED
-        | PictureOption::REFERENCE_PICTURE_SELECTION
-        | PictureOption::INDEPENDENT_SEGMENT_DECODING
-        | PictureOption::ALTERNATIVE_INTER_VLC
-        | PictureOption::MODIFIED_QUANTIZATION;
-}
-
 /// Attempts to read a `PLUSPTYPE` record from the bitstream.
 ///
 /// The set of previous picture options are used to carry forward previously-
@@ -229,7 +212,7 @@ where
                 followers |= PlusPTypeFollower::HAS_REFERENCE_LAYER_NUMBER;
             }
         } else {
-            options |= previous_picture_options & *OPPTYPE_OPTIONS;
+            options |= previous_picture_options & PictureOption::OPPTYPE_OPTIONS;
         }
 
         let mpptype: u16 = reader.read_bits(9)?;

h263/src/parser/picture.rs

@@ -214,30 +214,24 @@ bitflags! {
         ///
         /// This flag is only set by Sorenson Spark bitstreams.
         const USE_DEBLOCKER = 0b10000000000000000;
-    }
-}
 
-lazy_static! {
-    /// The set of options only present in the `OPPTYPE` portion of the picture
-    /// header.
-    pub static ref OPPTYPE_OPTIONS: PictureOption =
-        PictureOption::UNRESTRICTED_MOTION_VECTORS
-            | PictureOption::SYNTAX_BASED_ARITHMETIC_CODING
-            | PictureOption::ADVANCED_PREDICTION
-            | PictureOption::ADVANCED_INTRA_CODING
-            | PictureOption::DEBLOCKING_FILTER
-            | PictureOption::SLICE_STRUCTURED
-            | PictureOption::REFERENCE_PICTURE_SELECTION
-            | PictureOption::INDEPENDENT_SEGMENT_DECODING
-            | PictureOption::ALTERNATIVE_INTER_VLC
-            | PictureOption::MODIFIED_QUANTIZATION;
-
-    /// The set of options only present in the `MPPTYPE` portion of the picture
-    /// header.
-    pub static ref MPPTYPE_OPTIONS: PictureOption =
-        PictureOption::REFERENCE_PICTURE_RESAMPLING
-            | PictureOption::REDUCED_RESOLUTION_UPDATE
-            | PictureOption::ROUNDING_TYPE_ONE;
+        const OPPTYPE_OPTIONS =
+          Self::UNRESTRICTED_MOTION_VECTORS.bits()
+        | Self::SYNTAX_BASED_ARITHMETIC_CODING.bits()
+        | Self::ADVANCED_PREDICTION.bits()
+        | Self::ADVANCED_INTRA_CODING.bits()
+        | Self::DEBLOCKING_FILTER.bits()
+        | Self::SLICE_STRUCTURED.bits()
+        | Self::REFERENCE_PICTURE_SELECTION.bits()
+        | Self::INDEPENDENT_SEGMENT_DECODING.bits()
+        | Self::ALTERNATIVE_INTER_VLC.bits()
+        | Self::MODIFIED_QUANTIZATION.bits();
+
+        const MPPTYPE_OPTIONS =
+          Self::REFERENCE_PICTURE_RESAMPLING.bits()
+        | Self::REDUCED_RESOLUTION_UPDATE.bits()
+        | Self::ROUNDING_TYPE_ONE.bits();
+    }
 }
 
 /// All available picture types in H.263.