summaryrefslogtreecommitdiffstats
path: root/media/media.gyp
diff options
context:
space:
mode:
authorenal@chromium.org <enal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-19 17:44:10 +0000
committerenal@chromium.org <enal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-19 17:44:10 +0000
commit08c1c1399c69de70485abcbc80ba9884f8d41224 (patch)
treec27b9f6d0608d3750fbfbab7d2b1c7cdf62e7f28 /media/media.gyp
parent3ae7a56eddef4427b218c2151bb331a02a5cc394 (diff)
downloadchromium_src-08c1c1399c69de70485abcbc80ba9884f8d41224.zip
chromium_src-08c1c1399c69de70485abcbc80ba9884f8d41224.tar.gz
chromium_src-08c1c1399c69de70485abcbc80ba9884f8d41224.tar.bz2
Re-land software audio mixer.
Code goes through old or new paths depending on the AudioParameters or command-line flag. Added unit tests. Changed suppression for http://code.google.com/p/chromium/issues/detail?id=123112 because call stack changed (class was split into 2). Review URL: http://codereview.chromium.org/9691001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133010 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/media.gyp')
-rw-r--r--media/media.gyp4
1 files changed, 4 insertions, 0 deletions
diff --git a/media/media.gyp b/media/media.gyp
index 673f51e..1ccfa2b 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -47,6 +47,10 @@
'audio/audio_output_controller.h',
'audio/audio_output_dispatcher.cc',
'audio/audio_output_dispatcher.h',
+ 'audio/audio_output_dispatcher_impl.cc',
+ 'audio/audio_output_dispatcher_impl.h',
+ 'audio/audio_output_mixer.cc',
+ 'audio/audio_output_mixer.h',
'audio/audio_output_proxy.cc',
'audio/audio_output_proxy.h',
'audio/audio_parameters.cc',