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

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

Issue 23691038: Switch LiveAudio to source provider solution. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixed the android bot Created 7 years, 3 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_source_extra_data.h
diff --git a/content/renderer/media/media_stream_source_extra_data.h b/content/renderer/media/media_stream_source_extra_data.h
index c997832220ce1e89613b9092cb53cbc996e40c4b..bb06435c158aa3c15b34aa5cfbe6e2e1e28b1b17 100644
--- a/content/renderer/media/media_stream_source_extra_data.h
+++ b/content/renderer/media/media_stream_source_extra_data.h
@@ -9,7 +9,6 @@
#include "content/common/content_export.h"
#include "content/common/media/media_stream_options.h"
#include "content/renderer/media/media_stream_source_observer.h"
-#include "media/base/audio_capturer_source.h"
#include "third_party/libjingle/source/talk/app/webrtc/videosourceinterface.h"
#include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
@@ -21,8 +20,7 @@ class CONTENT_EXPORT MediaStreamSourceExtraData
MediaStreamSourceExtraData(
const StreamDeviceInfo& device_info,
const WebKit::WebMediaStreamSource& webkit_source);
- explicit MediaStreamSourceExtraData(
- media::AudioCapturerSource* source);
+ MediaStreamSourceExtraData();
virtual ~MediaStreamSourceExtraData();
// Returns the WebMediaStreamSource object that owns this object.
@@ -47,7 +45,6 @@ class CONTENT_EXPORT MediaStreamSourceExtraData
}
webrtc::VideoSourceInterface* video_source() { return video_source_.get(); }
- media::AudioCapturerSource* audio_source() { return audio_source_.get(); }
webrtc::AudioSourceInterface* local_audio_source() {
return local_audio_source_.get();
}
@@ -65,7 +62,6 @@ class CONTENT_EXPORT MediaStreamSourceExtraData
// MediaStreamImpl::~UserMediaRequestInfo() does.
WebKit::WebMediaStreamSource webkit_source_;
scoped_refptr<webrtc::VideoSourceInterface> video_source_;
- scoped_refptr<media::AudioCapturerSource> audio_source_;
// This member holds an instance of webrtc::LocalAudioSource. This is used
// as a container for audio options.
« no previous file with comments | « content/renderer/media/media_stream_impl.cc ('k') | content/renderer/media/mock_media_stream_dependency_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698