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

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

Issue 1769933002: Looking up device id by session id for AudioRendererMixerInput (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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/audio_device_factory.h
diff --git a/content/renderer/media/audio_device_factory.h b/content/renderer/media/audio_device_factory.h
index 749888ce0499d244cb405770fd6e1b80ee7780b0..8c0894dfc6326cb16379ff26a4fc4eb5877e1a65 100644
--- a/content/renderer/media/audio_device_factory.h
+++ b/content/renderer/media/audio_device_factory.h
@@ -11,11 +11,11 @@
#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "content/common/content_export.h"
+#include "media/base/audio_renderer_mixer_sink.h"
#include "media/base/audio_renderer_sink.h"
namespace media {
class AudioInputDevice;
-class AudioOutputDevice;
}
namespace url {
@@ -39,7 +39,7 @@ class CONTENT_EXPORT AudioDeviceFactory {
kSourceLast = kSourceWebAudio // Only used for validation of format.
};
- // Creates an AudioOutputDevice.
+ // Creates a sink for AudioRemdererMixer.
Guido Urdaneta 2016/03/08 14:53:09 typo: s/Remderer/Renderer
o1ka 2016/04/05 15:13:37 Done.
// |render_frame_id| refers to the RenderFrame containing the entity
// producing the audio. If |session_id| is nonzero, it is used by the browser
// to select the correct input device ID and its associated output device, if
@@ -47,7 +47,7 @@ class CONTENT_EXPORT AudioDeviceFactory {
// identify the output device to use.
// If |session_id| is zero and |device_id| and |security_origin| are empty,
// the default output device will be selected.
- static scoped_refptr<media::AudioOutputDevice> NewOutputDevice(
+ static scoped_refptr<media::AudioRendererMixerSink> NewAudioRendererMixerSink(
int render_frame_id,
int session_id,
const std::string& device_id,
@@ -96,7 +96,7 @@ class CONTENT_EXPORT AudioDeviceFactory {
// functions to provide alternate audio device implementations.
// If the return value of either of these function is NULL, we fall back
// on the default implementation.
- virtual media::AudioOutputDevice* CreateOutputDevice(
+ virtual media::AudioRendererMixerSink* CreateAudioRendererMixerSink(
int render_frame_id,
int sesssion_id,
const std::string& device_id,

Powered by Google App Engine
This is Rietveld 408576698