Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(54)

Side by Side Diff: talk/app/webrtc/peerconnectionfactory.h

Issue 1363573002: Wire up transport sequence number / send time callbacks to webrtc via libjingle. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Add missing updated_options Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2011 Google Inc. 3 * Copyright 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 13 matching lines...) Expand all
24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28 #ifndef TALK_APP_WEBRTC_PEERCONNECTIONFACTORY_H_ 28 #ifndef TALK_APP_WEBRTC_PEERCONNECTIONFACTORY_H_
29 #define TALK_APP_WEBRTC_PEERCONNECTIONFACTORY_H_ 29 #define TALK_APP_WEBRTC_PEERCONNECTIONFACTORY_H_
30 30
31 #include <string> 31 #include <string>
32 32
33 #include "talk/app/webrtc/dtlsidentitystore.h" 33 #include "talk/app/webrtc/dtlsidentitystore.h"
34 #include "talk/app/webrtc/mediacontroller.h"
34 #include "talk/app/webrtc/mediastreaminterface.h" 35 #include "talk/app/webrtc/mediastreaminterface.h"
35 #include "talk/app/webrtc/peerconnectioninterface.h" 36 #include "talk/app/webrtc/peerconnectioninterface.h"
36 #include "talk/session/media/channelmanager.h" 37 #include "talk/session/media/channelmanager.h"
37 #include "webrtc/base/scoped_ptr.h" 38 #include "webrtc/base/scoped_ptr.h"
38 #include "webrtc/base/scoped_ref_ptr.h" 39 #include "webrtc/base/scoped_ref_ptr.h"
39 #include "webrtc/base/thread.h" 40 #include "webrtc/base/thread.h"
40 41
41 namespace webrtc { 42 namespace webrtc {
42 43
43 typedef rtc::RefCountedObject<DtlsIdentityStoreImpl> 44 typedef rtc::RefCountedObject<DtlsIdentityStoreImpl>
(...skipping 29 matching lines...) Expand all
73 rtc::scoped_refptr<VideoTrackInterface> 74 rtc::scoped_refptr<VideoTrackInterface>
74 CreateVideoTrack(const std::string& id, 75 CreateVideoTrack(const std::string& id,
75 VideoSourceInterface* video_source) override; 76 VideoSourceInterface* video_source) override;
76 77
77 rtc::scoped_refptr<AudioTrackInterface> 78 rtc::scoped_refptr<AudioTrackInterface>
78 CreateAudioTrack(const std::string& id, 79 CreateAudioTrack(const std::string& id,
79 AudioSourceInterface* audio_source) override; 80 AudioSourceInterface* audio_source) override;
80 81
81 bool StartAecDump(rtc::PlatformFile file) override; 82 bool StartAecDump(rtc::PlatformFile file) override;
82 83
83 virtual cricket::ChannelManager* channel_manager(); 84 virtual webrtc::MediaControllerInterface* CreateMediaController() const;
84 virtual rtc::Thread* signaling_thread(); 85 virtual rtc::Thread* signaling_thread();
85 virtual rtc::Thread* worker_thread(); 86 virtual rtc::Thread* worker_thread();
86 const Options& options() const { return options_; } 87 const Options& options() const { return options_; }
87 88
88 protected: 89 protected:
89 PeerConnectionFactory(); 90 PeerConnectionFactory();
90 PeerConnectionFactory( 91 PeerConnectionFactory(
91 rtc::Thread* worker_thread, 92 rtc::Thread* worker_thread,
92 rtc::Thread* signaling_thread, 93 rtc::Thread* signaling_thread,
93 AudioDeviceModule* default_adm, 94 AudioDeviceModule* default_adm,
(...skipping 21 matching lines...) Expand all
115 // injected any. In that case, video engine will use the internal SW decoder. 116 // injected any. In that case, video engine will use the internal SW decoder.
116 rtc::scoped_ptr<cricket::WebRtcVideoDecoderFactory> 117 rtc::scoped_ptr<cricket::WebRtcVideoDecoderFactory>
117 video_decoder_factory_; 118 video_decoder_factory_;
118 119
119 rtc::scoped_refptr<RefCountedDtlsIdentityStore> dtls_identity_store_; 120 rtc::scoped_refptr<RefCountedDtlsIdentityStore> dtls_identity_store_;
120 }; 121 };
121 122
122 } // namespace webrtc 123 } // namespace webrtc
123 124
124 #endif // TALK_APP_WEBRTC_PEERCONNECTIONFACTORY_H_ 125 #endif // TALK_APP_WEBRTC_PEERCONNECTIONFACTORY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698