Commit 2ae95ec8 authored by jennyz's avatar jennyz Committed by Commit bot

Expose stable_device_id in audio extension apis.

BUG=466768

Review URL: https://codereview.chromium.org/1584613003

Cr-Commit-Position: refs/heads/master@{#370730}
parent 5183c428
......@@ -25,15 +25,21 @@ using chromeos::AudioNode;
using chromeos::AudioNodeList;
const uint64_t kJabraSpeaker1Id = 30001;
const uint64_t kJabraSpeaker1StableDeviceId = 80001;
const uint64_t kJabraSpeaker2Id = 30002;
const uint64_t kJabraSpeaker2StableDeviceId = 80002;
const uint64_t kHDMIOutputId = 30003;
const uint64_t kHDMIOutputStabeDevicelId = 80003;
const uint64_t kJabraMic1Id = 40001;
const uint64_t kJabraMic1StableDeviceId = 90001;
const uint64_t kJabraMic2Id = 40002;
const uint64_t kJabraMic2StableDeviceId = 90002;
const uint64_t kWebcamMicId = 40003;
const uint64_t kWebcamMicStableDeviceId = 90003;
const AudioNode kJabraSpeaker1(false,
kJabraSpeaker1Id,
kJabraSpeaker1Id,
kJabraSpeaker1StableDeviceId,
"Jabra Speaker",
"USB",
"Jabra Speaker 1",
......@@ -42,7 +48,7 @@ const AudioNode kJabraSpeaker1(false,
const AudioNode kJabraSpeaker2(false,
kJabraSpeaker2Id,
kJabraSpeaker2Id,
kJabraSpeaker2StableDeviceId,
"Jabra Speaker",
"USB",
"Jabra Speaker 2",
......@@ -51,7 +57,7 @@ const AudioNode kJabraSpeaker2(false,
const AudioNode kHDMIOutput(false,
kHDMIOutputId,
kHDMIOutputId,
kHDMIOutputStabeDevicelId,
"HDMI output",
"HDMI",
"HDA Intel MID",
......@@ -60,7 +66,7 @@ const AudioNode kHDMIOutput(false,
const AudioNode kJabraMic1(true,
kJabraMic1Id,
kJabraMic1Id,
kJabraMic1StableDeviceId,
"Jabra Mic",
"USB",
"Jabra Mic 1",
......@@ -69,7 +75,7 @@ const AudioNode kJabraMic1(true,
const AudioNode kJabraMic2(true,
kJabraMic2Id,
kJabraMic2Id,
kJabraMic2StableDeviceId,
"Jabra Mic",
"USB",
"Jabra Mic 2",
......@@ -78,7 +84,7 @@ const AudioNode kJabraMic2(true,
const AudioNode kUSBCameraMic(true,
kWebcamMicId,
kWebcamMicId,
kWebcamMicStableDeviceId,
"Webcam Mic",
"USB",
"Logitech Webcam",
......
......@@ -273,8 +273,8 @@ void AudioServiceImpl::NotifyDevicesChanged() {
? cras_audio_handler_->GetOutputVolumePercentForDevice(
devices[i].id)
: cras_audio_handler_->GetInputGainPercentForDevice(devices[i].id);
// TODO(jennyz): Set stable_device_id once it is implemented.
// See crbug.com/466768.
info->stable_device_id.reset(
new std::string(base::Uint64ToString(devices[i].stable_device_id)));
devices_info_list.push_back(info);
}
......
......@@ -5,6 +5,7 @@
chrome.audio.OnDevicesChanged.addListener(function (devices) {
if (devices.length === 3) {
if (devices[0].id != "30001" ||
devices[0].stableDeviceId != "80001" ||
devices[0].isInput != false ||
devices[0].deviceType != "USB" ||
devices[0].deviceName != "Jabra Speaker" ||
......@@ -14,6 +15,7 @@ chrome.audio.OnDevicesChanged.addListener(function (devices) {
chrome.test.sendMessage("failure");
}
if (devices[1].id != "30002" ||
devices[1].stableDeviceId != "80002" ||
devices[1].isInput != false ||
devices[1].deviceType != "USB" ||
devices[1].deviceName != "Jabra Speaker" ||
......@@ -23,6 +25,7 @@ chrome.audio.OnDevicesChanged.addListener(function (devices) {
chrome.test.sendMessage("failure");
}
if (devices[2].id != "30003" ||
devices[2].stableDeviceId != "80003" ||
devices[2].isInput != false ||
devices[2].deviceType != "HDMI" ||
devices[2].deviceName != "HDMI output" ||
......
......@@ -5,6 +5,7 @@
chrome.audio.OnDevicesChanged.addListener(function (devices) {
if (devices.length === 2) {
if (devices[0].id != "40001" ||
devices[0].stableDeviceId != "90001" ||
devices[0].isInput != true ||
devices[0].deviceType != "USB" ||
devices[0].deviceName != "Jabra Mic" ||
......@@ -14,6 +15,7 @@ chrome.audio.OnDevicesChanged.addListener(function (devices) {
chrome.test.sendMessage("failure");
}
if (devices[1].id != "40002" ||
devices[1].stableDeviceId != "90002" ||
devices[1].isInput != true ||
devices[1].deviceType != "USB" ||
devices[1].deviceName != "Jabra Mic" ||
......
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