X-Git-Url: https://git.nihav.org/?p=nihav-tool.git;a=blobdiff_plain;f=src%2Fmain.rs;h=d30dd871d8aceadbe6dd08a3eb03d3756b8251d5;hp=b5653f4437ddbec748db431e77b6d4e0f98f74d1;hb=ffe695773d38f16f1a6f04086f47c19c1c7b4a92;hpb=44939c842b9aa76838dae8064d1b13bb47960efb

diff --git a/src/main.rs b/src/main.rs
index b5653f4..d30dd87 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,20 +1,22 @@
-extern crate nihav;
+extern crate nihav_core;
+extern crate nihav_allstuff;
 
 use std::io::SeekFrom;
 use std::fs::File;
 use std::path::Path;
-use nihav::io::byteio::{FileReader, ByteReader};
-use nihav::frame::*;
-use nihav::codecs::*;
-use nihav::demuxers::*;
-use nihav::detect;
+use nihav_core::io::byteio::{FileReader, ByteReader};
+use nihav_core::frame::*;
+use nihav_core::codecs::*;
+use nihav_core::demuxers::*;
+use nihav_core::detect;
+use nihav_allstuff::*;
 use std::env;
 
 mod frmwriter;
-use frmwriter::*;
+use crate::frmwriter::*;
 
 mod wavwriter;
-use wavwriter::WavWriter;
+use crate::wavwriter::WavWriter;
 
 #[derive(Clone,Copy,PartialEq)]
 enum NumberMode {
@@ -39,11 +41,15 @@ impl FrameOutput {
                     NumberMode::PktPTS  => { pkt.get_pts().unwrap() },
                     NumberMode::FrmPTS  => { if let Some(pt) = frm.get_pts() { pt } else { pkt.get_pts().unwrap() } },
                 };
-            let frmbuf = frm.get_buffer().get_vbuf().unwrap();
-            if frmbuf.get_info().get_format().is_paletted() {
+            let vinfo = frm.get_buffer().get_video_info().unwrap();
+            if vinfo.get_format().is_paletted() {
                 write_palppm(self.prefix, self.streamno, pts, frm);
-            } else {
+            } else if vinfo.get_format().get_model().is_yuv() {
                 write_pgmyuv(self.prefix, self.streamno, pts, frm);
+            } else if vinfo.get_format().get_model().is_rgb() {
+                write_ppm(self.prefix, self.streamno, pts, frm);
+            } else {
+panic!(" unknown format");
             }
         }
         self.frameno += 1;
@@ -117,18 +123,27 @@ fn main() {
     }
     let (dmx_name, _) = res.unwrap();
 println!("trying demuxer {} on {}", dmx_name, name);
-    dmx_fact = find_demuxer(dmx_name).unwrap();
+
+    let mut dmx_reg = RegisteredDemuxers::new();
+    nihav_register_all_demuxers(&mut dmx_reg);
+    let mut dec_reg = RegisteredDecoders::new();
+    nihav_register_all_codecs(&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();
 
     let mut decs: Vec<Option<Box<NADecoder>>> = Vec::new();
+    let mut sids: Vec<u32> = Vec::new();
     let mut writers: Vec<Outputter> = Vec::new();
     for i in 0..dmx.get_num_streams() {
         let s = dmx.get_stream(i).unwrap();
         let info = s.get_info();
-        let decfunc = find_decoder(info.get_name());
+        let decfunc = 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;
+        sids.push(str_id);
         if info.is_video() {
             if decode_video {
                 if decfunc.is_none() {
@@ -177,11 +192,13 @@ panic!("decoder {} not found", info.get_name());
             if e == DemuxerError::EOF { break; }
         }
         let pkt = pktres.unwrap();
-        let streamno = pkt.get_stream().get_id() as usize;
-        if let Some(ref mut dec) = decs[streamno] {
+        let streamno = pkt.get_stream().get_id();
+        let sr = sids.iter().position(|x| *x == streamno);
+        let idx = sr.unwrap();
+        if let Some(ref mut dec) = decs[idx] {
             let frm = dec.decode(&pkt).unwrap();
             if !noout {
-                match writers[streamno] {
+                match writers[idx] {
                     Outputter::Video(ref mut wr) => { wr.output_frame(&pkt, frm); },
                     Outputter::Audio(ref mut wr) => { wr.output_frame(&pkt, frm); },
                     _ => {},