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

Side by Side Diff: content/renderer/media/media_stream_dependency_factory.h

Issue 12207107: Update libjingle 273:277. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « DEPS ('k') | content/renderer/media/media_stream_dependency_factory.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DEPENDENCY_FACTORY_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DEPENDENCY_FACTORY_H_
6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DEPENDENCY_FACTORY_H_ 6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DEPENDENCY_FACTORY_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 // |stream_stopped| is a callback that is run when a MediaStream have been 86 // |stream_stopped| is a callback that is run when a MediaStream have been
87 // stopped. 87 // stopped.
88 void CreateNativeLocalMediaStream( 88 void CreateNativeLocalMediaStream(
89 WebKit::WebMediaStream* description, 89 WebKit::WebMediaStream* description,
90 const MediaStreamExtraData::StreamStopCallback& stream_stop); 90 const MediaStreamExtraData::StreamStopCallback& stream_stop);
91 91
92 // Asks the libjingle PeerConnection factory to create a libjingle 92 // Asks the libjingle PeerConnection factory to create a libjingle
93 // PeerConnection object. 93 // PeerConnection object.
94 // The PeerConnection object is owned by PeerConnectionHandler. 94 // The PeerConnection object is owned by PeerConnectionHandler.
95 virtual scoped_refptr<webrtc::PeerConnectionInterface> 95 virtual scoped_refptr<webrtc::PeerConnectionInterface>
96 CreatePeerConnection(const webrtc::JsepInterface::IceServers& ice_servers, 96 CreatePeerConnection(
97 const webrtc::MediaConstraintsInterface* constraints, 97 const webrtc::PeerConnectionInterface::IceServers& ice_servers,
98 WebKit::WebFrame* web_frame, 98 const webrtc::MediaConstraintsInterface* constraints,
99 webrtc::PeerConnectionObserver* observer); 99 WebKit::WebFrame* web_frame,
100 webrtc::PeerConnectionObserver* observer);
100 101
101 // Creates a libjingle representation of a Session description. Used by a 102 // Creates a libjingle representation of a Session description. Used by a
102 // RTCPeerConnectionHandler instance. 103 // RTCPeerConnectionHandler instance.
103 virtual webrtc::SessionDescriptionInterface* CreateSessionDescription( 104 virtual webrtc::SessionDescriptionInterface* CreateSessionDescription(
104 const std::string& type, 105 const std::string& type,
105 const std::string& sdp); 106 const std::string& sdp,
107 webrtc::SdpParseError* error);
106 108
107 // Creates a libjingle representation of an ice candidate. 109 // Creates a libjingle representation of an ice candidate.
108 virtual webrtc::IceCandidateInterface* CreateIceCandidate( 110 virtual webrtc::IceCandidateInterface* CreateIceCandidate(
109 const std::string& sdp_mid, 111 const std::string& sdp_mid,
110 int sdp_mline_index, 112 int sdp_mline_index,
111 const std::string& sdp); 113 const std::string& sdp);
112 114
113 WebRtcAudioDeviceImpl* GetWebRtcAudioDevice(); 115 WebRtcAudioDeviceImpl* GetWebRtcAudioDevice();
114 116
115 protected: 117 protected:
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 talk_base::Thread* signaling_thread_; 183 talk_base::Thread* signaling_thread_;
182 talk_base::Thread* worker_thread_; 184 talk_base::Thread* worker_thread_;
183 base::Thread chrome_worker_thread_; 185 base::Thread chrome_worker_thread_;
184 186
185 DISALLOW_COPY_AND_ASSIGN(MediaStreamDependencyFactory); 187 DISALLOW_COPY_AND_ASSIGN(MediaStreamDependencyFactory);
186 }; 188 };
187 189
188 } // namespace content 190 } // namespace content
189 191
190 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DEPENDENCY_FACTORY_H_ 192 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DEPENDENCY_FACTORY_H_
OLDNEW
« no previous file with comments | « DEPS ('k') | content/renderer/media/media_stream_dependency_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698