X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=src%2Fdemuxers%2Fgdv.rs;h=daac924275cb0dde480769763bed9babc6f469c3;hb=cf64af13518ee281beec24f32aa0e36317260b82;hp=afdc4f6ac591ce1b37541b3fa2caa14c70048bc1;hpb=20ef4353905883ca289782858ccfcd7d2146fa42;p=nihav.git

diff --git a/src/demuxers/gdv.rs b/src/demuxers/gdv.rs
index afdc4f6..daac924 100644
--- a/src/demuxers/gdv.rs
+++ b/src/demuxers/gdv.rs
@@ -10,7 +10,7 @@ enum GDVState {
 }
 
 #[allow(dead_code)]
-pub struct GremlinVideoDemuxer<'a> {
+struct GremlinVideoDemuxer<'a> {
     opened:     bool,
     src:        &'a mut ByteReader<'a>,
     frames:     u16,
@@ -41,24 +41,29 @@ impl<'a> Demux<'a> for GremlinVideoDemuxer<'a> {
         let width = src.read_u16le()?;
         let height = src.read_u16le()?;
         if max_fs > 0 {
-            let vhdr = NAVideoInfo::new(width as u32, height as u32, false, PAL8_FORMAT);
+            let mut edata: Vec<u8> = Vec::with_capacity(768);
+            if depth == 1 {
+                edata.resize(768, 0);
+                src.read_buf(edata.as_mut_slice())?;
+            }
+            let vhdr = NAVideoInfo::new(width as usize, height as usize, false, PAL8_FORMAT);
             let vci = NACodecTypeInfo::Video(vhdr);
-            let vinfo = NACodecInfo::new(vci, None);
-            self.v_id = self.dmx.add_stream(NAStream::new(StreamType::Video, 0, vinfo));
+            let vinfo = NACodecInfo::new("gdv-video", vci, if edata.len() == 0 { None } else { Some(edata) });
+            self.v_id = self.dmx.add_stream(NAStream::new(StreamType::Video, 0, vinfo, 1, fps as u32));
         }
         if (aflags & 1) != 0 {
             let channels = if (aflags & 2) != 0 { 2 } else { 1 };
-            let ahdr = NAAudioInfo::new(rate as u32, channels as u8, if (aflags & 4) != 0 { SND_S16_FORMAT } else { SND_U8_FORMAT }, 2);
-            let ainfo = NACodecInfo::new(NACodecTypeInfo::Audio(ahdr), None);
-            self.a_id = self.dmx.add_stream(NAStream::new(StreamType::Audio, 1, ainfo));
+            let packed   = if (aflags & 8) != 0 { 1 } else { 0 };
+            let depth    = if (aflags & 4) != 0 { 16 } else { 8 };
+
+            let ahdr = NAAudioInfo::new(rate as u32, channels as u8, if depth == 16 { SND_S16_FORMAT } else { SND_U8_FORMAT }, 2);
+            let ainfo = NACodecInfo::new(if packed != 0 { "gdv-audio" } else { "pcm" },
+                                         NACodecTypeInfo::Audio(ahdr), None);
+            self.a_id = self.dmx.add_stream(NAStream::new(StreamType::Audio, 1, ainfo, 1, rate as u32));
 
-            let packed = if (aflags & 8) != 0 { 1 } else { 0 };
-            self.asize = (((rate / fps) * channels * (if (aflags & 4) != 0 { 2 } else { 1 })) >> packed) as usize;
+            self.asize = (((rate / fps) * channels * (depth / 8)) >> packed) as usize;
             self.apacked = (aflags & 8) != 0;
         }
-        if max_fs > 0 && depth == 1 {
-            src.read_skip(768)?;
-        }
         self.frames = frames;
         self.opened = true;
         self.state = GDVState::NewFrame;
@@ -75,6 +80,9 @@ impl<'a> Demux<'a> for GremlinVideoDemuxer<'a> {
         }
     }
 
+    fn get_num_streams(&self) -> usize { self.dmx.get_num_streams() }
+    fn get_stream(&self, idx: usize) -> Option<Rc<NAStream>> { self.dmx.get_stream(idx) }
+
     #[allow(unused_variables)]
     fn seek(&mut self, time: u64) -> DemuxerResult<()> {
         if !self.opened { return Err(DemuxerError::NoSuchInput); }
@@ -87,7 +95,7 @@ impl<'a> Demux<'a> for GremlinVideoDemuxer<'a> {
     }
 }*/
 impl<'a> GremlinVideoDemuxer<'a> {
-    pub fn new(io: &'a mut ByteReader<'a>) -> Self {
+    fn new(io: &'a mut ByteReader<'a>) -> Self {
         GremlinVideoDemuxer {
             cur_frame: 0,
             frames: 0,
@@ -106,7 +114,9 @@ pktdta: Vec::new(),
     fn read_achunk(&mut self) -> DemuxerResult<NAPacket> {
         self.state = GDVState::AudioRead;
         let str = self.dmx.get_stream(self.a_id.unwrap()).unwrap();
-        self.src.read_packet(str, Some(self.cur_frame as u64), None, None, true, self.asize)
+        let (tb_num, tb_den) = str.get_timebase();
+        let ts = NATimeInfo::new(Some(self.cur_frame as u64), None, None, tb_num, tb_den);
+        self.src.read_packet(str, ts, true, self.asize)
     }
 
     fn read_vchunk(&mut self) -> DemuxerResult<NAPacket> {
@@ -119,8 +129,19 @@ pktdta: Vec::new(),
         let flags = (tmp & 0xFF) as usize;
         self.state = GDVState::NewFrame;
         self.cur_frame = self.cur_frame + 1;
-        src.read_packet(str, Some((self.cur_frame - 1) as u64), None, None, if (flags & 64) != 0 { true } else { false }, size)
+        let (tb_num, tb_den) = str.get_timebase();
+        let ts = NATimeInfo::new(Some((self.cur_frame - 1) as u64), None, None, tb_num, tb_den);
+        src.read_packet(str, ts, if (flags & 64) != 0 { true } else { false }, size)
+    }
+}
+
+pub struct GDVDemuxerCreator { }
+
+impl DemuxerCreator for GDVDemuxerCreator {
+    fn new_demuxer<'a>(&self, br: &'a mut ByteReader<'a>) -> Box<Demux<'a> + 'a> {
+        Box::new(GremlinVideoDemuxer::new(br))
     }
+    fn get_name(&self) -> &'static str { "gdv" }
 }
 
 #[cfg(test)]