X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=src%2Ftest%2Fdec_video.rs;h=61577c43e97d171aa2243bf6a5d4c714523ef103;hb=0366d374da0082f9bef8e49104b7f1631b24e9c1;hp=8576b11aed50037a087a52b8347a90fed7fde4d1;hpb=3e113f526806a877f464d0b5813d633bb0bd991a;p=nihav.git

diff --git a/src/test/dec_video.rs b/src/test/dec_video.rs
index 8576b11..61577c4 100644
--- a/src/test/dec_video.rs
+++ b/src/test/dec_video.rs
@@ -9,7 +9,7 @@ use super::wavwriter::WavWriter;
 fn write_pgmyuv(pfx: &str, strno: usize, num: u64, frmref: NAFrameRef) {
     let frm = frmref.borrow();
     if let NABufferType::None = frm.get_buffer() { return; }
-    let name = format!("assets/{}out{:02}_{:04}.pgm", pfx, strno, num);
+    let name = format!("assets/{}out{:02}_{:06}.pgm", pfx, strno, num);
     let mut ofile = File::create(name).unwrap();
     let buf = frm.get_buffer().get_vbuf().unwrap();
     let (w, h) = buf.get_dimensions(0);
@@ -68,7 +68,7 @@ fn write_pgmyuv(pfx: &str, strno: usize, num: u64, frmref: NAFrameRef) {
 
 fn write_palppm(pfx: &str, strno: usize, num: u64, frmref: NAFrameRef) {
     let frm = frmref.borrow();
-    let name = format!("assets/{}out{:02}_{:04}.ppm", pfx, strno, num);
+    let name = format!("assets/{}out{:02}_{:06}.ppm", pfx, strno, num);
     let mut ofile = File::create(name).unwrap();
     let buf = frm.get_buffer().get_vbuf().unwrap();
     let (w, h) = buf.get_dimensions(0);
@@ -108,8 +108,7 @@ pub fn test_file_decoding(demuxer: &str, name: &str, limit: Option<u64>,
     let mut file = File::open(name).unwrap();
     let mut fr = FileReader::new_read(&mut file);
     let mut br = ByteReader::new(&mut fr);
-    let mut dmx = dmx_f.new_demuxer(&mut br);
-    dmx.open().unwrap();
+    let mut dmx = create_demuxer(dmx_f, &mut br).unwrap();
 
     let mut decs: Vec<Option<Box<NADecoder>>> = Vec::new();
     for i in 0..dmx.get_num_streams() {
@@ -144,10 +143,11 @@ pub fn test_file_decoding(demuxer: &str, name: &str, limit: Option<u64>,
             let frm = dec.decode(&pkt).unwrap();
             if pkt.get_stream().get_info().is_video() && video_pfx.is_some() && frm.borrow().get_frame_type() != FrameType::Skip {
                 let pfx = video_pfx.unwrap();
+		let pts = if let Some(fpts) = frm.borrow().get_pts() { fpts } else { pkt.get_pts().unwrap() };
                 if frm.borrow().get_buffer().get_vbuf().unwrap().get_info().get_format().is_paletted() {
-                    write_palppm(pfx, streamno, pkt.get_pts().unwrap(), frm);
+                    write_palppm(pfx, streamno, pts, frm);
                 } else {
-                    write_pgmyuv(pfx, streamno, pkt.get_pts().unwrap(), frm);
+                    write_pgmyuv(pfx, streamno, pts, frm);
                 }
             }
         }
@@ -159,8 +159,7 @@ pub fn test_decode_audio(demuxer: &str, name: &str, limit: Option<u64>, audio_pf
     let mut file = File::open(name).unwrap();
     let mut fr = FileReader::new_read(&mut file);
     let mut br = ByteReader::new(&mut fr);
-    let mut dmx = dmx_f.new_demuxer(&mut br);
-    dmx.open().unwrap();
+    let mut dmx = create_demuxer(dmx_f, &mut br).unwrap();
 
     let mut decs: Vec<Option<Box<NADecoder>>> = Vec::new();
     for i in 0..dmx.get_num_streams() {