From 3abd10889fec30402e527eadef6d60dbc03031e3 Mon Sep 17 00:00:00 2001 From: landrey Date: Tue, 10 Aug 2021 12:32:54 +0000 Subject: [PATCH] Fix define if chain in audio decoder unittest Follow up https://webrtc-review.googlesource.com/c/src/+/228247. Turned out "#elif defined(WEBRTC_MAC) && defined(WEBRTC_ARCH_ARM64) // M1 Mac" branch was unreachable Bug: webrtc:13053 Change-Id: Icf1aa5147347a1fad0dce8cca893bb3c598f658e Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/228381 Reviewed-by: Henrik Lundin Commit-Queue: Andrey Logvin Cr-Commit-Position: refs/heads/master@{#34699} --- modules/audio_coding/neteq/audio_decoder_unittest.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/audio_coding/neteq/audio_decoder_unittest.cc b/modules/audio_coding/neteq/audio_decoder_unittest.cc index f01a1a6802..ac0e48efa5 100644 --- a/modules/audio_coding/neteq/audio_decoder_unittest.cc +++ b/modules/audio_coding/neteq/audio_decoder_unittest.cc @@ -589,10 +589,10 @@ TEST_F(AudioDecoderIsacFixTest, EncodeDecode) { int delay = 54; // Delay from input to output. #if defined(WEBRTC_ANDROID) && defined(WEBRTC_ARCH_ARM) static const int kEncodedBytes = 685; -#elif defined(WEBRTC_ARCH_ARM64) - static const int kEncodedBytes = 673; #elif defined(WEBRTC_MAC) && defined(WEBRTC_ARCH_ARM64) // M1 Mac static const int kEncodedBytes = 684; +#elif defined(WEBRTC_ARCH_ARM64) + static const int kEncodedBytes = 673; #elif defined(WEBRTC_WIN) && defined(_MSC_VER) && !defined(__clang__) static const int kEncodedBytes = 671; #elif defined(WEBRTC_IOS) && defined(WEBRTC_ARCH_X86_64)