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

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

Issue 272043003: Renamed MediaStreamDependencyFactory to PeerConnectionDependencyFactory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 6 years, 7 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 | « content/content_tests.gypi ('k') | content/renderer/media/media_stream_audio_source.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_AUDIO_SOURCE_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_AUDIO_SOURCE_H_
6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_AUDIO_SOURCE_H_ 6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_AUDIO_SOURCE_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "content/common/content_export.h" 9 #include "content/common/content_export.h"
10 #include "content/renderer/media/media_stream_dependency_factory.h"
11 #include "content/renderer/media/media_stream_source.h" 10 #include "content/renderer/media/media_stream_source.h"
11 #include "content/renderer/media/webrtc/peer_connection_dependency_factory.h"
12 #include "content/renderer/media/webrtc_audio_capturer.h" 12 #include "content/renderer/media/webrtc_audio_capturer.h"
13 #include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h" 13 #include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h"
14 14
15 namespace content { 15 namespace content {
16 16
17 class CONTENT_EXPORT MediaStreamAudioSource 17 class CONTENT_EXPORT MediaStreamAudioSource
18 : NON_EXPORTED_BASE(public MediaStreamSource) { 18 : NON_EXPORTED_BASE(public MediaStreamSource) {
19 public: 19 public:
20 MediaStreamAudioSource(int render_view_id, 20 MediaStreamAudioSource(int render_view_id,
21 const StreamDeviceInfo& device_info, 21 const StreamDeviceInfo& device_info,
22 const SourceStoppedCallback& stop_callback, 22 const SourceStoppedCallback& stop_callback,
23 MediaStreamDependencyFactory* factory); 23 PeerConnectionDependencyFactory* factory);
24 MediaStreamAudioSource(); 24 MediaStreamAudioSource();
25 virtual ~MediaStreamAudioSource(); 25 virtual ~MediaStreamAudioSource();
26 26
27 void AddTrack(const blink::WebMediaStreamTrack& track, 27 void AddTrack(const blink::WebMediaStreamTrack& track,
28 const blink::WebMediaConstraints& constraints, 28 const blink::WebMediaConstraints& constraints,
29 const ConstraintsCallback& callback); 29 const ConstraintsCallback& callback);
30 30
31 void SetLocalAudioSource(webrtc::AudioSourceInterface* source) { 31 void SetLocalAudioSource(webrtc::AudioSourceInterface* source) {
32 local_audio_source_ = source; 32 local_audio_source_ = source;
33 } 33 }
(...skipping 15 matching lines...) Expand all
49 virtual void DoStopSource() OVERRIDE; 49 virtual void DoStopSource() OVERRIDE;
50 50
51 private: 51 private:
52 int render_view_id_; // Render view ID that created this source. 52 int render_view_id_; // Render view ID that created this source.
53 // This member holds an instance of webrtc::LocalAudioSource. This is used 53 // This member holds an instance of webrtc::LocalAudioSource. This is used
54 // as a container for audio options. 54 // as a container for audio options.
55 scoped_refptr<webrtc::AudioSourceInterface> local_audio_source_; 55 scoped_refptr<webrtc::AudioSourceInterface> local_audio_source_;
56 56
57 scoped_refptr<WebRtcAudioCapturer> audio_capturer_; 57 scoped_refptr<WebRtcAudioCapturer> audio_capturer_;
58 58
59 MediaStreamDependencyFactory* factory_; 59 PeerConnectionDependencyFactory* factory_;
60 60
61 DISALLOW_COPY_AND_ASSIGN(MediaStreamAudioSource); 61 DISALLOW_COPY_AND_ASSIGN(MediaStreamAudioSource);
62 }; 62 };
63 63
64 } // namespace content 64 } // namespace content
65 65
66 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_AUDIO_SOURCE_H_ 66 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_AUDIO_SOURCE_H_
OLDNEW
« no previous file with comments | « content/content_tests.gypi ('k') | content/renderer/media/media_stream_audio_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698