diff options
author | xians@chromium.org <xians@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-03 10:21:23 +0000 |
---|---|---|
committer | xians@chromium.org <xians@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-03 10:21:23 +0000 |
commit | e751e2080ef2a63f070eef83d8a8d079c3e39008 (patch) | |
tree | e62f0ce58666147fc392d99bf6246a3bfa88db28 /media/base | |
parent | 1ca262b629c6e51439db53c37cf15e40ea2475b9 (diff) | |
download | chromium_src-e751e2080ef2a63f070eef83d8a8d079c3e39008.zip chromium_src-e751e2080ef2a63f070eef83d8a8d079c3e39008.tar.gz chromium_src-e751e2080ef2a63f070eef83d8a8d079c3e39008.tar.bz2 |
Revert 203686 "Trying relanding this CL, the original CL passed ..."
> Trying relanding this CL, the original CL passed the try bots but failed the mac 10.7 bot, I am keeping an eye on the bots and will revert it if it fails the bot again.
>
> Hook up the device selection to the WebAudio live audio.
> WebAudio live audio needs to pass the session_id to the browser process so that Chrome can open the correct input device for unitfied IO.
>
> This CL looks big because it touches quite some interfaces from the render to the browser. But the change is simple and basically adding a session_id/device_id to the classes. All the changes some together and it is very hard to break it down.
> It also makes the media output code more similar to the media input code as well, and it will be easier to merge them for the future.
>
> TBR=henrika@chormium.org
>
> BUG=147327
> TEST=http://chromium.googlecode.com/svn/trunk/samples/audio/visualizer-live.html
> Change the device using the camera icon on the right of the omnibox, then reload. Verify the sound is coming from the correct input device.
>
> Review URL: https://codereview.chromium.org/15836006
TBR=xians@chromium.org
Review URL: https://codereview.chromium.org/16325002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203690 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base')
-rw-r--r-- | media/base/audio_renderer_sink.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/media/base/audio_renderer_sink.h b/media/base/audio_renderer_sink.h index b2f4ba0a..0d3c6c7 100644 --- a/media/base/audio_renderer_sink.h +++ b/media/base/audio_renderer_sink.h @@ -7,7 +7,6 @@ #include <vector> #include "base/basictypes.h" -#include "base/logging.h" #include "base/memory/ref_counted.h" #include "media/audio/audio_parameters.h" #include "media/base/audio_bus.h" @@ -42,6 +41,13 @@ class AudioRendererSink // Sets important information about the audio stream format. // It must be called before any of the other methods. + // For clients wishing to have synchronized input and output, + // |params| may specify |input_channels| > 0, representing a + // number of input channels which will be at the same sample-rate + // and buffer-size as the output as specified in |params|. + // In this case, the callback's RenderIO() method will be called instead + // of Render(), providing the synchronized input data at the same time as + // when new output data is to be rendered. virtual void Initialize(const AudioParameters& params, RenderCallback* callback) = 0; |