generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert 4671 "Enable SetInitialPlayoutDelay on Android."

Browse Source 
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
This commit is contained in:
mflodman@webrtc.org 2013-09-04 07:47:39 +00:00
parent 310ac91d2a
commit 65abb6b1ed
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
webrtc/modules/audio_coding/main/test/initial_delay_unittest.cc
View File

@ -130,38 +130,38 @@ class InitialPlayoutDelayTest : public ::testing::Test {
Channel* channel_a2b_; Channel* channel_a2b_;
}; };
TEST_F( InitialPlayoutDelayTest, NbMono) { TEST_F( InitialPlayoutDelayTest, DISABLED_ON_ANDROID(NbMono)) {
CodecInst codec; CodecInst codec;
AudioCodingModule::Codec("L16", &codec, 8000, 1); AudioCodingModule::Codec("L16", &codec, 8000, 1);
Run(codec, 3000); Run(codec, 3000);
} }
TEST_F( InitialPlayoutDelayTest, WbMono) { TEST_F( InitialPlayoutDelayTest, DISABLED_ON_ANDROID(WbMono)) {
CodecInst codec; CodecInst codec;
AudioCodingModule::Codec("L16", &codec, 16000, 1); AudioCodingModule::Codec("L16", &codec, 16000, 1);
Run(codec, 3000); Run(codec, 3000);
} }
TEST_F( InitialPlayoutDelayTest, SwbMono) { TEST_F( InitialPlayoutDelayTest, DISABLED_ON_ANDROID(SwbMono)) {
CodecInst codec; CodecInst codec;
AudioCodingModule::Codec("L16", &codec, 32000, 1); AudioCodingModule::Codec("L16", &codec, 32000, 1);
Run(codec, 2000); // NetEq buffer is not sufficiently large for 3 sec of Run(codec, 2000); // NetEq buffer is not sufficiently large for 3 sec of
// PCM16 super-wideband. // PCM16 super-wideband.
} }
TEST_F( InitialPlayoutDelayTest, NbStereo) { TEST_F( InitialPlayoutDelayTest, DISABLED_ON_ANDROID(NbStereo)) {
CodecInst codec; CodecInst codec;
AudioCodingModule::Codec("L16", &codec, 8000, 2); AudioCodingModule::Codec("L16", &codec, 8000, 2);
Run(codec, 3000); Run(codec, 3000);
} }
TEST_F( InitialPlayoutDelayTest, WbStereo) { TEST_F( InitialPlayoutDelayTest, DISABLED_ON_ANDROID(WbStereo)) {
CodecInst codec; CodecInst codec;
AudioCodingModule::Codec("L16", &codec, 16000, 2); AudioCodingModule::Codec("L16", &codec, 16000, 2);
Run(codec, 3000); Run(codec, 3000);
} }
TEST_F( InitialPlayoutDelayTest, SwbStereo) { TEST_F( InitialPlayoutDelayTest, DISABLED_ON_ANDROID(SwbStereo)) {
CodecInst codec; CodecInst codec;
AudioCodingModule::Codec("L16", &codec, 32000, 2); AudioCodingModule::Codec("L16", &codec, 32000, 2);
Run(codec, 2000); // NetEq buffer is not sufficiently large for 3 sec of Run(codec, 2000); // NetEq buffer is not sufficiently large for 3 sec of

1
webrtc/voice_engine/voe_video_sync_impl.cc
View File

@ -145,6 +145,7 @@ int VoEVideoSyncImpl::SetInitialPlayoutDelay(int channel, int delay_ms)
WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1), WEBRTC_TRACE(kTraceApiCall, kTraceVoice, VoEId(_shared->instance_id(), -1),
"SetInitialPlayoutDelay(channel=%d, delay_ms=%d)", "SetInitialPlayoutDelay(channel=%d, delay_ms=%d)",
channel, delay_ms); channel, delay_ms);
ANDROID_NOT_SUPPORTED(_shared->statistics());
IPHONE_NOT_SUPPORTED(_shared->statistics()); IPHONE_NOT_SUPPORTED(_shared->statistics());
if (!_shared->statistics().Initialized()) if (!_shared->statistics().Initialized())