Reenables several NetEq unittests on android.

webrtc/modules/audio_coding/neteq/neteq_stereo_unittest.cc

Index: webrtc/modules/audio_coding/neteq/neteq_stereo_unittest.cc
diff --git a/webrtc/modules/audio_coding/neteq/neteq_stereo_unittest.cc b/webrtc/modules/audio_coding/neteq/neteq_stereo_unittest.cc
index e02e92dd8fd4ba99b83d5419007c5fab1cf0c27b..4b4e99c0f933d8d02d47f4e3988e3b9b7b64e217 100644
--- a/webrtc/modules/audio_coding/neteq/neteq_stereo_unittest.cc
+++ b/webrtc/modules/audio_coding/neteq/neteq_stereo_unittest.cc
@@ -162,7 +162,7 @@ class NetEqStereoTest : public ::testing::TestWithParam<TestParameters> {
     return next_send_time;
   }
 
-  void VerifyOutput(size_t num_samples) {
+  virtual void VerifyOutput(size_t num_samples) {
     for (size_t i = 0; i < num_samples; ++i) {
       for (int j = 0; j < num_channels_; ++j) {
         ASSERT_EQ(output_[i], output_multi_channel_[i * num_channels_ + j]) <<
@@ -276,7 +276,7 @@ class NetEqStereoTestNoJitter : public NetEqStereoTest {
   }
 };
 
-TEST_P(NetEqStereoTestNoJitter, DISABLED_ON_ANDROID(RunTest)) {
+TEST_P(NetEqStereoTestNoJitter, RunTest) {
   RunTest(8);
 }
 
@@ -301,7 +301,7 @@ class NetEqStereoTestPositiveDrift : public NetEqStereoTest {
   double drift_factor;
 };
 
-TEST_P(NetEqStereoTestPositiveDrift, DISABLED_ON_ANDROID(RunTest)) {
+TEST_P(NetEqStereoTestPositiveDrift, RunTest) {
   RunTest(100);
 }
 
@@ -314,7 +314,7 @@ class NetEqStereoTestNegativeDrift : public NetEqStereoTestPositiveDrift {
   }
 };
 
-TEST_P(NetEqStereoTestNegativeDrift, DISABLED_ON_ANDROID(RunTest)) {
+TEST_P(NetEqStereoTestNegativeDrift, RunTest) {
   RunTest(100);
 }
 
@@ -342,7 +342,7 @@ class NetEqStereoTestDelays : public NetEqStereoTest {
   int frame_index_;
 };
 
-TEST_P(NetEqStereoTestDelays, DISABLED_ON_ANDROID(RunTest)) {
+TEST_P(NetEqStereoTestDelays, RunTest) {
   RunTest(1000);
 }
 
@@ -358,10 +358,24 @@ class NetEqStereoTestLosses : public NetEqStereoTest {
     return (++frame_index_) % kLossInterval == 0;
   }
 
+  // TODO(hlundin): NetEq is not giving bitexact results for these cases.
+  virtual void VerifyOutput(size_t num_samples) {
+    for (size_t i = 0; i < num_samples; ++i) {
+      auto first_channel_sample = output_multi_channel_[i * num_channels_];
+      for (int j = 0; j < num_channels_; ++j) {
+        EXPECT_NEAR(output_[i], output_multi_channel_[i * num_channels_ + j],
+                    200)

[minyue-webrtc, 2015/12/17 14:32:58]

should it be as large as 200?

And if only Android needs this margin, I prefer

#ifdef WEBRTC_ANDROID
const int MARGIN = 200;
#else
const int MARGIN = 0;
#endif

...
EXPECT_NEAR(output_[i], output_multi_channel_[i * num_channels_ + j], MARGIN);

[ivoc, 2015/12/17 15:06:27]

This test was previously accidentally disabled on all platforms for the past 2+
years, so this is needed on all platforms for now. There is a bug to track this
issue, see: https://bugs.chromium.org/p/webrtc/issues/detail?id=5349 . I will
change the constant to a const int like you suggested.

+            << "Diff in sample " << i << ", channel " << j << ".";
+        EXPECT_EQ(first_channel_sample,
+                  output_multi_channel_[i * num_channels_ + j]);
+      }
+    }
+  }
+
   int frame_index_;
 };
 
-TEST_P(NetEqStereoTestLosses, DISABLED_ON_ANDROID(RunTest)) {
+TEST_P(NetEqStereoTestLosses, RunTest) {
   RunTest(100);
 }