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

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

Issue 11783059: Ensures that WebRTC works for device selection using a different sample rate than default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix after review from Chris Created 7 years, 11 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 78e9df18cbafa1371f7fa87c5ac97bbc8b131834..9b334a14ce12814de33ab3f9b037ff251aad3040 100644
--- a/content/renderer/media/media_stream_source_extra_data.h
+++ b/content/renderer/media/media_stream_source_extra_data.h
@@ -8,6 +8,7 @@
#include "base/compiler_specific.h"
#include "content/common/content_export.h"
#include "content/common/media/media_stream_options.h"
+#include "media/base/audio_capturer_source.h"
#include "third_party/libjingle/source/talk/app/webrtc/videosourceinterface.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamSource.h"
@@ -16,8 +17,11 @@ namespace content {
class CONTENT_EXPORT MediaStreamSourceExtraData
: NON_EXPORTED_BASE(public WebKit::WebMediaStreamSource::ExtraData) {
public:
+
explicit MediaStreamSourceExtraData(
const StreamDeviceInfo& device_info);
+ explicit MediaStreamSourceExtraData(
+ media::AudioCapturerSource* source);
virtual ~MediaStreamSourceExtraData();
// Return device information about the camera or microphone.
@@ -30,10 +34,12 @@ class CONTENT_EXPORT MediaStreamSourceExtraData
}
webrtc::VideoSourceInterface* video_source() { return video_source_; }
+ media::AudioCapturerSource* audio_source() { return audio_source_; }
private:
StreamDeviceInfo device_info_;
scoped_refptr<webrtc::VideoSourceInterface> video_source_;
+ scoped_refptr<media::AudioCapturerSource> audio_source_;
DISALLOW_COPY_AND_ASSIGN(MediaStreamSourceExtraData);
};
« 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