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

Unified Diff: chromecast/media/audio/cast_audio_manager.cc

Issue 1855633002: Revert of [chromecast] Pass media task runner to MediaPipelineBackendManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Created 4 years, 9 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 | « chromecast/media/audio/cast_audio_manager.h ('k') | chromecast/media/audio/cast_audio_manager_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromecast/media/audio/cast_audio_manager.cc
diff --git a/chromecast/media/audio/cast_audio_manager.cc b/chromecast/media/audio/cast_audio_manager.cc
index 1321e90acab6c0e52620f308ffb9f49602631301..54cd79454398beafd1e73e8aa929027aaf3ad4d8 100644
--- a/chromecast/media/audio/cast_audio_manager.cc
+++ b/chromecast/media/audio/cast_audio_manager.cc
@@ -8,7 +8,10 @@
#include <string>
#include "chromecast/media/audio/cast_audio_output_stream.h"
+#include "chromecast/media/base/media_message_loop.h"
#include "chromecast/media/cma/backend/media_pipeline_backend_manager.h"
+#include "chromecast/public/cast_media_shlib.h"
+#include "chromecast/public/media/media_pipeline_backend.h"
namespace {
// TODO(alokp): Query the preferred value from media backend.
@@ -25,10 +28,8 @@
namespace chromecast {
namespace media {
-CastAudioManager::CastAudioManager(::media::AudioLogFactory* audio_log_factory,
- MediaPipelineBackendManager* backend_manager)
- : AudioManagerBase(audio_log_factory), backend_manager_(backend_manager) {
-}
+CastAudioManager::CastAudioManager(::media::AudioLogFactory* audio_log_factory)
+ : AudioManagerBase(audio_log_factory) {}
CastAudioManager::~CastAudioManager() {
Shutdown();
@@ -63,7 +64,10 @@
scoped_ptr<MediaPipelineBackend> CastAudioManager::CreateMediaPipelineBackend(
const MediaPipelineDeviceParams& params) {
- return backend_manager_->CreateMediaPipelineBackend(params);
+ DCHECK(media::MediaMessageLoop::GetTaskRunner()->BelongsToCurrentThread());
+
+ return scoped_ptr<MediaPipelineBackend>(
+ MediaPipelineBackendManager::CreateMediaPipelineBackend(params));
}
::media::AudioOutputStream* CastAudioManager::MakeLinearOutputStream(
« no previous file with comments | « chromecast/media/audio/cast_audio_manager.h ('k') | chromecast/media/audio/cast_audio_manager_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698