X-Git-Url: https://git.nihav.org/?p=nihav-tool.git;a=blobdiff_plain;f=src%2Fmain.rs;h=9f9d4976bd4c61858142e0d8b3ecf877d9ce8842;hp=d30dd871d8aceadbe6dd08a3eb03d3756b8251d5;hb=4b6a29cef820d5345b27f8c4b7bd22a4d7fca371;hpb=ffe695773d38f16f1a6f04086f47c19c1c7b4a92
diff --git a/src/main.rs b/src/main.rs
index d30dd87..9f9d497 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -33,8 +33,7 @@ struct FrameOutput {
}
impl FrameOutput {
- fn output_frame(&mut self, pkt: &NAPacket, frmref: NAFrameRef) {
- let frm = frmref.borrow();
+ fn output_frame(&mut self, pkt: &NAPacket, frm: NAFrameRef) {
if frm.get_frame_type() != FrameType::Skip {
let pts = match self.nmode {
NumberMode::Counter => { self.frameno },
@@ -65,10 +64,10 @@ impl AudioOutput {
fn new(name: &String) -> Self { Self { wwr: WavWriter::new(name), wrote_header: false } }
fn output_frame(&mut self, _pkt: &NAPacket, frm: NAFrameRef) {
if !self.wrote_header {
- self.wwr.write_header(frm.borrow().get_info().as_ref().get_properties().get_audio_info().unwrap()).unwrap();
+ self.wwr.write_header(frm.get_info().as_ref().get_properties().get_audio_info().unwrap()).unwrap();
self.wrote_header = true;
}
- self.wwr.write_frame(frm.borrow().get_buffer()).unwrap();
+ self.wwr.write_frame(frm.get_buffer()).unwrap();
}
}
@@ -133,7 +132,7 @@ println!("trying demuxer {} on {}", dmx_name, name);
br.seek(SeekFrom::Start(0)).unwrap();
let mut dmx = create_demuxer(dmx_fact, &mut br).unwrap();
- let mut decs: Vec