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

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

Issue 9699069: Adding JSEP PeerConnection glue. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 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/media_stream_impl.h
diff --git a/content/renderer/media/media_stream_impl.h b/content/renderer/media/media_stream_impl.h
index 503c510b12659c43c84580402d10476ea3f617fb..53f601f8e7b0b0471db4108426c824f40769ac92 100644
--- a/content/renderer/media/media_stream_impl.h
+++ b/content/renderer/media/media_stream_impl.h
@@ -41,13 +41,15 @@ class Thread;
}
namespace WebKit {
+class WebJSEPPeerConnectionHandler;
+class WebJSEPPeerConnectionHandlerClient;
class WebPeerConnectionHandler;
class WebPeerConnectionHandlerClient;
}
class MediaStreamDispatcher;
class MediaStreamDependencyFactory;
-class PeerConnectionHandler;
+class PeerConnectionHandlerBase;
class VideoCaptureImplManager;
class RTCVideoDecoder;
@@ -72,6 +74,8 @@ class CONTENT_EXPORT MediaStreamImpl
virtual WebKit::WebPeerConnectionHandler* CreatePeerConnectionHandler(
WebKit::WebPeerConnectionHandlerClient* client);
+ virtual WebKit::WebJSEPPeerConnectionHandler* CreatePeerConnectionHandlerJsep(
+ WebKit::WebJSEPPeerConnectionHandlerClient* client);
virtual void ClosePeerConnection();
virtual webrtc::MediaStreamTrackInterface* GetLocalMediaStreamTrack(
const std::string& label);
@@ -156,7 +160,7 @@ class CONTENT_EXPORT MediaStreamImpl
// peer_connection_handler_ is a weak reference, owned by WebKit. It's valid
// until stop is called on it (which will call ClosePeerConnection on us).
// TODO(grunell): Support several PeerConnectionsHandlers.
- PeerConnectionHandler* peer_connection_handler_;
+ PeerConnectionHandlerBase* peer_connection_handler_;
// We keep a list of the generated local tracks, so that we can add capture
// devices when generated and also use them for recording.

Powered by Google App Engine
This is Rietveld 408576698