Commit a542c2ef authored by jameswest's avatar jameswest Committed by Commit bot

[Chromecast] Fix bug when audio device ID is empty string.

BUG=internal b/36563551

Review-Url: https://codereview.chromium.org/2786493004
Cr-Commit-Position: refs/heads/master@{#460515}
parent dc0d4725
......@@ -55,7 +55,9 @@ CastRenderer::CastRenderer(
MediaResourceTracker* media_resource_tracker)
: backend_factory_(backend_factory),
task_runner_(task_runner),
audio_device_id_(audio_device_id),
audio_device_id_(audio_device_id.empty()
? ::media::AudioDeviceDescription::kDefaultDeviceId
: audio_device_id),
video_mode_switcher_(video_mode_switcher),
video_resolution_policy_(video_resolution_policy),
media_resource_tracker_(media_resource_tracker),
......@@ -95,12 +97,9 @@ void CastRenderer::Initialize(::media::MediaResource* media_resource,
(load_type == kLoadTypeMediaStream)
? MediaPipelineDeviceParams::kModeIgnorePts
: MediaPipelineDeviceParams::kModeSyncPts;
std::string device_id = audio_device_id_;
if (device_id == "")
device_id = ::media::AudioDeviceDescription::kDefaultDeviceId;
AudioContentType content_type;
if (device_id == kAlarmAudioDeviceId) {
if (audio_device_id_ == kAlarmAudioDeviceId) {
content_type = AudioContentType::kAlarm;
} else if (audio_device_id_ == kTtsAudioDeviceId) {
content_type = AudioContentType::kCommunication;
......
......@@ -67,7 +67,7 @@ class CastRenderer : public ::media::Renderer,
MediaPipelineBackendFactory* const backend_factory_;
scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
std::string audio_device_id_;
const std::string audio_device_id_;
VideoModeSwitcher* video_mode_switcher_;
VideoResolutionPolicy* video_resolution_policy_;
MediaResourceTracker* media_resource_tracker_;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment