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

Unified Diff: content/browser/renderer_host/media/audio_renderer_host.h

Issue 15979015: Reland 15721002: Hook up the device selection to the WebAudio live audio (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixed the comments. Created 7 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/media/audio_renderer_host.h
diff --git a/content/browser/renderer_host/media/audio_renderer_host.h b/content/browser/renderer_host/media/audio_renderer_host.h
index 803539cf48a1c7bdd331ff28e27fd03338ce0b18..b249ef418ceece4bcbffd7a1cf8bae03c73a1fe6 100644
--- a/content/browser/renderer_host/media/audio_renderer_host.h
+++ b/content/browser/renderer_host/media/audio_renderer_host.h
@@ -61,6 +61,7 @@ namespace content {
class AudioMirroringManager;
class MediaInternals;
+class MediaStreamManager;
class ResourceContext;
class CONTENT_EXPORT AudioRendererHost : public BrowserMessageFilter {
@@ -69,7 +70,8 @@ class CONTENT_EXPORT AudioRendererHost : public BrowserMessageFilter {
AudioRendererHost(int render_process_id,
media::AudioManager* audio_manager,
AudioMirroringManager* mirroring_manager,
- MediaInternals* media_internals);
+ MediaInternals* media_internals,
+ MediaStreamManager* media_stream_manager);
// BrowserMessageFilter implementation.
virtual void OnChannelClosing() OVERRIDE;
@@ -96,10 +98,14 @@ class CONTENT_EXPORT AudioRendererHost : public BrowserMessageFilter {
// Creates an audio output stream with the specified format whose data is
// produced by an entity in the render view referenced by |render_view_id|.
+ // |session_id| is used for unified IO to find out which input device to be
+ // opened for the stream. For clients that do not use unified IO,
+ // |session_id| will be ignored.
// Upon success/failure, the peer is notified via the NotifyStreamCreated
// message.
void OnCreateStream(int stream_id,
int render_view_id,
+ int session_id,
const media::AudioParameters& params);
// Play the audio stream referenced by |stream_id|.
@@ -143,6 +149,9 @@ class CONTENT_EXPORT AudioRendererHost : public BrowserMessageFilter {
AudioMirroringManager* const mirroring_manager_;
MediaInternals* const media_internals_;
+ // Used to access to AudioInputDeviceManager.
+ MediaStreamManager* media_stream_manager_;
+
// A map of stream IDs to audio sources.
AudioEntryMap audio_entries_;

Powered by Google App Engine
This is Rietveld 408576698