X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=sndplay%2Fsrc%2Fmain.rs;h=275826ff9f7db9d425b5efc9a3c37a12179ba3ef;hb=0a70659f1bac51dda65d0c8349a219c565b56c8c;hp=a5fc6ff29b2648b44a69442d883d91e5c81fc82f;hpb=5a92ee55d90571333184392ebb240581c990d18e;p=nihav-player.git diff --git a/sndplay/src/main.rs b/sndplay/src/main.rs index a5fc6ff..275826f 100644 --- a/sndplay/src/main.rs +++ b/sndplay/src/main.rs @@ -5,7 +5,7 @@ extern crate nihav_registry; use std::fs::File; use std::io::prelude::*; -use std::io::{BufReader, SeekFrom}; +use std::io::BufReader; use std::sync::mpsc; use std::time::Duration; use std::thread; @@ -15,16 +15,16 @@ use nihav_core::frame::*; use nihav_core::codecs::*; use nihav_core::demuxers::*; use nihav_core::soundcvt::*; -use nihav_registry::detect; mod allreg; mod command; use command::*; +mod demux; +use demux::*; struct Player { ended: bool, - dmx_reg: RegisteredDemuxers, - dec_reg: RegisteredDecoders, + full_reg: allreg::FullRegister, paused: bool, mute: bool, volume: u8, @@ -92,7 +92,7 @@ impl Drop for AudioDevice { } struct Decoder<'a> { - demuxer: Demuxer<'a>, + demuxer: DemuxerObject<'a>, decoder: Box, dsupp: Box, buf: &'a mut Vec, @@ -107,7 +107,7 @@ struct Decoder<'a> { fn output_vol_i16(device: &AudioDevice, tmp: &mut Vec, src: &[i16], mute: bool, volume: u8) { if !mute { - tmp.truncate(0); + tmp.clear(); tmp.reserve(src.len()); let vol = i32::from(volume); for &sample in src.iter() { @@ -115,7 +115,7 @@ fn output_vol_i16(device: &AudioDevice, tmp: &mut Vec, src: &[i16], mute: b tmp.push(nsamp.min(32767).max(-32768) as i16); } } else { - tmp.truncate(0); + tmp.clear(); tmp.resize(src.len(), 0); } device.queue(&tmp); @@ -123,7 +123,7 @@ fn output_vol_i16(device: &AudioDevice, tmp: &mut Vec, src: &[i16], mute: b fn output_vol_u8(device: &AudioDevice, tmp: &mut Vec, src: &[u8], mute: bool, volume: u8) { if !mute { - tmp.truncate(0); + tmp.clear(); tmp.reserve(src.len()); let vol = i32::from(volume); for sample in src.chunks_exact(2) { @@ -132,7 +132,7 @@ fn output_vol_u8(device: &AudioDevice, tmp: &mut Vec, src: &[u8], mute: boo tmp.push(nsamp.min(32767).max(-32768) as i16); } } else { - tmp.truncate(0); + tmp.clear(); tmp.resize(src.len() / 2, 0); } device.queue(&tmp); @@ -147,9 +147,15 @@ impl<'a> Decoder<'a> { match self.decoder.decode(&mut self.dsupp, &pkt) { Ok(frm) => { let buf = frm.get_buffer(); + if let NABufferType::None = buf { + return false; + } if let Some(pts) = frm.ts.get_pts() { self.samplepos = NATimeInfo::ts_to_time(pts, u64::from(self.arate), frm.ts.tb_num, frm.ts.tb_den); } + if buf.get_audio_length() == 0 { + return false; + } let out_buf = convert_audio_frame(&buf, &self.dst_info, &self.dst_chmap).unwrap(); match out_buf { NABufferType::AudioI16(abuf) => { @@ -212,10 +218,7 @@ fn format_time(ms: u64) -> String { impl Player { fn new() -> Self { - let mut dmx_reg = RegisteredDemuxers::new(); - allreg::register_all_demuxers(&mut dmx_reg); - let mut dec_reg = RegisteredDecoders::new(); - allreg::register_all_decoders(&mut dec_reg); + let full_reg = allreg::FullRegister::new(); unsafe { if sdl2_sys::SDL_Init(sdl2_sys::SDL_INIT_AUDIO) != 0 { @@ -226,7 +229,7 @@ impl Player { Self { ended: false, paused: false, - dmx_reg, dec_reg, + full_reg, volume: 100, mute: false, debug: false, @@ -239,35 +242,31 @@ impl Player { println!("error opening {}", name); return; } - let mut file = ret.unwrap(); + let file = ret.unwrap(); + let file = BufReader::new(file); - let mut fr = FileReader::new_read(&mut file); + let mut fr = FileReader::new_read(file); let mut br = ByteReader::new(&mut fr); - let res = detect::detect_format(name, &mut br); - if res.is_none() { - println!("cannot detect format for {}", name); - return; - } - let (dmx_name, _) = res.unwrap(); - drop(br); - drop(fr); - let dmx_fact = self.dmx_reg.find_demuxer(dmx_name); - if dmx_fact.is_none() { - println!("no demuxer for format {}", dmx_name); + if br.peek_byte().is_err() { + println!("Cannot read {}", name); return; } - let dmx_fact = dmx_fact.unwrap(); + let (is_raw, start, end) = detect_tags(&mut br); - file.seek(SeekFrom::Start(0)).unwrap(); - let mut file = BufReader::new(file); - let mut fr = FileReader::new_read(&mut file); - let mut br = ByteReader::new(&mut fr); - let res = create_demuxer(dmx_fact, &mut br); - if res.is_err() { - println!("cannot create demuxer"); + let mut nfr: Box; + if start != 0 || end.is_some() { + //println!(" limiting range to {:X}-{:X}", start, end.unwrap_or(0)); + let file = fr.finish(); + nfr = Box::new(BoundedFileReader::new_read(file, start, end).unwrap()); + } else { + nfr = Box::new(fr); + } + let mut br = ByteReader::new(nfr.as_mut()); + let dmx = DemuxerObject::create(&mut br, &self.full_reg, name, is_raw); + if dmx.is_none() { + println!("No demuxer found!"); return; } - let dmx = res.unwrap(); let mut ainfo = None; let mut dec: Option<(Box, Box)> = None; @@ -277,7 +276,7 @@ impl Player { let s = dmx.get_stream(i).unwrap(); let info = s.get_info(); if info.is_audio() { - let decfunc = self.dec_reg.find_decoder(info.get_name()); + let decfunc = self.full_reg.dec_reg.find_decoder(info.get_name()); if decfunc.is_none() { println!("no decoder for {}", info.get_name()); continue;