Commit d2400bbb authored by Yu-Hsuan Hsu's avatar Yu-Hsuan Hsu Committed by Commit Bot

Use stream type CRAS_CLIENT_TYPE_LACROS for lacros-chrome

Change stream type to CRAS_CLIENT_TYPE_LACROS for lacros-chrome.
The stream type is used while recording UMA logs in CRAS. So we can
separate data between ash-chrome and lacros-chrome.

BUG=b:167941044

Change-Id: I35a8320bd9b5d372d9f5ac883078d010ed42ee9e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2521473Reviewed-by: default avatarDale Curtis <dalecurtis@chromium.org>
Commit-Queue: Yu-Hsuan Hsu <yuhsuan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#825720}
parent 6aa8eff6
......@@ -537,4 +537,8 @@ void AudioManagerChromeOS::WaitEventOrShutdown(base::WaitableEvent* event) {
base::WaitableEvent::WaitMany(waitables, base::size(waitables));
}
enum CRAS_CLIENT_TYPE AudioManagerChromeOS::GetClientType() {
return CRAS_CLIENT_TYPE_CHROME;
}
} // namespace media
......@@ -43,6 +43,7 @@ class MEDIA_EXPORT AudioManagerChromeOS : public AudioManagerCrasBase {
// AudioManagerCrasBase implementation.
bool IsDefault(const std::string& device_id, bool is_input) override;
enum CRAS_CLIENT_TYPE GetClientType() override;
protected:
AudioParameters GetPreferredOutputStreamParameters(
......
......@@ -167,4 +167,8 @@ bool AudioManagerCras::IsDefault(const std::string& device_id, bool is_input) {
return device_id == AudioDeviceDescription::kDefaultDeviceId;
}
enum CRAS_CLIENT_TYPE AudioManagerCras::GetClientType() {
return CRAS_CLIENT_TYPE_LACROS;
}
} // namespace media
......@@ -36,6 +36,7 @@ class MEDIA_EXPORT AudioManagerCras : public AudioManagerCrasBase {
// AudioManagerCrasBase implementation.
bool IsDefault(const std::string& device_id, bool is_input) override;
enum CRAS_CLIENT_TYPE GetClientType() override;
protected:
AudioParameters GetPreferredOutputStreamParameters(
......
......@@ -48,6 +48,9 @@ class MEDIA_EXPORT AudioManagerCrasBase : public AudioManagerBase {
// Set |is_input| to true for capture devices, false for output.
virtual bool IsDefault(const std::string& device_id, bool is_input) = 0;
// Returns CRAS client type.
virtual enum CRAS_CLIENT_TYPE GetClientType() = 0;
protected:
// Called by MakeLinearOutputStream and MakeLowLatencyOutputStream.
AudioOutputStream* MakeOutputStream(const AudioParameters& params,
......
......@@ -210,7 +210,7 @@ void CrasInputStream::Start(AudioInputCallback* callback) {
}
cras_client_stream_params_set_client_type(stream_params,
CRAS_CLIENT_TYPE_CHROME);
audio_manager_->GetClientType());
if (UseCrasAec())
cras_client_stream_params_enable_aec(stream_params);
......
......@@ -203,7 +203,7 @@ void CrasUnifiedStream::Start(AudioSourceCallback* callback) {
}
cras_client_stream_params_set_client_type(stream_params,
CRAS_CLIENT_TYPE_CHROME);
manager_->GetClientType());
// Before starting the stream, save the number of bytes in a frame for use in
// the callback.
......
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