X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-realmedia%2Fsrc%2Fcodecs%2Fcook.rs;h=fe5ae71995dd936b2e05c47d73d2bb05c6202653;hb=91f5ad848e8c89177c41e9ac8dc3d3125a1acdd7;hp=a1a32e48788592214f4c39475c095c1868e37a51;hpb=f9be4e750dccff762b9a3d894faec50ffdb59233;p=nihav.git diff --git a/nihav-realmedia/src/codecs/cook.rs b/nihav-realmedia/src/codecs/cook.rs index a1a32e4..fe5ae71 100644 --- a/nihav-realmedia/src/codecs/cook.rs +++ b/nihav-realmedia/src/codecs/cook.rs @@ -302,7 +302,7 @@ impl CookChannelPair { for (i, b) in src.iter().enumerate() { buf[i] = b ^ COOK_XOR_KEY[i & 3]; } - let mut br = BitReader::new(buf, src.len(), BitReaderMode::BE); + let mut br = BitReader::new(&buf[..src.len()], BitReaderMode::BE); let num_gains = br.read_code(UintCodeType::UnaryOnes)? as usize; validate!(num_gains <= 8); @@ -676,7 +676,7 @@ impl NADecoder for CookDecoder { } } -pub fn get_decoder() -> Box { +pub fn get_decoder() -> Box { Box::new(CookDecoder::new()) } @@ -696,7 +696,7 @@ mod test { // let file = "assets/RV/rv30_weighted_mc.rm"; let file = "assets/RV/multichannel.rma"; - test_decode_audio("realmedia", file, Some(2000), "cook", &dmx_reg, &dec_reg); + test_decode_audio("realmedia", file, Some(2000), None/*Some("cook")*/, &dmx_reg, &dec_reg); } }