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

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

Issue 10703095: New PeerConnection handler in Chrome to support latest PeerConnection draft (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix code review issues found by Wei. Created 8 years, 4 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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 talk_base::NetworkManager* network_manager, 51 talk_base::NetworkManager* network_manager,
52 talk_base::PacketSocketFactory* socket_factory); 52 talk_base::PacketSocketFactory* socket_factory);
53 virtual void ReleasePeerConnectionFactory(); 53 virtual void ReleasePeerConnectionFactory();
54 virtual bool PeerConnectionFactoryCreated(); 54 virtual bool PeerConnectionFactoryCreated();
55 55
56 // Asks the PeerConnection factory to create a PeerConnection object. 56 // Asks the PeerConnection factory to create a PeerConnection object.
57 // The PeerConnection object is owned by PeerConnectionHandler. 57 // The PeerConnection object is owned by PeerConnectionHandler.
58 virtual talk_base::scoped_refptr<webrtc::PeerConnectionInterface> 58 virtual talk_base::scoped_refptr<webrtc::PeerConnectionInterface>
59 CreatePeerConnection(const std::string& config, 59 CreatePeerConnection(const std::string& config,
60 webrtc::PeerConnectionObserver* observer); 60 webrtc::PeerConnectionObserver* observer);
61 virtual talk_base::scoped_refptr<webrtc::PeerConnectionInterface>
62 CreatePeerConnection(const webrtc::JsepInterface::IceServers& ice_servers,
63 const webrtc::MediaConstraintsInterface* constraints,
64 webrtc::PeerConnectionObserver* observer);
61 65
62 // Asks the PeerConnection factory to create a Local MediaStream object. 66 // Asks the PeerConnection factory to create a Local MediaStream object.
63 virtual talk_base::scoped_refptr<webrtc::LocalMediaStreamInterface> 67 virtual talk_base::scoped_refptr<webrtc::LocalMediaStreamInterface>
64 CreateLocalMediaStream(const std::string& label); 68 CreateLocalMediaStream(const std::string& label);
65 69
66 // Asks the PeerConnection factory to create a Local VideoTrack object. 70 // Asks the PeerConnection factory to create a Local VideoTrack object.
67 virtual talk_base::scoped_refptr<webrtc::LocalVideoTrackInterface> 71 virtual talk_base::scoped_refptr<webrtc::LocalVideoTrackInterface>
68 CreateLocalVideoTrack(const std::string& label, 72 CreateLocalVideoTrack(const std::string& label,
69 int video_session_id); 73 int video_session_id);
70 74
71 // Asks the PeerConnection factory to create a Local AudioTrack object. 75 // Asks the PeerConnection factory to create a Local AudioTrack object.
72 virtual talk_base::scoped_refptr<webrtc::LocalAudioTrackInterface> 76 virtual talk_base::scoped_refptr<webrtc::LocalAudioTrackInterface>
73 CreateLocalAudioTrack(const std::string& label, 77 CreateLocalAudioTrack(const std::string& label,
74 webrtc::AudioDeviceModule* audio_device); 78 webrtc::AudioDeviceModule* audio_device);
75 79
76 virtual webrtc::SessionDescriptionInterface* CreateSessionDescription( 80 virtual webrtc::SessionDescriptionInterface* CreateSessionDescription(
77 const std::string& sdp); 81 const std::string& sdp);
82 virtual webrtc::SessionDescriptionInterface* CreateSessionDescription(
83 const std::string& type,
84 const std::string& sdp);
78 virtual webrtc::IceCandidateInterface* CreateIceCandidate( 85 virtual webrtc::IceCandidateInterface* CreateIceCandidate(
79 const std::string& sdp_mid, 86 const std::string& sdp_mid,
80 int sdp_mline_index, 87 int sdp_mline_index,
81 const std::string& sdp); 88 const std::string& sdp);
82 89
83 private: 90 private:
84 talk_base::scoped_refptr<webrtc::PeerConnectionFactoryInterface> pc_factory_; 91 talk_base::scoped_refptr<webrtc::PeerConnectionFactoryInterface> pc_factory_;
85 scoped_refptr<VideoCaptureImplManager> vc_manager_; 92 scoped_refptr<VideoCaptureImplManager> vc_manager_;
86 93
87 DISALLOW_COPY_AND_ASSIGN(MediaStreamDependencyFactory); 94 DISALLOW_COPY_AND_ASSIGN(MediaStreamDependencyFactory);
88 }; 95 };
89 96
90 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DEPENDENCY_FACTORY_H_ 97 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DEPENDENCY_FACTORY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698