From 5272eb8d830a7c2026d08f13e368fa25d8ca60e1 Mon Sep 17 00:00:00 2001 From: "turaj@webrtc.org" Date: Sat, 23 Nov 2013 00:11:32 +0000 Subject: [PATCH] Don't register iSAC-swb and iSAC-fb in NetEqDecodingTest. Android bots break due to r5164. This CL patches that issue. BUG= TEST=modules_unittests on local device. R=andrew@webrtc.org Review URL: https://webrtc-codereview.appspot.com/4309004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5166 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/modules/audio_coding/neteq4/neteq_unittest.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/webrtc/modules/audio_coding/neteq4/neteq_unittest.cc b/webrtc/modules/audio_coding/neteq4/neteq_unittest.cc index 23a070de13..965f75f2cd 100644 --- a/webrtc/modules/audio_coding/neteq4/neteq_unittest.cc +++ b/webrtc/modules/audio_coding/neteq4/neteq_unittest.cc @@ -265,10 +265,12 @@ void NetEqDecodingTest::LoadDecoders() { #endif // WEBRTC_ANDROID // Load iSAC. ASSERT_EQ(0, neteq_->RegisterPayloadType(kDecoderISAC, 103)); +#ifndef WEBRTC_ANDROID // Load iSAC SWB. ASSERT_EQ(0, neteq_->RegisterPayloadType(kDecoderISACswb, 104)); // Load iSAC FB. ASSERT_EQ(0, neteq_->RegisterPayloadType(kDecoderISACfb, 105)); +#endif // WEBRTC_ANDROID // Load PCM16B nb. ASSERT_EQ(0, neteq_->RegisterPayloadType(kDecoderPCM16B, 93)); // Load PCM16B wb.