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

Unified Diff: chromecast/media/service/cast_renderer.cc

Issue 2722673004: Revert of [Chromecast] Process streams with different post-processing. (Closed)
Patch Set: Created 3 years, 10 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
Index: chromecast/media/service/cast_renderer.cc
diff --git a/chromecast/media/service/cast_renderer.cc b/chromecast/media/service/cast_renderer.cc
index 858c67b1531fae0404e02c12c996303d57dc83a2..99cda42c5e11635e955f577fa7c6e1848f8c2190 100644
--- a/chromecast/media/service/cast_renderer.cc
+++ b/chromecast/media/service/cast_renderer.cc
@@ -7,7 +7,6 @@
#include "base/bind.h"
#include "base/single_thread_task_runner.h"
#include "chromecast/base/task_runner_impl.h"
-#include "chromecast/media/base/audio_device_ids.h"
#include "chromecast/media/base/video_mode_switcher.h"
#include "chromecast/media/base/video_resolution_policy.h"
#include "chromecast/media/cdm/cast_cdm_context.h"
@@ -18,7 +17,6 @@
#include "chromecast/media/cma/pipeline/video_pipeline_client.h"
#include "chromecast/public/media/media_pipeline_backend.h"
#include "chromecast/public/media/media_pipeline_device_params.h"
-#include "media/audio/audio_device_description.h"
#include "media/base/audio_decoder_config.h"
#include "media/base/demuxer_stream.h"
#include "media/base/media_log.h"
@@ -94,20 +92,7 @@
(load_type == kLoadTypeMediaStream)
? MediaPipelineDeviceParams::kModeIgnorePts
: MediaPipelineDeviceParams::kModeSyncPts;
- std::string device_id = audio_device_id_;
- if (device_id == "")
- device_id = ::media::AudioDeviceDescription::kDefaultDeviceId;
-
- MediaPipelineDeviceParams params(
- sync_type, MediaPipelineDeviceParams::kAudioStreamNormal, device_id,
- backend_task_runner_.get());
-
- if (audio_device_id_ == kTtsAudioDeviceId ||
- audio_device_id_ ==
- ::media::AudioDeviceDescription::kCommunicationsDeviceId) {
- load_type = kLoadTypeCommunication;
- }
-
+ MediaPipelineDeviceParams params(sync_type, backend_task_runner_.get());
std::unique_ptr<MediaPipelineBackend> backend =
backend_factory_->CreateBackend(params, audio_device_id_);
« no previous file with comments | « chromecast/media/cma/pipeline/media_pipeline_impl.cc ('k') | chromecast/public/media/media_pipeline_device_params.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698