X-Git-Url: https://git.nihav.org/?p=nihav-tool.git;a=blobdiff_plain;f=src%2Fmain.rs;h=8280799a790bbc7b31af4a532eeee4369d6a1441;hp=6d29d4618052906ebf0fcd6ccb94bb3fec5a41b5;hb=55d3e99fc4841c63564e337e5b7ec40559f1d19a;hpb=04b90f8a5e344a5eb40a03b9262ec52657054e90

diff --git a/src/main.rs b/src/main.rs
index 6d29d46..8280799 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -3,18 +3,17 @@ extern crate nihav_codec_support;
 extern crate nihav_registry;
 extern crate nihav_allstuff;
 
-use std::io::{SeekFrom, Write, BufReader};
+use std::io::{Write, BufReader};
 use std::fs::File;
 use std::path::Path;
-use nihav_core::io::byteio::{FileReader, ByteReader};
 use nihav_core::frame::*;
 use nihav_core::codecs::*;
 use nihav_core::demuxers::*;
 use nihav_codec_support::imgwrite::*;
-use nihav_registry::detect;
-use nihav_allstuff::*;
 use std::env;
 
+mod demux;
+use demux::*;
 mod wavwriter;
 use crate::wavwriter::WavWriter;
 
@@ -165,29 +164,28 @@ fn main() {
 
     let path = Path::new(name);
     let file = File::open(path).unwrap();
-    let mut file = BufReader::new(file);
-    let dmx_fact;
-    let mut fr = FileReader::new_read(&mut file);
+    let file = BufReader::new(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);
+    let (is_raw, start, end) = detect_tags(&mut br);
+
+    let mut nfr: Box<dyn ByteIO>;
+    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 full_reg = FullRegister::new();
+    let mut demuxer = DemuxerObject::create(&mut br, &full_reg, name, is_raw);
+    if demuxer.is_none() {
+        println!("No demuxer found!");
         return;
     }
-    let (dmx_name, _) = res.unwrap();
-println!("trying demuxer {} on {}", dmx_name, name);
-
-    let mut dmx_reg = RegisteredDemuxers::new();
-    nihav_register_all_demuxers(&mut dmx_reg);
-    let mut dec_reg = RegisteredDecoders::new();
-    nihav_register_all_decoders(&mut dec_reg);
-
-    dmx_fact = dmx_reg.find_demuxer(dmx_name).unwrap();
-    br.seek(SeekFrom::Start(0)).unwrap();
-    let mut dmx = create_demuxer(dmx_fact, &mut br).unwrap();
-
     if seek_time != NATimePoint::None {
-        let ret = dmx.seek(seek_time);
+        let ret = demuxer.seek(seek_time);
         if ret.is_err() {
 println!(" seek error {:?}", ret.err().unwrap());
         }
@@ -197,17 +195,17 @@ println!(" seek error {:?}", ret.err().unwrap());
     let mut sids: Vec<u32> = Vec::new();
     let mut writers: Vec<Outputter> = Vec::new();
     let dec_opts = [NAOption{name: FRAME_SKIP_OPTION, value: NAValue::String(smode.to_string())}];
-    let duration = dmx.get_duration();
+    let duration = demuxer.get_duration();
     if duration != 0 {
         let s = duration / 1000;
         let m = s / 60;
         let h = m / 60;
         println!(" total duration {}:{:02}:{:02}.{}", h, m % 60, s % 60, (duration / 100) % 10);
     }
-    for i in 0..dmx.get_num_streams() {
-        let s = dmx.get_stream(i).unwrap();
+    for i in 0..demuxer.get_num_streams() {
+        let s = demuxer.get_stream(i).unwrap();
         let info = s.get_info();
-        let decfunc = dec_reg.find_decoder(info.get_name());
+        let decfunc = full_reg.dec_reg.find_decoder(info.get_name());
 println!("stream {} - {} {}", i, s, info.get_name());
         let str_id = s.get_id();
         let mut has_out = false;
@@ -262,7 +260,7 @@ println!("stream {} - {} {}", i, s, info.get_name());
 
     let mut frmnum = 0;
     loop {
-        let pktres = dmx.get_frame();
+        let pktres = demuxer.get_frame();
         if let Err(e) = pktres {
             if e == DemuxerError::EOF { break; }
         }