diff options
| author | alokp <alokp@chromium.org> | 2015-09-19 16:50:28 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-19 23:51:07 +0000 |
| commit | 49923cbbb37f491facae899f9470691d87f5de40 (patch) | |
| tree | 875af5e405fe762baffc2140959966b9d220fb9f /chromecast/browser | |
| parent | 5ccdf4577097476e078ae36cce8d4e2107df86f6 (diff) | |
| download | chromium_src-49923cbbb37f491facae899f9470691d87f5de40.zip chromium_src-49923cbbb37f491facae899f9470691d87f5de40.tar.gz chromium_src-49923cbbb37f491facae899f9470691d87f5de40.tar.bz2 | |
[Chromecast] Plumbs raw audio through CMA backend.
Raw audio path is used by webaudio and pepper audio. Plumbing it
through the CMA backend allows us to consolidate various audio
output paths with CMA backend, which in turn eliminates the need
for additional shlib interface to output raw audio.
Review URL: https://codereview.chromium.org/1308153005
Cr-Commit-Position: refs/heads/master@{#349873}
Diffstat (limited to 'chromecast/browser')
| -rw-r--r-- | chromecast/browser/cast_content_browser_client.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/chromecast/browser/cast_content_browser_client.cc b/chromecast/browser/cast_content_browser_client.cc index c73fa19..b12a230 100644 --- a/chromecast/browser/cast_content_browser_client.cc +++ b/chromecast/browser/cast_content_browser_client.cc @@ -26,6 +26,7 @@ #include "chromecast/browser/service/cast_service_simple.h" #include "chromecast/browser/url_request_context_factory.h" #include "chromecast/common/global_descriptors.h" +#include "chromecast/media/audio/cast_audio_manager_factory.h" #include "chromecast/media/base/media_message_loop.h" #include "chromecast/public/cast_media_shlib.h" #include "chromecast/public/media/media_pipeline_backend.h" @@ -81,9 +82,13 @@ scoped_ptr<CastService> CastContentBrowserClient::CreateCastService( scoped_ptr<::media::AudioManagerFactory> CastContentBrowserClient::CreateAudioManagerFactory() { - // Return nullptr. The factory will not be set, and the statically linked +#if defined(OS_ANDROID) + // Return nullptr. The factory will not be set, and the default // implementation of AudioManager will be used. return scoped_ptr<::media::AudioManagerFactory>(); +#else + return make_scoped_ptr(new media::CastAudioManagerFactory()); +#endif } #if !defined(OS_ANDROID) |