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

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

Issue 1615433002: Roll WebRTC 11523:11548, Libjingle 11522:11545 (Closed) Base URL: http://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rolling to webrtc@11548 instead to pull in a fix Created 4 years, 10 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
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 "base/macros.h" 9 #include "base/macros.h"
10 #include "content/common/content_export.h" 10 #include "content/common/content_export.h"
11 #include "content/renderer/media/media_stream_source.h" 11 #include "content/renderer/media/media_stream_source.h"
12 #include "content/renderer/media/webrtc/peer_connection_dependency_factory.h" 12 #include "content/renderer/media/webrtc/peer_connection_dependency_factory.h"
13 #include "content/renderer/media/webrtc_audio_capturer.h" 13 #include "content/renderer/media/webrtc_audio_capturer.h"
14 #include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h" 14 #include "third_party/webrtc/api/mediastreaminterface.h"
15 15
16 namespace content { 16 namespace content {
17 17
18 class CONTENT_EXPORT MediaStreamAudioSource 18 class CONTENT_EXPORT MediaStreamAudioSource
19 : NON_EXPORTED_BASE(public MediaStreamSource) { 19 : NON_EXPORTED_BASE(public MediaStreamSource) {
20 public: 20 public:
21 MediaStreamAudioSource(int render_frame_id, 21 MediaStreamAudioSource(int render_frame_id,
22 const StreamDeviceInfo& device_info, 22 const StreamDeviceInfo& device_info,
23 const SourceStoppedCallback& stop_callback, 23 const SourceStoppedCallback& stop_callback,
24 PeerConnectionDependencyFactory* factory); 24 PeerConnectionDependencyFactory* factory);
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 scoped_refptr<webrtc::AudioSourceInterface> local_audio_source_; 58 scoped_refptr<webrtc::AudioSourceInterface> local_audio_source_;
59 59
60 scoped_refptr<WebRtcAudioCapturer> audio_capturer_; 60 scoped_refptr<WebRtcAudioCapturer> audio_capturer_;
61 61
62 DISALLOW_COPY_AND_ASSIGN(MediaStreamAudioSource); 62 DISALLOW_COPY_AND_ASSIGN(MediaStreamAudioSource);
63 }; 63 };
64 64
65 } // namespace content 65 } // namespace content
66 66
67 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_AUDIO_SOURCE_H_ 67 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_AUDIO_SOURCE_H_
OLDNEW
« no previous file with comments | « content/renderer/media/media_stream_audio_processor_unittest.cc ('k') | content/renderer/media/media_stream_audio_track.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698