From 83526dcc618dc0ceda0d669df8af0b9535afaf31 Mon Sep 17 00:00:00 2001 From: "wez@chromium.org" Date: Tue, 13 Nov 2012 20:18:26 +0000 Subject: Revert 167387 - Break down the webrtc code and AudioInputDevice into a WebRtcAudioCapturer. This CL failed the TabCapture browser-test on the win_rel try-bot, and caused it to fail on Mac & Windows on the build-bots. BUG=160782 This capturer contains a source (AudioInputDevice) and a sink (WebRtcAudioDeviceImpl) by default. What it does is to get data from AudioInputDevice via CaptureCallback::Capture() callback, and forward the data to WebRtcAudioDeviceImpl. The source can be over written by API: SetCapturerSource(media::AudioCapturerSource* source) This capture currently only support one sink (WebRtcAudioDeviceImpl), but this can be extended to multiple sinks for the future. Design doc: https://docs.google.com/a/google.com/document/d/1FmiXtk1pxFlAw_CWwbfG-EQ4Syi4vpnZm6GWMyJ1UfU/edit BUG=157306 TEST=manual test Review URL: https://codereview.chromium.org/11231003 TBR=xians@chromium.org Review URL: https://codereview.chromium.org/11362231 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167448 0039d316-1c4b-4281-b951-d872f2087c98 --- media/media.gyp | 2 -- 1 file changed, 2 deletions(-) (limited to 'media/media.gyp') diff --git a/media/media.gyp b/media/media.gyp index b0c2bdf..9fb5f37 100644 --- a/media/media.gyp +++ b/media/media.gyp @@ -158,7 +158,6 @@ 'base/android/cookie_getter.h', 'base/android/media_player_bridge_manager.cc', 'base/android/media_player_bridge_manager.h', - 'base/audio_capturer_source.h', 'base/audio_decoder.cc', 'base/audio_decoder.h', 'base/audio_decoder_config.cc', @@ -169,7 +168,6 @@ 'base/audio_pull_fifo.h', 'base/audio_renderer.cc', 'base/audio_renderer.h', - 'base/audio_renderer_sink.h', 'base/audio_renderer_mixer.cc', 'base/audio_renderer_mixer.h', 'base/audio_renderer_mixer_input.cc', -- cgit v1.1