io: make writer consume outputter

[nihav.git] / src / test / dec_video.rs

diff --git a/src/test/dec_video.rs b/src/test/dec_video.rs
index 4094d3aa2d36d8911976c7dad0c34c1f64d8bb1e..a2cf6e7166d88b1efff18b27e9f3cd94afcd22c7 100644 (file)
--- 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);
@@ -143,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);
                 }
             }
         }
@@ -179,8 +180,8 @@ pub fn test_decode_audio(demuxer: &str, name: &str, limit: Option<u64>, audio_pf
     }
 
     let name = format!("assets/{}out.wav", audio_pfx);
-    let mut file = File::create(name).unwrap();
-    let mut fw = FileWriter::new_write(&mut file);
+    let file = File::create(name).unwrap();
+    let mut fw = FileWriter::new_write(file);
     let mut wr = ByteWriter::new(&mut fw);
     let mut wwr = WavWriter::new(&mut wr);
     let mut wrote_header = false;