From 9a972e7f51c56ae467c2de845ced8dbbbce4b1e6 Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Thu, 24 Sep 2026 16:56:36 -0400 Subject: [PATCH] opus: Correct enablement of new ARMv5e optimizations * Only use new ARMv5e optimizations on classic (non-M) profile * fix inconsistent ARM_ARCH >= 5 vs == 5 Fixes red in 0c4345475a and ae223933bf Change-Id: Ieb688679d2d698a19870b1a63b4151a8593e04e0 --- lib/rbcodec/codecs/libopus/SOURCES | 2 +- lib/rbcodec/codecs/libopus/config.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/rbcodec/codecs/libopus/SOURCES b/lib/rbcodec/codecs/libopus/SOURCES index 279b0f6a6a..16f1caed82 100644 --- a/lib/rbcodec/codecs/libopus/SOURCES +++ b/lib/rbcodec/codecs/libopus/SOURCES @@ -14,7 +14,7 @@ celt/arm/mdct_armv4_asm.S celt/arm/comb_filter_armv4_asm.S celt/arm/denorm_armv4_asm.S celt/arm/deemph_armv4_asm.S -#elif defined(CPU_ARM) && (ARM_ARCH == 5) +#elif defined(CPU_ARM) && (ARM_ARCH >= 5) && (ARCH_PROFILE == ARM_PROFILE_CLASSIC) celt/arm/kiss_fft_armv5e_asm.S celt/arm/mdct_armv5e_asm.S celt/arm/comb_filter_armv5e_asm.S diff --git a/lib/rbcodec/codecs/libopus/config.h b/lib/rbcodec/codecs/libopus/config.h index d34ae17ba1..035832125c 100644 --- a/lib/rbcodec/codecs/libopus/config.h +++ b/lib/rbcodec/codecs/libopus/config.h @@ -49,7 +49,7 @@ #define OPUS_ARM_ASM #if ARM_ARCH == 4 #define OPUS_ARM_INLINE_ASM -#elif ARM_ARCH > 4 +#elif (ARM_ARCH > 4) && (ARCH_PROFILE == ARM_PROFILE_CLASSIC) #define OPUS_ARM_INLINE_EDSP #endif