X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-itu%2Fsrc%2Fcodecs%2Fh264%2Fpic_ref.rs;h=c366b25aa1b6e508061d601760b7263e842e66d8;hb=22de733b14e3ef23eabaaa9f8b2e98a59188c5cf;hp=88d453d724fbbbae602ffbdbc91224bd65fd423d;hpb=696e4e20bf7167121352f247893370cb83213d5c;p=nihav.git

diff --git a/nihav-itu/src/codecs/h264/pic_ref.rs b/nihav-itu/src/codecs/h264/pic_ref.rs
index 88d453d..c366b25 100644
--- a/nihav-itu/src/codecs/h264/pic_ref.rs
+++ b/nihav-itu/src/codecs/h264/pic_ref.rs
@@ -200,8 +200,8 @@ impl FrameRefs {
                     self.long_term.resize(arg1 as usize, None);
                 },
                 5 => {
-                    self.ref_pics.truncate(0);
-                    self.long_term.truncate(0);
+                    self.ref_pics.clear();
+                    self.long_term.clear();
                 },
                 6 => {
                     // assign an long term index to current pic - done elsewhere
@@ -212,12 +212,13 @@ impl FrameRefs {
         Ok(())
     }
     pub fn clear_refs(&mut self) {
-        self.ref_pics.truncate(0);
-        self.long_term.truncate(0);
+        self.ref_pics.clear();
+        self.long_term.clear();
     }
+    #[allow(clippy::cognitive_complexity)]
     pub fn select_refs(&mut self, sps: &SeqParameterSet, slice_hdr: &SliceHeader, cur_id: u32) {
-        self.ref_list0.truncate(0);
-        self.ref_list1.truncate(0);
+        self.ref_list0.clear();
+        self.ref_list1.clear();
         let pic_num_mask = if sps.log2_max_frame_num == 16 {
                 0xFFFF
             } else {
@@ -406,9 +407,38 @@ impl FrameRefs {
             };
         [ref0, ref1]
     }
+    pub fn cmp_refs(&self, ref1: [PicRef; 2], ref2: [PicRef; 2]) -> bool {
+        if ref1 != ref2 {
+            self.cmp_ref(ref1[0], ref2[0], 0) && self.cmp_ref(ref1[1], ref2[1], 1)
+        } else {
+            true
+        }
+    }
+    fn cmp_ref(&self, ref1: PicRef, ref2: PicRef, list: u8) -> bool {
+        if ref1 == ref2 {
+            true
+        } else {
+            let idx0 = ref1.index();
+            let idx1 = ref2.index();
+            if idx0 == idx1 {
+                return true;
+            }
+            let src = if list == 0 { &self.ref_list0 } else { &self.ref_list1 };
+            if idx0 >= src.len() || idx1 >= src.len() {
+//panic!("wrong refs");
+                return false;
+            }
+            if let (Some(ref pic0), Some(ref pic1)) = (&src[idx0], &src[idx1]) {
+                pic0.full_id == pic1.full_id
+            } else {
+//panic!("missing pics");
+                false
+            }
+        }
+    }
 }
 
-fn form_ref_list(ref_list: &mut Vec<Option<PictureInfo>>, ref_pics: &Vec<PictureInfo>, long_term: &Vec<Option<PictureInfo>>, reord_info: &ReorderingInfo, cur_id: u16, pic_num_mask: u16) {
+fn form_ref_list(ref_list: &mut Vec<Option<PictureInfo>>, ref_pics: &[PictureInfo], long_term: &[Option<PictureInfo>], reord_info: &ReorderingInfo, cur_id: u16, pic_num_mask: u16) {
     let mut ref_pic_id = cur_id;
     for (&op, &num) in reord_info.reordering_of_pic_nums_idc.iter().zip(reord_info.abs_diff_or_num.iter()).take(reord_info.num_ops) {
         if op < 2 {