OLD | NEW |
1 /* | 1 /* |
2 * libjingle | 2 * libjingle |
3 * Copyright 2014 Google Inc. | 3 * Copyright 2014 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 19 matching lines...) Loading... |
30 | 30 |
31 #include <string> | 31 #include <string> |
32 | 32 |
33 #include "talk/app/webrtc/peerconnectioninterface.h" | 33 #include "talk/app/webrtc/peerconnectioninterface.h" |
34 #include "talk/app/webrtc/proxy.h" | 34 #include "talk/app/webrtc/proxy.h" |
35 | 35 |
36 namespace webrtc { | 36 namespace webrtc { |
37 | 37 |
38 BEGIN_PROXY_MAP(PeerConnectionFactory) | 38 BEGIN_PROXY_MAP(PeerConnectionFactory) |
39 PROXY_METHOD1(void, SetOptions, const Options&) | 39 PROXY_METHOD1(void, SetOptions, const Options&) |
40 PROXY_METHOD5(rtc::scoped_refptr<PeerConnectionInterface>, | 40 PROXY_METHOD6(rtc::scoped_refptr<PeerConnectionInterface>, |
41 CreatePeerConnection, | 41 CreatePeerConnection, |
42 const PeerConnectionInterface::RTCConfiguration&, | 42 const PeerConnectionInterface::RTCConfiguration&, |
43 const MediaConstraintsInterface*, | 43 const MediaConstraintsInterface*, |
44 PortAllocatorFactoryInterface*, | 44 PortAllocatorFactoryInterface*, |
45 DTLSIdentityServiceInterface*, | 45 DTLSIdentityServiceInterface*, |
| 46 rtc::KeyType, |
46 PeerConnectionObserver*) | 47 PeerConnectionObserver*) |
47 PROXY_METHOD1(rtc::scoped_refptr<MediaStreamInterface>, | 48 PROXY_METHOD1(rtc::scoped_refptr<MediaStreamInterface>, |
48 CreateLocalMediaStream, const std::string&) | 49 CreateLocalMediaStream, const std::string&) |
49 PROXY_METHOD1(rtc::scoped_refptr<AudioSourceInterface>, | 50 PROXY_METHOD1(rtc::scoped_refptr<AudioSourceInterface>, |
50 CreateAudioSource, const MediaConstraintsInterface*) | 51 CreateAudioSource, const MediaConstraintsInterface*) |
51 PROXY_METHOD2(rtc::scoped_refptr<VideoSourceInterface>, | 52 PROXY_METHOD2(rtc::scoped_refptr<VideoSourceInterface>, |
52 CreateVideoSource, cricket::VideoCapturer*, | 53 CreateVideoSource, cricket::VideoCapturer*, |
53 const MediaConstraintsInterface*) | 54 const MediaConstraintsInterface*) |
54 PROXY_METHOD2(rtc::scoped_refptr<VideoTrackInterface>, | 55 PROXY_METHOD2(rtc::scoped_refptr<VideoTrackInterface>, |
55 CreateVideoTrack, const std::string&, VideoSourceInterface*) | 56 CreateVideoTrack, const std::string&, VideoSourceInterface*) |
56 PROXY_METHOD2(rtc::scoped_refptr<AudioTrackInterface>, | 57 PROXY_METHOD2(rtc::scoped_refptr<AudioTrackInterface>, |
57 CreateAudioTrack, const std::string&, AudioSourceInterface*) | 58 CreateAudioTrack, const std::string&, AudioSourceInterface*) |
58 PROXY_METHOD1(bool, StartAecDump, rtc::PlatformFile) | 59 PROXY_METHOD1(bool, StartAecDump, rtc::PlatformFile) |
59 END_PROXY() | 60 END_PROXY() |
60 | 61 |
61 } // namespace webrtc | 62 } // namespace webrtc |
62 | 63 |
63 #endif // TALK_APP_WEBRTC_PEERCONNECTIONFACTORYPROXY_H_ | 64 #endif // TALK_APP_WEBRTC_PEERCONNECTIONFACTORYPROXY_H_ |
OLD | NEW |