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

Unified Diff: content/renderer/media/peer_connection_handler_base.h

Issue 14200016: Added implementation of RemoteMediaStreams. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix nits 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/peer_connection_handler_base.h
diff --git a/content/renderer/media/peer_connection_handler_base.h b/content/renderer/media/peer_connection_handler_base.h
index 824b5c518919ee5ff7ac470fa2639ca81a9e04de..f9c5cef0509623eab8b6e80cff60563b7066324a 100644
--- a/content/renderer/media/peer_connection_handler_base.h
+++ b/content/renderer/media/peer_connection_handler_base.h
@@ -18,6 +18,7 @@
namespace content {
class MediaStreamDependencyFactory;
+class RemoteMediaStreamImpl;
// PeerConnectionHandlerBase is the base class of a delegate for the
// PeerConnection API messages going between WebKit and native
@@ -35,8 +36,6 @@ class CONTENT_EXPORT PeerConnectionHandlerBase
bool AddStream(const WebKit::WebMediaStream& stream,
const webrtc::MediaConstraintsInterface* constraints);
void RemoveStream(const WebKit::WebMediaStream& stream);
- WebKit::WebMediaStream CreateRemoteWebKitMediaStream(
- webrtc::MediaStreamInterface* stream);
webrtc::MediaStreamTrackInterface* GetNativeMediaStreamTrack(
const WebKit::WebMediaStream& stream,
const WebKit::WebMediaStreamTrack& component);
@@ -50,7 +49,7 @@ class CONTENT_EXPORT PeerConnectionHandlerBase
scoped_refptr<webrtc::PeerConnectionInterface> native_peer_connection_;
typedef std::map<webrtc::MediaStreamInterface*,
- WebKit::WebMediaStream> RemoteStreamMap;
+ content::RemoteMediaStreamImpl*> RemoteStreamMap;
RemoteStreamMap remote_streams_;
// The message loop we are created on and on which to make calls to WebKit.

Powered by Google App Engine
This is Rietveld 408576698