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

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

Issue 9567007: libjingle roll 117:119 (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 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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 talk_base::NetworkManager* network_manager, 49 talk_base::NetworkManager* network_manager,
50 talk_base::PacketSocketFactory* socket_factory); 50 talk_base::PacketSocketFactory* socket_factory);
51 virtual void ReleasePeerConnectionFactory(); 51 virtual void ReleasePeerConnectionFactory();
52 virtual bool PeerConnectionFactoryCreated(); 52 virtual bool PeerConnectionFactoryCreated();
53 53
54 // Asks the PeerConnection factory to create a PeerConnection object. 54 // Asks the PeerConnection factory to create a PeerConnection object.
55 // The PeerConnection object is owned by PeerConnectionHandler. 55 // The PeerConnection object is owned by PeerConnectionHandler.
56 virtual talk_base::scoped_refptr<webrtc::PeerConnectionInterface> 56 virtual talk_base::scoped_refptr<webrtc::PeerConnectionInterface>
57 CreatePeerConnection(const std::string& config, 57 CreatePeerConnection(const std::string& config,
58 webrtc::PeerConnectionObserver* observer); 58 webrtc::PeerConnectionObserver* observer);
59 virtual talk_base::scoped_refptr<webrtc::PeerConnectionInterface>
60 CreateRoapPeerConnection(const std::string& config,
61 webrtc::PeerConnectionObserver* observer);
59 62
60 // Asks the PeerConnection factory to create a Local MediaStream object. 63 // Asks the PeerConnection factory to create a Local MediaStream object.
61 virtual talk_base::scoped_refptr<webrtc::LocalMediaStreamInterface> 64 virtual talk_base::scoped_refptr<webrtc::LocalMediaStreamInterface>
62 CreateLocalMediaStream(const std::string& label); 65 CreateLocalMediaStream(const std::string& label);
63 66
64 // Asks the PeerConnection factory to create a Local VideoTrack object. 67 // Asks the PeerConnection factory to create a Local VideoTrack object.
65 virtual talk_base::scoped_refptr<webrtc::LocalVideoTrackInterface> 68 virtual talk_base::scoped_refptr<webrtc::LocalVideoTrackInterface>
66 CreateLocalVideoTrack(const std::string& label, 69 CreateLocalVideoTrack(const std::string& label,
67 cricket::VideoCapturer* video_device); 70 cricket::VideoCapturer* video_device);
68 71
69 // Asks the PeerConnection factory to create a Local AudioTrack object. 72 // Asks the PeerConnection factory to create a Local AudioTrack object.
70 virtual talk_base::scoped_refptr<webrtc::LocalAudioTrackInterface> 73 virtual talk_base::scoped_refptr<webrtc::LocalAudioTrackInterface>
71 CreateLocalAudioTrack(const std::string& label, 74 CreateLocalAudioTrack(const std::string& label,
72 webrtc::AudioDeviceModule* audio_device); 75 webrtc::AudioDeviceModule* audio_device);
73 76
74 private: 77 private:
75 talk_base::scoped_refptr<webrtc::PeerConnectionFactoryInterface> pc_factory_; 78 talk_base::scoped_refptr<webrtc::PeerConnectionFactoryInterface> pc_factory_;
76 79
77 DISALLOW_COPY_AND_ASSIGN(MediaStreamDependencyFactory); 80 DISALLOW_COPY_AND_ASSIGN(MediaStreamDependencyFactory);
78 }; 81 };
79 82
80 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DEPENDENCY_FACTORY_H_ 83 #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