Disable AudioOutputMixer.

Disable AudioOutputMixer.

Removes AudioOutputMixer from compilation in preperation for
converting the pipeline over to floats.  Plan is as follows:

1. Remove AudioOutputMixer from compilation.
2. Convert all OnMoreData(uint8*, uint32, ...) calls to
OnMoreData(AudioBus*, ...)
3. Refactor AudioRendererMixing->AudioMixerUtil (Or VectorMath).
4. Convert AudioOutputMixer to use float mixing and re-enable.

BUG=114700
TEST=media_unittests


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=153347

[DaleCurtis, 2012-08-09 22:04:25]

Won't commit this until OnMoreData changes are ready.

[scherkus (not reviewing), 2012-08-09 22:12:39]

https://chromiumcodereview.appspot.com/10855086/diff/1/media/audio/audio_mana...
File media/audio/audio_manager_base.cc (right):

https://chromiumcodereview.appspot.com/10855086/diff/1/media/audio/audio_mana...
media/audio/audio_manager_base.cc:13: // #include
"media/audio/audio_output_mixer.h"
this is better handled via an #ifdef

i.e., after the includes have the following:

// TODO(dalecurtis): etc...
#if defined(ENABLE_AUDIO_MIXER)
#include "media/audio/audio_output_mixer.h"
#endif

... snip ...

#if defined(ENABLE_AUDIO_MIXER)
cmd_line->HasSwitch(...)
#endif 


that way it's easier to re-enable and the diffs are smaller

https://chromiumcodereview.appspot.com/10855086/diff/1/media/audio/audio_mana...
media/audio/audio_manager_base.cc:146: // TODO(dalecurtis): Temporarily disabled
while switching over to floats.
link to bug?

https://chromiumcodereview.appspot.com/10855086/diff/1/media/audio/audio_outp...
File media/audio/audio_output_mixer.h (right):

https://chromiumcodereview.appspot.com/10855086/diff/1/media/audio/audio_outp...
media/audio/audio_output_mixer.h:46: virtual uint32 OnMoreData(AudioBus*
audio_bus,
??

https://chromiumcodereview.appspot.com/10855086/diff/1/media/audio/audio_outp...
File media/audio/audio_output_proxy_unittest.cc (right):

https://chromiumcodereview.appspot.com/10855086/diff/1/media/audio/audio_outp...
media/audio/audio_output_proxy_unittest.cc:11: //#include
"media/audio/audio_output_mixer.h"
ditto here + below for all the tests

[DaleCurtis, 2012-08-09 22:46:29]

http://codereview.chromium.org/10855086/diff/1/media/audio/audio_manager_base.cc
File media/audio/audio_manager_base.cc (right):

http://codereview.chromium.org/10855086/diff/1/media/audio/audio_manager_base...
media/audio/audio_manager_base.cc:13: // #include
"media/audio/audio_output_mixer.h"
On 2012/08/09 22:12:39, scherkus wrote:
> this is better handled via an #ifdef
> 
> i.e., after the includes have the following:
> 
> // TODO(dalecurtis): etc...
> #if defined(ENABLE_AUDIO_MIXER)
> #include "media/audio/audio_output_mixer.h"
> #endif
> 
> ... snip ...
> 
> #if defined(ENABLE_AUDIO_MIXER)
> cmd_line->HasSwitch(...)
> #endif 
> 
> 
> that way it's easier to re-enable and the diffs are smaller

Done.

http://codereview.chromium.org/10855086/diff/1/media/audio/audio_manager_base...
media/audio/audio_manager_base.cc:146: // TODO(dalecurtis): Temporarily disabled
while switching over to floats.
On 2012/08/09 22:12:39, scherkus wrote:
> link to bug?

Done.

http://codereview.chromium.org/10855086/diff/1/media/audio/audio_output_mixer.h
File media/audio/audio_output_mixer.h (right):

http://codereview.chromium.org/10855086/diff/1/media/audio/audio_output_mixer...
media/audio/audio_output_mixer.h:46: virtual uint32 OnMoreData(AudioBus*
audio_bus,
On 2012/08/09 22:12:39, scherkus wrote:
> ??

Whoops. Removed.

http://codereview.chromium.org/10855086/diff/1/media/audio/audio_output_proxy...
File media/audio/audio_output_proxy_unittest.cc (right):

http://codereview.chromium.org/10855086/diff/1/media/audio/audio_output_proxy...
media/audio/audio_output_proxy_unittest.cc:11: //#include
"media/audio/audio_output_mixer.h"
On 2012/08/09 22:12:39, scherkus wrote:
> ditto here + below for all the tests

Done.

[scherkus (not reviewing), 2012-08-09 22:48:53]

lgtm w/ nit

http://codereview.chromium.org/10855086/diff/9001/media/media.gyp
File media/media.gyp (left):

http://codereview.chromium.org/10855086/diff/9001/media/media.gyp#oldcode72
media/media.gyp:72: 'audio/audio_output_mixer.cc',
perhaps comment these out + point at bug instead of removing entirely

[DaleCurtis, 2012-08-10 19:44:45]

As mentioned, this won't be committed until OnMoreData is refactored, I'm just
using it for my local branch currently.

http://codereview.chromium.org/10855086/diff/9001/media/media.gyp
File media/media.gyp (left):

http://codereview.chromium.org/10855086/diff/9001/media/media.gyp#oldcode72
media/media.gyp:72: 'audio/audio_output_mixer.cc',
On 2012/08/09 22:48:53, scherkus wrote:
> perhaps comment these out + point at bug instead of removing entirely

Done.

[commit-bot: I haz the power, 2012-08-24 21:22:16]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/dalecurtis@chromium.org/10855086/11001

[commit-bot: I haz the power, 2012-08-24 23:41:51]

Change committed as 153347