X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-game%2Fsrc%2Fcodecs%2Fgremlinvideo.rs;h=9dd67cae85de21694bb497dbf784de52765cbdd0;hb=1a967e6bad5f17943b4de0607078eb940ad5adfe;hp=b899630be52c67dff1d1db2b13ec0f41a8b6e01b;hpb=3167c45c8087a692192021e08a8063dff680001c;p=nihav.git diff --git a/nihav-game/src/codecs/gremlinvideo.rs b/nihav-game/src/codecs/gremlinvideo.rs index b899630..9dd67ca 100644 --- a/nihav-game/src/codecs/gremlinvideo.rs +++ b/nihav-game/src/codecs/gremlinvideo.rs @@ -141,7 +141,7 @@ impl GremlinVideoDecoder { let mut buf = bufo.unwrap(); let paloff = buf.get_offset(1); let stride = buf.get_stride(0); - let mut data = buf.get_data_mut(); + let data = buf.get_data_mut().unwrap(); let dst = data.as_mut_slice(); let mut sidx = PREAMBLE_SIZE; let mut didx = 0; @@ -528,10 +528,10 @@ impl NADecoder for GremlinAudioDecoder { if let NACodecTypeInfo::Audio(_) = info.get_properties() { let pktbuf = pkt.get_buffer(); let samples = pktbuf.len() / self.chmap.num_channels(); - let mut abuf = alloc_audio_buffer(self.ainfo, samples, self.chmap.clone())?; + let abuf = alloc_audio_buffer(self.ainfo, samples, self.chmap.clone())?; let mut adata = abuf.get_abuf_i16().unwrap(); let off1 = adata.get_offset(1); - let mut buf = adata.get_data_mut(); + let buf = adata.get_data_mut().unwrap(); if self.chmap.num_channels() == 2 { for (i, e) in pktbuf.chunks(2).enumerate() { self.state0 = self.state0.wrapping_add(self.delta_tab[e[0] as usize]); @@ -573,6 +573,6 @@ mod test { let mut dec_reg = RegisteredDecoders::new(); game_register_all_codecs(&mut dec_reg); - test_file_decoding("gdv", "assets/intro1.gdv", Some(10), true, false, None, &dmx_reg, &dec_reg); + test_file_decoding("gdv", "assets/Game/intro1.gdv", Some(10), true, false, None, &dmx_reg, &dec_reg); } }