Index: webrtc/call/call_perf_tests.cc |
diff --git a/webrtc/call/call_perf_tests.cc b/webrtc/call/call_perf_tests.cc |
index f4422f4433ea48326ebb5ab4d93e22ccdd99189f..811aeca69bb780f259df8b078e6f28676a5bef3a 100644 |
--- a/webrtc/call/call_perf_tests.cc |
+++ b/webrtc/call/call_perf_tests.cc |
@@ -49,6 +49,9 @@ namespace webrtc { |
class CallPerfTest : public test::CallTest { |
protected: |
+ static const bool kWithFEC = true; |
+ static const bool kCreateAudioFirst = true; |
+ static const bool kCreateVideoFirst = !kCreateAudioFirst; |
void TestAudioVideoSync(bool fec, |
pbos-webrtc
2016/02/15 09:52:28
Make this enum { kWithFec, kWithoutFec } FecMode;
danilchap
2016/02/15 10:03:59
Done.
|
bool create_audio_first, |
pbos-webrtc
2016/02/15 09:52:28
enum StreamCreationOrder {kCreateAudioFirst, kCrea
danilchap
2016/02/15 10:03:59
Done.
|
float video_ntp_speed, |
@@ -377,48 +380,22 @@ void CallPerfTest::TestAudioVideoSync(bool fec, |
VoiceEngine::Delete(voice_engine); |
} |
-TEST_F(CallPerfTest, PlaysOutAudioAndVideoInSyncWithAudioCreatedFirst) { |
- TestAudioVideoSync(false, true, DriftingClock::kNoDrift, |
- DriftingClock::kNoDrift, DriftingClock::kNoDrift); |
-} |
- |
-TEST_F(CallPerfTest, PlaysOutAudioAndVideoInSyncWithVideoCreatedFirst) { |
- TestAudioVideoSync(false, false, DriftingClock::kNoDrift, |
- DriftingClock::kNoDrift, DriftingClock::kNoDrift); |
-} |
- |
-TEST_F(CallPerfTest, PlaysOutAudioAndVideoInSyncWithFec) { |
- TestAudioVideoSync(true, false, DriftingClock::kNoDrift, |
- DriftingClock::kNoDrift, DriftingClock::kNoDrift); |
-} |
- |
// TODO(danilchap): Reenable after adding support for frame capture clock |
// that is not in sync with local TickTime clock. |
TEST_F(CallPerfTest, DISABLED_PlaysOutAudioAndVideoInSyncWithVideoNtpDrift) { |
- TestAudioVideoSync(false, true, DriftingClock::PercentsFaster(10.0f), |
+ TestAudioVideoSync(!kWithFEC, kCreateAudioFirst, |
+ DriftingClock::PercentsFaster(10.0f), |
DriftingClock::kNoDrift, DriftingClock::kNoDrift); |
} |
-TEST_F(CallPerfTest, PlaysOutAudioAndVideoInSyncWithAudioRtpDrift) { |
- TestAudioVideoSync(false, true, DriftingClock::kNoDrift, |
- DriftingClock::kNoDrift, |
- DriftingClock::PercentsFaster(30.0f)); |
-} |
- |
-TEST_F(CallPerfTest, PlaysOutAudioAndVideoInSyncWithVideoRtpDrift) { |
- TestAudioVideoSync(false, true, DriftingClock::kNoDrift, |
- DriftingClock::PercentsFaster(30.0f), |
- DriftingClock::kNoDrift); |
-} |
- |
TEST_F(CallPerfTest, PlaysOutAudioAndVideoInSyncWithAudioFasterThanVideoDrift) { |
- TestAudioVideoSync(false, true, DriftingClock::kNoDrift, |
+ TestAudioVideoSync(!kWithFEC, kCreateAudioFirst, DriftingClock::kNoDrift, |
DriftingClock::PercentsSlower(30.0f), |
DriftingClock::PercentsFaster(30.0f)); |
} |
TEST_F(CallPerfTest, PlaysOutAudioAndVideoInSyncWithVideoFasterThanAudioDrift) { |
- TestAudioVideoSync(false, true, DriftingClock::kNoDrift, |
+ TestAudioVideoSync(kWithFEC, kCreateVideoFirst, DriftingClock::kNoDrift, |
DriftingClock::PercentsFaster(30.0f), |
DriftingClock::PercentsSlower(30.0f)); |
} |