]> git.nihav.org Git - nihav.git/commitdiff
armovie: always treat Escape audio as ADPCM with Escape 122 video codec
authorKostya Shishkov <kostya.shishkov@gmail.com>
Mon, 7 Apr 2025 16:35:17 +0000 (18:35 +0200)
committerKostya Shishkov <kostya.shishkov@gmail.com>
Mon, 7 Apr 2025 16:41:04 +0000 (18:41 +0200)
With the latter versions 8-bit audio is PCM but here it is always ADPCM.

nihav-acorn/src/demuxers/armovie.rs

index 1c2174893fe9e7f64ee1e741dcc127f4ed83a2c7..7c64b1f710f1250f027cab2082bb5fbe5b1913e4 100644 (file)
@@ -311,7 +311,7 @@ impl<'a> RawDemuxCore<'a> for ARMovieDemuxer<'a> {
                 let bits = parse_uint(fmt)?;
                 let codec_name = match codec_id {
                         1 => "arm_rawaudio",
-                        101 if bits == 8 => "arm_rawaudio",
+                        101 if bits == 8 && video_codec != 122 => "arm_rawaudio",
                         101 => "escape-adpcm",
                         _ => "unknown"
                     };