From: Kostya Shishkov <kostya.shishkov@gmail.com>
Date: Mon, 7 Apr 2025 16:35:17 +0000 (+0200)
Subject: armovie: always treat Escape audio as ADPCM with Escape 122 video codec
X-Git-Url: https://git.nihav.org/?a=commitdiff_plain;h=e9bec2f5bd469f67075a38a24ff92fb2f4f6d665;p=nihav.git

armovie: always treat Escape audio as ADPCM with Escape 122 video codec

With the latter versions 8-bit audio is PCM but here it is always ADPCM.
---

diff --git a/nihav-acorn/src/demuxers/armovie.rs b/nihav-acorn/src/demuxers/armovie.rs
index 1c21748..7c64b1f 100644
--- a/nihav-acorn/src/demuxers/armovie.rs
+++ b/nihav-acorn/src/demuxers/armovie.rs
@@ -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"
                     };