diff options
author | mflodman@webrtc.org <mflodman@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-09-04 07:47:39 +0000 |
---|---|---|
committer | mflodman@webrtc.org <mflodman@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-09-04 07:47:39 +0000 |
commit | 0f6269017807c4c08da503a7b56e1eef622cfa28 (patch) | |
tree | 4def7f860f87fc18c099495221fbb36aea5862a8 | |
parent | 0fe89443321b5b809a81d287efa7d6dde58202df (diff) | |
download | webrtc-0f6269017807c4c08da503a7b56e1eef622cfa28.tar.gz |
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/webrtc@4672 4adac7df-926f-26a2-2b94-8c16560cd09d
-rw-r--r-- | modules/audio_coding/main/test/initial_delay_unittest.cc | 12 | ||||
-rw-r--r-- | voice_engine/voe_video_sync_impl.cc | 1 |
2 files changed, 7 insertions, 6 deletions
diff --git a/modules/audio_coding/main/test/initial_delay_unittest.cc b/modules/audio_coding/main/test/initial_delay_unittest.cc index 538734cc..3a08dea4 100644 --- a/modules/audio_coding/main/test/initial_delay_unittest.cc +++ b/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/voice_engine/voe_video_sync_impl.cc b/voice_engine/voe_video_sync_impl.cc index 4645e252..cd377eb8 100644 --- a/voice_engine/voe_video_sync_impl.cc +++ b/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()) |