projects
/
nihav.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ms-adpcm: fix decoding
[nihav.git]
/
nihav-ms
/
src
/
codecs
/
msadpcm.rs
diff --git
a/nihav-ms/src/codecs/msadpcm.rs
b/nihav-ms/src/codecs/msadpcm.rs
index 23769de9e30d6126a37c80b207f93433ebdeab7a..f95a691f0d8d25a1f401e878860420b264a5c5e8 100644
(file)
--- a/
nihav-ms/src/codecs/msadpcm.rs
+++ b/
nihav-ms/src/codecs/msadpcm.rs
@@
-124,11
+124,11
@@
impl NADecoder for MSADPCMDecoder {
}
for ch in 0..channels {
let samp = br.read_u16le()? as i16;
}
for ch in 0..channels {
let samp = br.read_u16le()? as i16;
- pred[ch].sample
2
= i32::from(samp);
+ pred[ch].sample
1
= i32::from(samp);
}
for ch in 0..channels {
let samp = br.read_u16le()? as i16;
}
for ch in 0..channels {
let samp = br.read_u16le()? as i16;
- pred[ch].sample
1
= i32::from(samp);
+ pred[ch].sample
2
= i32::from(samp);
}
for ch in 0..channels {
dst[off[ch]] = pred[ch].sample2 as i16;
}
for ch in 0..channels {
dst[off[ch]] = pred[ch].sample2 as i16;
@@
-433,7
+433,7
@@
mod test {
ms_register_all_decoders(&mut dec_reg);
test_decoding("avi", "ms-adpcm", "assets/MS/dance.avi", None, &dmx_reg, &dec_reg,
ms_register_all_decoders(&mut dec_reg);
test_decoding("avi", "ms-adpcm", "assets/MS/dance.avi", None, &dmx_reg, &dec_reg,
- ExpectedTestResult::MD5([0x
f5e3fc84, 0xbcabc11c, 0x33c6874e, 0xe05ecd14
]));
+ ExpectedTestResult::MD5([0x
b1d6f12c, 0x86d2821b, 0x395f6827, 0xb6be93bf
]));
}
#[cfg(feature="encoder_ms_adpcm")]
#[test]
}
#[cfg(feature="encoder_ms_adpcm")]
#[test]