| OLD | NEW |
| 1 /* | 1 /* |
| 2 * libjingle | 2 * libjingle |
| 3 * Copyright 2012 Google Inc. | 3 * Copyright 2012 Google Inc. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are met: | 6 * modification, are permitted provided that the following conditions are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright notice, | 8 * 1. Redistributions of source code must retain the above copyright notice, |
| 9 * this list of conditions and the following disclaimer. | 9 * this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright notice, | 10 * 2. Redistributions in binary form must reproduce the above copyright notice, |
| (...skipping 500 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 511 signaling_message_receiver_(NULL) { | 511 signaling_message_receiver_(NULL) { |
| 512 } | 512 } |
| 513 bool Init(const MediaConstraintsInterface* constraints, | 513 bool Init(const MediaConstraintsInterface* constraints, |
| 514 const PeerConnectionFactory::Options* options) { | 514 const PeerConnectionFactory::Options* options) { |
| 515 EXPECT_TRUE(!peer_connection_); | 515 EXPECT_TRUE(!peer_connection_); |
| 516 EXPECT_TRUE(!peer_connection_factory_); | 516 EXPECT_TRUE(!peer_connection_factory_); |
| 517 allocator_factory_ = webrtc::FakePortAllocatorFactory::Create(); | 517 allocator_factory_ = webrtc::FakePortAllocatorFactory::Create(); |
| 518 if (!allocator_factory_) { | 518 if (!allocator_factory_) { |
| 519 return false; | 519 return false; |
| 520 } | 520 } |
| 521 fake_audio_capture_module_ = FakeAudioCaptureModule::Create( | 521 fake_audio_capture_module_ = FakeAudioCaptureModule::Create(); |
| 522 rtc::Thread::Current()); | |
| 523 | 522 |
| 524 if (fake_audio_capture_module_ == NULL) { | 523 if (fake_audio_capture_module_ == NULL) { |
| 525 return false; | 524 return false; |
| 526 } | 525 } |
| 527 fake_video_decoder_factory_ = new FakeWebRtcVideoDecoderFactory(); | 526 fake_video_decoder_factory_ = new FakeWebRtcVideoDecoderFactory(); |
| 528 fake_video_encoder_factory_ = new FakeWebRtcVideoEncoderFactory(); | 527 fake_video_encoder_factory_ = new FakeWebRtcVideoEncoderFactory(); |
| 529 peer_connection_factory_ = webrtc::CreatePeerConnectionFactory( | 528 peer_connection_factory_ = webrtc::CreatePeerConnectionFactory( |
| 530 rtc::Thread::Current(), rtc::Thread::Current(), | 529 rtc::Thread::Current(), rtc::Thread::Current(), |
| 531 fake_audio_capture_module_, fake_video_encoder_factory_, | 530 fake_audio_capture_module_, fake_video_encoder_factory_, |
| 532 fake_video_decoder_factory_); | 531 fake_video_decoder_factory_); |
| (...skipping 1088 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1621 // TODO(holmer): Disabled due to sometimes crashing on buildbots. | 1620 // TODO(holmer): Disabled due to sometimes crashing on buildbots. |
| 1622 // See issue webrtc/2378. | 1621 // See issue webrtc/2378. |
| 1623 TEST_F(JsepPeerConnectionP2PTestClient, | 1622 TEST_F(JsepPeerConnectionP2PTestClient, |
| 1624 DISABLED_LocalP2PTestWithVideoDecoderFactory) { | 1623 DISABLED_LocalP2PTestWithVideoDecoderFactory) { |
| 1625 ASSERT_TRUE(CreateTestClients()); | 1624 ASSERT_TRUE(CreateTestClients()); |
| 1626 EnableVideoDecoderFactory(); | 1625 EnableVideoDecoderFactory(); |
| 1627 LocalP2PTest(); | 1626 LocalP2PTest(); |
| 1628 } | 1627 } |
| 1629 | 1628 |
| 1630 #endif // if !defined(THREAD_SANITIZER) | 1629 #endif // if !defined(THREAD_SANITIZER) |
| OLD | NEW |