Remove atlbase dependency and lowercase Windows header includes.
ATL is being used to avoid a CoTaskMemFree, which we can just do directly.
Change-Id: Id5eddedd3634ca3d9adb9e5b54bc90ad298dd56c
Bug: None
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/132080
Commit-Queue: Noah Richards <noahric@chromium.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Henrik Andreassson <henrika@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27524}
diff --git a/modules/audio_device/win/core_audio_utility_win.cc b/modules/audio_device/win/core_audio_utility_win.cc
index 3a00d48..cfd8749 100644
--- a/modules/audio_device/win/core_audio_utility_win.cc
+++ b/modules/audio_device/win/core_audio_utility_win.cc
@@ -10,8 +10,7 @@
#include "modules/audio_device/win/core_audio_utility_win.h"
-#include <Functiondiscoverykeys_devpkey.h>
-#include <atlbase.h>
+#include <functiondiscoverykeys_devpkey.h>
#include <stdio.h>
#include <tchar.h>
@@ -26,7 +25,6 @@
#include "rtc_base/strings/string_builder.h"
#include "rtc_base/win/windows_version.h"
-using ATL::CComHeapPtr;
using Microsoft::WRL::ComPtr;
using webrtc::AudioDeviceName;
using webrtc::AudioParameters;
@@ -303,9 +301,11 @@
std::string GetDeviceIdInternal(IMMDevice* device) {
// Retrieve unique name of endpoint device.
// Example: "{0.0.1.00000000}.{8db6020f-18e3-4f25-b6f5-7726c9122574}".
- CComHeapPtr<WCHAR> device_id;
+ LPWSTR device_id;
if (SUCCEEDED(device->GetId(&device_id))) {
- return rtc::ToUtf8(device_id, wcslen(device_id));
+ std::string device_id_utf8 = rtc::ToUtf8(device_id, wcslen(device_id));
+ CoTaskMemFree(device_id);
+ return device_id_utf8;
} else {
return std::string();
}
@@ -735,10 +735,11 @@
}
// Log the display name of the audio session for debugging purposes.
- CComHeapPtr<WCHAR> display_name;
+ LPWSTR display_name;
if (SUCCEEDED(session_control->GetDisplayName(&display_name))) {
RTC_DLOG(INFO) << "display name: "
<< rtc::ToUtf8(display_name, wcslen(display_name));
+ CoTaskMemFree(display_name);
}
// Get the current state and check if the state is active or not.
diff --git a/modules/audio_device/win/core_audio_utility_win.h b/modules/audio_device/win/core_audio_utility_win.h
index 1307542..0ef16ff 100644
--- a/modules/audio_device/win/core_audio_utility_win.h
+++ b/modules/audio_device/win/core_audio_utility_win.h
@@ -11,11 +11,11 @@
#ifndef MODULES_AUDIO_DEVICE_WIN_CORE_AUDIO_UTILITY_WIN_H_
#define MODULES_AUDIO_DEVICE_WIN_CORE_AUDIO_UTILITY_WIN_H_
-#include <Audioclient.h>
-#include <Audiopolicy.h>
-#include <Mmdeviceapi.h>
+#include <audioclient.h>
+#include <audiopolicy.h>
#include <avrt.h>
#include <comdef.h>
+#include <mmdeviceapi.h>
#include <objbase.h>
#include <propidl.h>
#include <wrl/client.h>