From bf93fb31761a1e9c8b3e8c3fe01ccf6ec906f315 Mon Sep 17 00:00:00 2001 From: "henrik.lundin@webrtc.org" Date: Wed, 14 May 2014 10:42:03 +0000 Subject: [PATCH] Re-enable NetEQ DecoderDatabase test for Android The test was failing because iLBC is not enabled on Android. Now, the test is using PCM16B instead. BUG=3343 R=tina.legrand@webrtc.org Review URL: https://webrtc-codereview.appspot.com/16519004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6143 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../modules/audio_coding/neteq4/decoder_database_unittest.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webrtc/modules/audio_coding/neteq4/decoder_database_unittest.cc b/webrtc/modules/audio_coding/neteq4/decoder_database_unittest.cc index 76f5a099ec..66eddb52ab 100644 --- a/webrtc/modules/audio_coding/neteq4/decoder_database_unittest.cc +++ b/webrtc/modules/audio_coding/neteq4/decoder_database_unittest.cc @@ -68,11 +68,11 @@ TEST(DecoderDatabase, GetRtpPayloadType) { db.GetRtpPayloadType(kDecoderISAC)); // iSAC is not registered. } -TEST(DecoderDatabase, DISABLED_ON_ANDROID(GetDecoder)) { +TEST(DecoderDatabase, GetDecoder) { DecoderDatabase db; const uint8_t kPayloadType = 0; EXPECT_EQ(DecoderDatabase::kOK, - db.RegisterPayload(kPayloadType, kDecoderILBC)); + db.RegisterPayload(kPayloadType, kDecoderPCM16B)); AudioDecoder* dec = db.GetDecoder(kPayloadType); ASSERT_TRUE(dec != NULL); }