From 65abb6b1ed5398203e1e8b087881ebd3b2a9a57f Mon Sep 17 00:00:00 2001
From: "mflodman@webrtc.org"
 <mflodman@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Wed, 4 Sep 2013 07:47:39 +0000
Subject: [PATCH] Revert 4671 "Enable SetInitialPlayoutDelay on Android."

Tests enabled in r4671 failed:
build.chromium.org/p/client.webrtc/builders/Android%20Tests/builds/31/steps/slave_steps/logs/stdio

> Enable SetInitialPlayoutDelay on Android.
>
> Background:
> In Chrome mirroring which uses 500ms buffering mode,
> audio video mismatch happens in the begining because of the lack of the api.
>
> BUG=b/10538425
> TEST=pass 'git try' except tests which is aleady broken in the bot. pass 'build/android/test_runner.py gtest -s modules_tests --verbose --release  -f *InitialPlayoutDelayTest*'
> R=henrika@webrtc.org
>
> Review URL: https://webrtc-codereview.appspot.com/2144004

TBR=dwkang@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/2160006

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4672 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 .../audio_coding/main/test/initial_delay_unittest.cc | 12 ++++++------
 webrtc/voice_engine/voe_video_sync_impl.cc           |  1 +
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/webrtc/modules/audio_coding/main/test/initial_delay_unittest.cc b/webrtc/modules/audio_coding/main/test/initial_delay_unittest.cc
index 538734cc1..3a08dea4f 100644
--- a/webrtc/modules/audio_coding/main/test/initial_delay_unittest.cc
+++ b/webrtc/modules/audio_coding/main/test/initial_delay_unittest.cc
@@ -130,38 +130,38 @@ class InitialPlayoutDelayTest : public ::testing::Test {
   Channel* channel_a2b_;
 };
 
-TEST_F( InitialPlayoutDelayTest, NbMono) {
+TEST_F( InitialPlayoutDelayTest, DISABLED_ON_ANDROID(NbMono)) {
   CodecInst codec;
   AudioCodingModule::Codec("L16", &codec, 8000, 1);
   Run(codec, 3000);
 }
 
-TEST_F( InitialPlayoutDelayTest, WbMono) {
+TEST_F( InitialPlayoutDelayTest, DISABLED_ON_ANDROID(WbMono)) {
   CodecInst codec;
   AudioCodingModule::Codec("L16", &codec, 16000, 1);
   Run(codec, 3000);
 }
 
-TEST_F( InitialPlayoutDelayTest, SwbMono) {
+TEST_F( InitialPlayoutDelayTest, DISABLED_ON_ANDROID(SwbMono)) {
   CodecInst codec;
   AudioCodingModule::Codec("L16", &codec, 32000, 1);
   Run(codec, 2000);  // NetEq buffer is not sufficiently large for 3 sec of
                      // PCM16 super-wideband.
 }
 
-TEST_F( InitialPlayoutDelayTest, NbStereo) {
+TEST_F( InitialPlayoutDelayTest, DISABLED_ON_ANDROID(NbStereo)) {
   CodecInst codec;
   AudioCodingModule::Codec("L16", &codec, 8000, 2);
   Run(codec, 3000);
 }
 
-TEST_F( InitialPlayoutDelayTest, WbStereo) {
+TEST_F( InitialPlayoutDelayTest, DISABLED_ON_ANDROID(WbStereo)) {
   CodecInst codec;
   AudioCodingModule::Codec("L16", &codec, 16000, 2);
   Run(codec, 3000);
 }
 
-TEST_F( InitialPlayoutDelayTest, SwbStereo) {
+TEST_F( InitialPlayoutDelayTest, DISABLED_ON_ANDROID(SwbStereo)) {
   CodecInst codec;
   AudioCodingModule::Codec("L16", &codec, 32000, 2);
   Run(codec, 2000);  // NetEq buffer is not sufficiently large for 3 sec of
diff --git a/webrtc/voice_engine/voe_video_sync_impl.cc b/webrtc/voice_engine/voe_video_sync_impl.cc
index 4645e2529..cd377eb82 100644
--- a/webrtc/voice_engine/voe_video_sync_impl.cc
+++ b/webrtc/voice_engine/voe_video_sync_impl.cc
@@ -145,6 +145,7 @@ int VoEVideoSyncImpl::SetInitialPlayoutDelay(int channel, int delay_ms)
     WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
                  "SetInitialPlayoutDelay(channel=%d, delay_ms=%d)",
                  channel, delay_ms);
+    ANDROID_NOT_SUPPORTED(_shared->statistics());
     IPHONE_NOT_SUPPORTED(_shared->statistics());
 
     if (!_shared->statistics().Initialized())