X-Git-Url: https://git.nihav.org/?p=nihav.git;a=blobdiff_plain;f=nihav-rad%2Fsrc%2Fdemuxers%2Fbink.rs;h=a5d8169240f9159f4bf8f0a244ca711eb50fe989;hp=35bdcbf6126234a4030f432412403901e7c9f4e6;hb=bf109afe32ce8eb2722ebd830667f9438ba21b54;hpb=4efceb69a4604c623de2ca48c841d06615558365 diff --git a/nihav-rad/src/demuxers/bink.rs b/nihav-rad/src/demuxers/bink.rs index 35bdcbf..a5d8169 100644 --- a/nihav-rad/src/demuxers/bink.rs +++ b/nihav-rad/src/demuxers/bink.rs @@ -9,7 +9,7 @@ const BINK_AUD_FLAG_DCT: u8 = 0x10; const BINK_AUD_FLAG_STEREO: u8 = 0x20; impl AudioTrack { - fn new(strmgr: &mut StreamManager, srate: u32, flags: u8, str_id: usize, magic: &[u8; 4]) -> DemuxerResult { + fn new(strmgr: &mut StreamManager, srate: u32, flags: u8, str_id: usize, magic: [u8; 4]) -> DemuxerResult { let channels = if (flags & BINK_AUD_FLAG_STEREO) != 0 { 2 } else { 1 }; let codecname = if (flags & BINK_AUD_FLAG_DCT) != 0 { "bink-audio-dct" @@ -18,7 +18,7 @@ impl AudioTrack { }; let ahdr = NAAudioInfo::new(srate, channels, SND_F32P_FORMAT, 1); let mut edata: Vec = Vec::with_capacity(4); - edata.extend_from_slice(magic); + edata.extend_from_slice(&magic); let ainfo = NACodecInfo::new(codecname, NACodecTypeInfo::Audio(ahdr), Some(edata)); let res = strmgr.add_stream(NAStream::new(StreamType::Audio, (str_id + 1) as u32, ainfo, 1, srate)); validate!(res.is_some()); @@ -93,7 +93,7 @@ impl<'a> DemuxCore<'a> for BinkDemuxer<'a> { let srate = src.read_u24le()?; let flags = src.read_byte()?; validate!(srate > 0); - self.ainfo.push(AudioTrack::new(strmgr, srate, flags, i, &magic)?); + self.ainfo.push(AudioTrack::new(strmgr, srate, flags, i, magic)?); } for _ in 0..num_audio { let _trk_id = src.read_u32le()?;