commit 26472d19fd01acdc57040bd9a3088fc6e2a35d9d
author Alexandre Courbot <acourbot@chromium.org> Tue Jul 04 22:36:26 2023 +0900
committer Alexandre Courbot <acourbot@chromium.org> Thu Jul 06 23:17:11 2023 +0900
tree 7a6912c94dcb906cd09a19e6dd83659618825d10
parent 173e4ba7ecd4afd0fdb07a7170c2698a8c830bf8

codec/h264: make Field::opposite() error-free

We can prevent some unwraps if we consider that Frame is its own
opposite.

src/codec/h264/picture.rs

diff --git a/src/codec/h264/picture.rs b/src/codec/h264/picture.rs
index e149206..8a52aac 100644
--- a/src/codec/h264/picture.rs
+++ b/src/codec/h264/picture.rs
@@ -24,11 +24,11 @@
 
 impl Field {
     /// Returns the field of opposite parity.
-    pub fn opposite(&self) -> Option<Self> {
+    pub fn opposite(&self) -> Self {
         match *self {
-            Field::Frame => None,
-            Field::Top => Some(Field::Bottom),
-            Field::Bottom => Some(Field::Top),
+            Field::Frame => Field::Frame,
+            Field::Top => Field::Bottom,
+            Field::Bottom => Field::Top,
         }
     }
 }

src/decoder/stateless/h264.rs

diff --git a/src/decoder/stateless/h264.rs b/src/decoder/stateless/h264.rs
index 812b110..e1a32c7 100644
--- a/src/decoder/stateless/h264.rs
+++ b/src/decoder/stateless/h264.rs
@@ -973,7 +973,7 @@
             let found = p.field == field;
 
             if found {
-                field = field.opposite().unwrap();
+                field = field.opposite();
             }
 
             found