find decoder by stream ID instead of relying on index directly

diff --git a/src/main.rs b/src/main.rs
index b5653f4437ddbec748db431e77b6d4e0f98f74d1..b57e3611953ab6ad83b093f779416ebec465b320 100644 (file)
--- a/src/main.rs
+++ b/src/main.rs
@@ -122,13 +122,16 @@ println!("trying demuxer {} on {}", dmx_name, name);
     let mut dmx = create_demuxer(dmx_fact, &mut br).unwrap();
 
     let mut decs: Vec<Option<Box<NADecoder>>> = Vec::new();
     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());
 println!("stream {} - {} {}", i, s, info.get_name());
     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());
 println!("stream {} - {} {}", i, s, info.get_name());

+        let str_id = s.get_id();

         let mut has_out = false;
         let mut has_out = false;

+        sids.push(str_id);

         if info.is_video() {
             if decode_video {
                 if decfunc.is_none() {
         if info.is_video() {
             if decode_video {
                 if decfunc.is_none() {


@@ -177,11 +180,13 @@ panic!("decoder {} not found", info.get_name());
             if e == DemuxerError::EOF { break; }
         }
         let pkt = pktres.unwrap();
             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 {
             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); },
                     _ => {},
                     Outputter::Video(ref mut wr) => { wr.output_frame(&pkt, frm); },
                     Outputter::Audio(ref mut wr) => { wr.output_frame(&pkt, frm); },
                     _ => {},