commit dec80afc3f0f8d37eb95bbb57bac0ad0f439008f
author Alexandre Courbot <acourbot@chromium.org> Thu Apr 06 13:29:18 2023 +0900
committer Alexandre Courbot <acourbot@chromium.org> Thu Apr 06 16:53:55 2023 +0900
tree 65b8d805add798d7ee6ece92f4856d39f6e59ada
parent 879bdb86858d238ac2c223e1fcd15bc8b490a93a

decoder/vp8: simplify handle_frame

Now that we do not store entire frames between calls to decode, we don't
need that extra argument.

src/decoders/vp8/decoder.rs

diff --git a/src/decoders/vp8/decoder.rs b/src/decoders/vp8/decoder.rs
index 858a1c1..aab2ab2 100644
--- a/src/decoders/vp8/decoder.rs
+++ b/src/decoders/vp8/decoder.rs
@@ -132,21 +132,11 @@
     }
 
     /// Handle a single frame.
-    fn handle_frame(
-        &mut self,
-        frame: Frame<&[u8]>,
-        timestamp: u64,
-        queued_parser_state: Option<Parser>,
-    ) -> Result<(), DecodeError> {
+    fn handle_frame(&mut self, frame: Frame<&[u8]>, timestamp: u64) -> Result<(), DecodeError> {
         if self.backend.num_resources_left() == 0 {
             return Err(DecodeError::CheckEvents);
         }
 
-        let parser = match &queued_parser_state {
-            Some(parser) => parser,
-            None => &self.parser,
-        };
-
         let show_frame = frame.header.show_frame();
 
         let decoded_handle = self.backend.submit_picture(
@@ -155,8 +145,8 @@
             self.golden_ref_picture.as_ref(),
             self.alt_ref_picture.as_ref(),
             frame.bitstream,
-            parser.segmentation(),
-            parser.mb_lf_adjust(),
+            self.parser.segmentation(),
+            self.parser.mb_lf_adjust(),
             timestamp,
         )?;
 
@@ -204,7 +194,7 @@
             DecodingState::AwaitingStreamInfo => Ok(()),
             // Ask the client to confirm the format before we can process this.
             DecodingState::AwaitingFormat(_) => Err(DecodeError::CheckEvents),
-            DecodingState::Decoding => self.handle_frame(frame, timestamp, None),
+            DecodingState::Decoding => self.handle_frame(frame, timestamp),
         }
     }