commit db5221c872167432f65d6dcfc191f8422bc07918
author Alexandre Courbot <acourbot@chromium.org> Tue Jul 04 22:36:54 2023 +0900
committer Alexandre Courbot <acourbot@chromium.org> Thu Jul 06 23:17:11 2023 +0900
tree 2309739d9f5fecafdf71a050c7c5c50154702a8d
parent 26472d19fd01acdc57040bd9a3088fc6e2a35d9d

codec/h264: use Field::opposite() to split frame

src/codec/h264/picture.rs

diff --git a/src/codec/h264/picture.rs b/src/codec/h264/picture.rs
index 8a52aac..a90cc86 100644
--- a/src/codec/h264/picture.rs
+++ b/src/codec/h264/picture.rs
@@ -269,7 +269,6 @@
         assert!(matches!(pic_rc.borrow().field, Field::Frame));
         assert!(pic_rc.borrow().other_field.is_none());
 
-        let field;
         let pic_order_cnt;
         let mut pic = pic_rc.borrow_mut();
 
@@ -281,14 +280,10 @@
         if pic.top_field_order_cnt < pic.bottom_field_order_cnt {
             pic.field = Field::Top;
             pic.pic_order_cnt = pic.top_field_order_cnt;
-
-            field = Field::Bottom;
             pic_order_cnt = pic.bottom_field_order_cnt;
         } else {
             pic.field = Field::Bottom;
             pic.pic_order_cnt = pic.bottom_field_order_cnt;
-
-            field = Field::Top;
             pic_order_cnt = pic.top_field_order_cnt;
         }
 
@@ -299,7 +294,7 @@
             reference: pic.reference,
             nonexisting: pic.nonexisting,
             pic_order_cnt,
-            field,
+            field: pic.field.opposite(),
             ..Default::default()
         };