X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-game%2Fsrc%2Fdemuxers%2Fgdv.rs;h=8ae27c61b95376be112010c2262d1638cb41a9c5;hb=HEAD;hp=778329ad451d1e9b7cf6bded3b2847ed6a5c94d5;hpb=a480a0de101483d802a11e72d758dae00fa4860a;p=nihav.git

diff --git a/nihav-game/src/demuxers/gdv.rs b/nihav-game/src/demuxers/gdv.rs
index 778329a..fc25600 100644
--- a/nihav-game/src/demuxers/gdv.rs
+++ b/nihav-game/src/demuxers/gdv.rs
@@ -7,7 +7,6 @@ enum GDVState {
     AudioRead,
 }
 
-#[allow(dead_code)]
 struct GremlinVideoDemuxer<'a> {
     src:        &'a mut ByteReader<'a>,
     frames:     u16,
@@ -15,7 +14,6 @@ struct GremlinVideoDemuxer<'a> {
     asize:      usize,
     apacked:    bool,
     state:      GDVState,
-    pktdta:     Vec<u8>,
     a_id:       Option<usize>,
     v_id:       Option<usize>,
 }
@@ -47,7 +45,6 @@ const GDV_SIZE_TABLE: &[GDVFixedSizes] = &[
 ];
 
 impl<'a> DemuxCore<'a> for GremlinVideoDemuxer<'a> {
-    #[allow(unused_variables)]
     fn open(&mut self, strmgr: &mut StreamManager, _seek_index: &mut SeekIndex) -> DemuxerResult<()> {
         let src = &mut self.src;
         let magic = src.read_u32le()?;
@@ -78,7 +75,7 @@ impl<'a> DemuxCore<'a> for GremlinVideoDemuxer<'a> {
                 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 vhdr = NAVideoInfo::new(width as usize, height as usize, false, if depth < 2 { PAL8_FORMAT } else { RGB565_FORMAT });
             let vci = NACodecTypeInfo::Video(vhdr);
             let vinfo = NACodecInfo::new("gdv-video", vci, if edata.is_empty() { None } else { Some(edata) });
             self.v_id = strmgr.add_stream(NAStream::new(StreamType::Video, 0, vinfo, 1, u32::from(fps), u64::from(frames)));
@@ -91,7 +88,7 @@ impl<'a> DemuxCore<'a> for GremlinVideoDemuxer<'a> {
             let ahdr = NAAudioInfo::new(u32::from(rate), 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 = strmgr.add_stream(NAStream::new(StreamType::Audio, 1, ainfo, 1, u32::from(rate), 0));
+            self.a_id = strmgr.add_stream(NAStream::new(StreamType::Audio, 1, ainfo, 1, u32::from(fps), 0));
 
             self.asize = (((rate / fps) * channels * (depth / 8)) >> packed) as usize;
             self.apacked = (aflags & 8) != 0;
@@ -101,7 +98,6 @@ impl<'a> DemuxCore<'a> for GremlinVideoDemuxer<'a> {
         Ok(())
     }
 
-    #[allow(unused_variables)]
     fn get_frame(&mut self, strmgr: &mut StreamManager) -> DemuxerResult<NAPacket> {
         if self.cur_frame >= self.frames { return Err(DemuxerError::EOF); }
         match self.state {
@@ -120,11 +116,6 @@ impl<'a> NAOptionHandler for GremlinVideoDemuxer<'a> {
     fn set_options(&mut self, _options: &[NAOption]) { }
     fn query_option_value(&self, _name: &str) -> Option<NAValue> { None }
 }
-/*impl<'a> Drop for GremlinVideoDemuxer<'a> {
-    #[allow(unused_variables)]
-    fn drop(&mut self) {
-    }
-}*/
 impl<'a> GremlinVideoDemuxer<'a> {
     fn new(io: &'a mut ByteReader<'a>) -> Self {
         GremlinVideoDemuxer {
@@ -133,7 +124,6 @@ impl<'a> GremlinVideoDemuxer<'a> {
             asize: 0,
             apacked: false,
             state: GDVState::NewFrame,
-pktdta: Vec::new(),
             src: io,
             a_id: None,
             v_id: None,
@@ -142,14 +132,13 @@ pktdta: Vec::new(),
 
     fn read_achunk(&mut self, strmgr: &mut StreamManager) -> DemuxerResult<NAPacket> {
         self.state = GDVState::AudioRead;
-        let str = strmgr.get_stream(self.a_id.unwrap()).unwrap();
-        let (tb_num, tb_den) = str.get_timebase();
-        let ts = NATimeInfo::new(Some(u64::from(self.cur_frame)), None, None, tb_num, tb_den);
-        self.src.read_packet(str, ts, true, self.asize)
+        let stream = strmgr.get_stream(self.a_id.unwrap()).unwrap();
+        let ts = stream.make_ts(Some(u64::from(self.cur_frame)), None, None);
+        self.src.read_packet(stream, ts, true, self.asize)
     }
 
     fn read_vchunk(&mut self, strmgr: &mut StreamManager) -> DemuxerResult<NAPacket> {
-        let str = strmgr.get_stream(self.v_id.unwrap()).unwrap();
+        let stream = strmgr.get_stream(self.v_id.unwrap()).unwrap();
         let src = &mut self.src;
         let magic = src.read_u16be()?;
         if magic != 0x0513 { return Err(DemuxerError::InvalidData); }
@@ -158,9 +147,8 @@ pktdta: Vec::new(),
         let flags = (tmp & 0xFF) as usize;
         self.state = GDVState::NewFrame;
         self.cur_frame += 1;
-        let (tb_num, tb_den) = str.get_timebase();
-        let ts = NATimeInfo::new(Some(u64::from(self.cur_frame - 1)), None, None, tb_num, tb_den);
-        src.read_packet(str, ts, (flags & 64) != 0, size)
+        let ts = stream.make_ts(Some(u64::from(self.cur_frame - 1)), None, None);
+        src.read_packet(stream, ts, (flags & 64) != 0, size)
     }
 }
 
@@ -180,6 +168,7 @@ mod test {
 
     #[test]
     fn test_gdv_demux() {
+        // sample from Normality game
         let mut file = File::open("assets/Game/intro1.gdv").unwrap();
         let mut fr = FileReader::new_read(&mut file);
         let mut br = ByteReader::new(&mut fr);