do not output frames in old video tests

[nihav.git] / src / codecs / indeo3.rs

diff --git a/src/codecs/indeo3.rs b/src/codecs/indeo3.rs
index d8ffb592b2e378dc164d57a6f42efb529f9c3b78..e5a6c0bf9a0cdaf01fdb7afa92446a5fa577fda6 100644 (file)
--- a/src/codecs/indeo3.rs
+++ b/src/codecs/indeo3.rs
@@ -747,7 +747,7 @@ impl NADecoder for Indeo3Decoder {
         if (yoff < vend) && (yoff > voff) { vend = yoff; }
         if (uoff < vend) && (uoff > voff) { vend = uoff; }
 
-        let interframe = (flags & FLAG_KEYFRAME) != 0;
+        let intraframe = (flags & FLAG_KEYFRAME) != 0;
         let vinfo = self.info.get_properties().get_video_info().unwrap();
         let bufret = alloc_video_buffer(vinfo, 2);
         if let Err(_) = bufret { return Err(DecoderError::InvalidData); }
@@ -759,7 +759,7 @@ impl NADecoder for Indeo3Decoder {
         let yendpos = data_start + (yend as u64);
         let uendpos = data_start + (uend as u64);
         let vendpos = data_start + (vend as u64);
-        if interframe {
+        if intraframe {
             self.decode_plane_intra(&mut br, 0, ystart, yendpos)?;
             self.decode_plane_intra(&mut br, 1, ustart, uendpos)?;
             self.decode_plane_intra(&mut br, 2, vstart, vendpos)?;
@@ -771,8 +771,8 @@ impl NADecoder for Indeo3Decoder {
         self.bufs.fill_framebuf(&mut buf);
         if (flags & FLAG_NONREF) == 0 { self.bufs.flip(); }
         let mut frm = NAFrame::new_from_pkt(pkt, self.info.clone(), bufinfo);
-        frm.set_keyframe(interframe);
-        frm.set_frame_type(if interframe { FrameType::I } else { FrameType::P });
+        frm.set_keyframe(intraframe);
+        frm.set_frame_type(if intraframe { FrameType::I } else { FrameType::P });
         Ok(Rc::new(RefCell::new(frm)))
     }
 }
@@ -816,12 +816,13 @@ panic!("decoder {} not found", info.get_name());
             let pkt = pktres.unwrap();
             let streamno = pkt.get_stream().get_id() as usize;
             if let Some(ref mut dec) = decs[streamno] {
-                let frm = dec.decode(&pkt).unwrap();
-                if pkt.get_stream().get_info().is_video() {
-                    write_pgmyuv("iv3", streamno, pkt.get_pts().unwrap(), frm);
-                } else {
-                    write_sound("iv3", streamno, frm, pkt.get_pts().unwrap() == 0);
-                }
+//                let frm = 
+dec.decode(&pkt).unwrap();
+//                if pkt.get_stream().get_info().is_video() {
+//                    write_pgmyuv("iv3", streamno, pkt.get_pts().unwrap(), frm);
+//                } else {
+//                    write_sound("iv3", streamno, frm, pkt.get_pts().unwrap() == 0);
+//                }
             }
             if pkt.get_pts().unwrap() > 10 { break; }
         }