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

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

Issue 13496009: Hookup the MediaStream glue for Adding and Removing tracks to an existing MediaStream. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add workaround when there are no microphones on bots. Created 7 years, 8 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
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 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 WebKit::WebMediaStream* description); 82 WebKit::WebMediaStream* description);
83 83
84 // Creates a libjingle representation of a MediaStream and stores 84 // Creates a libjingle representation of a MediaStream and stores
85 // it in the extra data field of |description|. 85 // it in the extra data field of |description|.
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 // Adds a libjingle representation of a MediaStreamTrack to |stream| based
93 // on the source of |track|.
94 bool AddNativeMediaStreamTrack(const WebKit::WebMediaStream& stream,
95 const WebKit::WebMediaStreamTrack& track);
96
97 bool RemoveNativeMediaStreamTrack(const WebKit::WebMediaStream& stream,
98 const WebKit::WebMediaStreamTrack& track);
99
92 // Asks the libjingle PeerConnection factory to create a libjingle 100 // Asks the libjingle PeerConnection factory to create a libjingle
93 // PeerConnection object. 101 // PeerConnection object.
94 // The PeerConnection object is owned by PeerConnectionHandler. 102 // The PeerConnection object is owned by PeerConnectionHandler.
95 virtual scoped_refptr<webrtc::PeerConnectionInterface> 103 virtual scoped_refptr<webrtc::PeerConnectionInterface>
96 CreatePeerConnection( 104 CreatePeerConnection(
97 const webrtc::PeerConnectionInterface::IceServers& ice_servers, 105 const webrtc::PeerConnectionInterface::IceServers& ice_servers,
98 const webrtc::MediaConstraintsInterface* constraints, 106 const webrtc::MediaConstraintsInterface* constraints,
99 WebKit::WebFrame* web_frame, 107 WebKit::WebFrame* web_frame,
100 webrtc::PeerConnectionObserver* observer); 108 webrtc::PeerConnectionObserver* observer);
101 109
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 talk_base::Thread* signaling_thread_; 196 talk_base::Thread* signaling_thread_;
189 talk_base::Thread* worker_thread_; 197 talk_base::Thread* worker_thread_;
190 base::Thread chrome_worker_thread_; 198 base::Thread chrome_worker_thread_;
191 199
192 DISALLOW_COPY_AND_ASSIGN(MediaStreamDependencyFactory); 200 DISALLOW_COPY_AND_ASSIGN(MediaStreamDependencyFactory);
193 }; 201 };
194 202
195 } // namespace content 203 } // namespace content
196 204
197 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DEPENDENCY_FACTORY_H_ 205 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DEPENDENCY_FACTORY_H_
OLDNEW
« no previous file with comments | « content/renderer/media/media_stream_center.cc ('k') | content/renderer/media/media_stream_dependency_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698