X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-realmedia%2Fsrc%2Fcodecs%2Fcook.rs;h=24df7c7292cb2a9f40cb194bb6acff6656fb012e;hb=886cde4847280b96e10d240c2f2d76abec121dc8;hp=2ac7a66c3b98d361cfeac5915afdc0c7f3ec835e;hpb=fa57381ec2a3b8c441aa1388492b9ca037cfcf78;p=nihav.git diff --git a/nihav-realmedia/src/codecs/cook.rs b/nihav-realmedia/src/codecs/cook.rs index 2ac7a66..24df7c7 100644 --- a/nihav-realmedia/src/codecs/cook.rs +++ b/nihav-realmedia/src/codecs/cook.rs @@ -582,6 +582,7 @@ impl NADecoder for CookDecoder { let pair_chmap = self.pairs[i].read_hdr_v2(&mut br)?; self.pairs[i].start_ch = start_ch; validate!((chmap & pair_chmap) == 0); + chmap |= pair_chmap; start_ch += self.pairs[i].mode.get_channels(); } self.channels = start_ch; @@ -691,16 +692,17 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::realmedia_register_all_codecs; + use crate::realmedia_register_all_decoders; use crate::realmedia_register_all_demuxers; #[test] fn test_cook() { let mut dmx_reg = RegisteredDemuxers::new(); realmedia_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - realmedia_register_all_codecs(&mut dec_reg); + realmedia_register_all_decoders(&mut dec_reg); // let file = "assets/RV/rv30_weighted_mc.rm"; + // sample: https://samples.mplayerhq.hu/real/AC-cook/cook_5.1/multichannel.rma let file = "assets/RV/multichannel.rma"; test_decode_audio("realmedia", file, Some(2000), None/*Some("cook")*/, &dmx_reg, &dec_reg); }