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

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: adjusted logging Created 5 years, 4 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') | chromecast/media/audio/audio_manager.cc » ('J')
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 1dc6b81154811202d0be04f11adc6d3385b31ddf..cd061435bb3aca7b46b9744f030038efe87b5604 100644
--- a/chromecast/browser/cast_content_browser_client.cc
+++ b/chromecast/browser/cast_content_browser_client.cc
@@ -23,6 +23,7 @@
#include "chromecast/browser/media/cma_message_filter_host.h"
#include "chromecast/browser/url_request_context_factory.h"
#include "chromecast/common/global_descriptors.h"
+#include "chromecast/media/audio/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"
@@ -74,9 +75,13 @@ CastContentBrowserClient::GetBrowserMessageFilters() {
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::AudioManagerFactory);
+#endif
}
#if !defined(OS_ANDROID)
« no previous file with comments | « no previous file | chromecast/media/BUILD.gn » ('j') | chromecast/media/audio/audio_manager.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698