diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-05-20 09:47:09 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-06-07 11:15:42 +0000 |
commit | 189d4fd8fad9e3c776873be51938cd31a42b6177 (patch) | |
tree | 6497caeff5e383937996768766ab3bb2081a40b2 /chromium/media/audio/win/core_audio_util_win.cc | |
parent | 8bc75099d364490b22f43a7ce366b366c08f4164 (diff) | |
download | qtwebengine-chromium-189d4fd8fad9e3c776873be51938cd31a42b6177.tar.gz |
BASELINE: Update Chromium to 90.0.4430.221
Change-Id: Iff4d9d18d2fcf1a576f3b1f453010f744a232920
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/media/audio/win/core_audio_util_win.cc')
-rw-r--r-- | chromium/media/audio/win/core_audio_util_win.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chromium/media/audio/win/core_audio_util_win.cc b/chromium/media/audio/win/core_audio_util_win.cc index 47597841dc0..0281167b4be 100644 --- a/chromium/media/audio/win/core_audio_util_win.cc +++ b/chromium/media/audio/win/core_audio_util_win.cc @@ -477,7 +477,7 @@ ComPtr<IMMDevice> CreateDeviceInternal(const std::string& device_id, // interface for the *rendering* endpoint device. hr = device_enum->GetDefaultAudioEndpoint(eRender, role, &endpoint_device); } else { - hr = device_enum->GetDevice(base::UTF8ToUTF16(device_id).c_str(), + hr = device_enum->GetDevice(base::UTF8ToWide(device_id).c_str(), &endpoint_device); } DVLOG_IF(1, FAILED(hr)) << "Create Device failed: " << std::hex << hr; @@ -685,7 +685,7 @@ std::string CoreAudioUtil::ErrorToString(HRESULT hresult) { // method returns the HRESULT minus 0x80040200; otherwise, it returns zero. return base::StringPrintf("HRESULT: 0x%08lX, WCode: %u, message: \"%s\"", error.Error(), error.WCode(), - base::UTF16ToUTF8(error.ErrorMessage()).c_str()); + base::WideToUTF8(error.ErrorMessage()).c_str()); } std::string CoreAudioUtil::WaveFormatToString(const WaveFormatWrapper format) { |