Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4556)

Unified Diff: chromecast/browser/cast_content_browser_client.cc

Issue 1308153005: [Chromecast] Plumbs raw audio through CMA backend. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixed cast_shell compile error Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chromecast/media/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromecast/browser/cast_content_browser_client.cc
diff --git a/chromecast/browser/cast_content_browser_client.cc b/chromecast/browser/cast_content_browser_client.cc
index c73fa19abe1a435c804cbbf823bacf38c6c91de4..b12a2307eeed662e7195fea43297546d2038cbee 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)
« no previous file with comments | « no previous file | chromecast/media/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698