OLD | NEW |
1 /* | 1 /* |
2 * libjingle | 2 * libjingle |
3 * Copyright 2004--2011 Google Inc. | 3 * Copyright 2004--2011 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 22 matching lines...) Expand all Loading... |
33 #include "talk/app/webrtc/localaudiosource.h" | 33 #include "talk/app/webrtc/localaudiosource.h" |
34 #include "talk/app/webrtc/mediastream.h" | 34 #include "talk/app/webrtc/mediastream.h" |
35 #include "talk/app/webrtc/mediastreamproxy.h" | 35 #include "talk/app/webrtc/mediastreamproxy.h" |
36 #include "talk/app/webrtc/mediastreamtrackproxy.h" | 36 #include "talk/app/webrtc/mediastreamtrackproxy.h" |
37 #include "talk/app/webrtc/peerconnection.h" | 37 #include "talk/app/webrtc/peerconnection.h" |
38 #include "talk/app/webrtc/peerconnectionfactoryproxy.h" | 38 #include "talk/app/webrtc/peerconnectionfactoryproxy.h" |
39 #include "talk/app/webrtc/peerconnectionproxy.h" | 39 #include "talk/app/webrtc/peerconnectionproxy.h" |
40 #include "talk/app/webrtc/videosource.h" | 40 #include "talk/app/webrtc/videosource.h" |
41 #include "talk/app/webrtc/videosourceproxy.h" | 41 #include "talk/app/webrtc/videosourceproxy.h" |
42 #include "talk/app/webrtc/videotrack.h" | 42 #include "talk/app/webrtc/videotrack.h" |
43 #include "talk/media/webrtc/webrtcmediaengine.h" | |
44 #include "talk/media/webrtc/webrtcvideodecoderfactory.h" | |
45 #include "talk/media/webrtc/webrtcvideoencoderfactory.h" | |
46 #include "webrtc/base/bind.h" | 43 #include "webrtc/base/bind.h" |
| 44 #include "webrtc/media/webrtc/webrtcmediaengine.h" |
| 45 #include "webrtc/media/webrtc/webrtcvideodecoderfactory.h" |
| 46 #include "webrtc/media/webrtc/webrtcvideoencoderfactory.h" |
47 #include "webrtc/modules/audio_device/include/audio_device.h" | 47 #include "webrtc/modules/audio_device/include/audio_device.h" |
48 #include "webrtc/p2p/base/basicpacketsocketfactory.h" | 48 #include "webrtc/p2p/base/basicpacketsocketfactory.h" |
49 #include "webrtc/p2p/client/basicportallocator.h" | 49 #include "webrtc/p2p/client/basicportallocator.h" |
50 | 50 |
51 namespace webrtc { | 51 namespace webrtc { |
52 | 52 |
53 namespace { | 53 namespace { |
54 | 54 |
55 // Passes down the calls to |store_|. See usage in CreatePeerConnection. | 55 // Passes down the calls to |store_|. See usage in CreatePeerConnection. |
56 class DtlsIdentityStoreWrapper : public DtlsIdentityStoreInterface { | 56 class DtlsIdentityStoreWrapper : public DtlsIdentityStoreInterface { |
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
322 } | 322 } |
323 | 323 |
324 cricket::MediaEngineInterface* PeerConnectionFactory::CreateMediaEngine_w() { | 324 cricket::MediaEngineInterface* PeerConnectionFactory::CreateMediaEngine_w() { |
325 ASSERT(worker_thread_ == rtc::Thread::Current()); | 325 ASSERT(worker_thread_ == rtc::Thread::Current()); |
326 return cricket::WebRtcMediaEngineFactory::Create( | 326 return cricket::WebRtcMediaEngineFactory::Create( |
327 default_adm_.get(), video_encoder_factory_.get(), | 327 default_adm_.get(), video_encoder_factory_.get(), |
328 video_decoder_factory_.get()); | 328 video_decoder_factory_.get()); |
329 } | 329 } |
330 | 330 |
331 } // namespace webrtc | 331 } // namespace webrtc |
OLD | NEW |