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);
let (w2, h2) = buf.get_dimensions(1);
- let tot_h = h + h2;
+ let has_alpha = buf.get_info().get_format().has_alpha();
+ let tot_h;
+ if has_alpha {
+ tot_h = h * 2 + h2;
+ } else {
+ tot_h = h + h2;
+ }
let hdr = format!("P5\n{} {}\n255\n", w, tot_h);
ofile.write_all(hdr.as_bytes()).unwrap();
let dta = buf.get_data();
base1 += stride1;
base2 += stride2;
}
+ if has_alpha {
+ let ls = buf.get_stride(3);
+ let mut idx = buf.get_offset(3);
+ let mut idx2 = idx + w;
+ for _ in 0..h {
+ let line = &dta[idx..idx2];
+ ofile.write_all(line).unwrap();
+ idx += ls;
+ idx2 += ls;
+ }
+ }
}
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);
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() {
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);
}
}
}
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() {
}
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;