mirror of
https://github.com/overte-org/overte.git
synced 2025-08-10 18:33:01 +02:00
implement peakValueListChanged
This commit is contained in:
parent
b46219241c
commit
3f57e5eb4d
3 changed files with 169 additions and 6 deletions
|
@ -77,7 +77,7 @@ Setting::Handle<int> staticJitterBufferFrames("staticJitterBufferFrames",
|
||||||
// protect the Qt internal device list
|
// protect the Qt internal device list
|
||||||
using Mutex = std::mutex;
|
using Mutex = std::mutex;
|
||||||
using Lock = std::unique_lock<Mutex>;
|
using Lock = std::unique_lock<Mutex>;
|
||||||
static Mutex _deviceMutex;
|
Mutex _deviceMutex;
|
||||||
|
|
||||||
// thread-safe
|
// thread-safe
|
||||||
QList<QAudioDeviceInfo> getAvailableDevices(QAudio::Mode mode) {
|
QList<QAudioDeviceInfo> getAvailableDevices(QAudio::Mode mode) {
|
||||||
|
@ -235,7 +235,7 @@ AudioClient::AudioClient() :
|
||||||
QtConcurrent::run(QThreadPool::globalInstance(), [this] { checkPeakValues(); });
|
QtConcurrent::run(QThreadPool::globalInstance(), [this] { checkPeakValues(); });
|
||||||
});
|
});
|
||||||
const unsigned long PEAK_VALUES_CHECK_INTERVAL_SECS = 50;
|
const unsigned long PEAK_VALUES_CHECK_INTERVAL_SECS = 50;
|
||||||
|
_checkPeakValuesTimer->start(PEAK_VALUES_CHECK_INTERVAL_SECS);
|
||||||
|
|
||||||
configureReverb();
|
configureReverb();
|
||||||
|
|
||||||
|
@ -308,8 +308,6 @@ QString getWinDeviceName(IMMDevice* pEndpoint) {
|
||||||
QString deviceName;
|
QString deviceName;
|
||||||
IPropertyStore* pPropertyStore;
|
IPropertyStore* pPropertyStore;
|
||||||
pEndpoint->OpenPropertyStore(STGM_READ, &pPropertyStore);
|
pEndpoint->OpenPropertyStore(STGM_READ, &pPropertyStore);
|
||||||
pEndpoint->Release();
|
|
||||||
pEndpoint = nullptr;
|
|
||||||
PROPVARIANT pv;
|
PROPVARIANT pv;
|
||||||
PropVariantInit(&pv);
|
PropVariantInit(&pv);
|
||||||
HRESULT hr = pPropertyStore->GetValue(PKEY_Device_FriendlyName, &pv);
|
HRESULT hr = pPropertyStore->GetValue(PKEY_Device_FriendlyName, &pv);
|
||||||
|
@ -338,6 +336,8 @@ QString AudioClient::getWinDeviceName(wchar_t* guid) {
|
||||||
deviceName = QString("NONE");
|
deviceName = QString("NONE");
|
||||||
} else {
|
} else {
|
||||||
deviceName = ::getWinDeviceName(pEndpoint);
|
deviceName = ::getWinDeviceName(pEndpoint);
|
||||||
|
pEndpoint->Release();
|
||||||
|
pEndpoint = nullptr;
|
||||||
}
|
}
|
||||||
pMMDeviceEnumerator->Release();
|
pMMDeviceEnumerator->Release();
|
||||||
pMMDeviceEnumerator = nullptr;
|
pMMDeviceEnumerator = nullptr;
|
||||||
|
@ -421,6 +421,8 @@ QAudioDeviceInfo defaultAudioDeviceForMode(QAudio::Mode mode) {
|
||||||
deviceName = QString("NONE");
|
deviceName = QString("NONE");
|
||||||
} else {
|
} else {
|
||||||
deviceName = getWinDeviceName(pEndpoint);
|
deviceName = getWinDeviceName(pEndpoint);
|
||||||
|
pEndpoint->Release();
|
||||||
|
pEndpoint = nullptr;
|
||||||
}
|
}
|
||||||
pMMDeviceEnumerator->Release();
|
pMMDeviceEnumerator->Release();
|
||||||
pMMDeviceEnumerator = NULL;
|
pMMDeviceEnumerator = NULL;
|
||||||
|
|
|
@ -149,6 +149,7 @@ public:
|
||||||
QList<QAudioDeviceInfo> getAudioDevices(QAudio::Mode mode) const;
|
QList<QAudioDeviceInfo> getAudioDevices(QAudio::Mode mode) const;
|
||||||
|
|
||||||
void enablePeakValues(bool enable) { _enablePeakValues = enable; }
|
void enablePeakValues(bool enable) { _enablePeakValues = enable; }
|
||||||
|
bool peakValuesAvailable() const;
|
||||||
|
|
||||||
static const float CALLBACK_ACCELERATOR_RATIO;
|
static const float CALLBACK_ACCELERATOR_RATIO;
|
||||||
|
|
||||||
|
|
|
@ -11,6 +11,166 @@
|
||||||
|
|
||||||
#include "AudioClient.h"
|
#include "AudioClient.h"
|
||||||
|
|
||||||
void AudioClient::checkPeakValues() {
|
#ifdef Q_OS_WIN
|
||||||
// TODO
|
|
||||||
|
#include <windows.h>
|
||||||
|
#include <mmdeviceapi.h>
|
||||||
|
#include <endpointvolume.h>
|
||||||
|
#include <audioclient.h>
|
||||||
|
|
||||||
|
#include <QString>
|
||||||
|
|
||||||
|
#define RETURN_ON_FAIL(result) if (FAILED(result)) { return; }
|
||||||
|
#define CONTINUE_ON_FAIL(result) if (FAILED(result)) { continue; }
|
||||||
|
|
||||||
|
extern QString getWinDeviceName(IMMDevice* pEndpoint);
|
||||||
|
extern std::mutex _deviceMutex;
|
||||||
|
|
||||||
|
std::map<std::wstring, std::shared_ptr<IAudioClient>> activeClients;
|
||||||
|
|
||||||
|
template <class T>
|
||||||
|
void release(T* t) {
|
||||||
|
t->Release();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
template <>
|
||||||
|
void release(IAudioClient* audioClient) {
|
||||||
|
audioClient->Stop();
|
||||||
|
audioClient->Release();
|
||||||
|
}
|
||||||
|
|
||||||
|
void AudioClient::checkPeakValues() {
|
||||||
|
// prepare the windows environment
|
||||||
|
CoInitialize(NULL);
|
||||||
|
|
||||||
|
// if disabled, clean up active clients
|
||||||
|
if (!_enablePeakValues) {
|
||||||
|
activeClients.clear();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// lock the devices so the _inputDevices list is static
|
||||||
|
std::unique_lock<std::mutex> lock(_deviceMutex);
|
||||||
|
HRESULT result;
|
||||||
|
|
||||||
|
// initialize the payload
|
||||||
|
QList<float> peakValueList;
|
||||||
|
for (int i = 0; i < _inputDevices.size(); ++i) {
|
||||||
|
peakValueList.push_back(0.0f);
|
||||||
|
}
|
||||||
|
|
||||||
|
std::shared_ptr<IMMDeviceEnumerator> enumerator;
|
||||||
|
{
|
||||||
|
IMMDeviceEnumerator* pEnumerator;
|
||||||
|
result = CoCreateInstance(
|
||||||
|
__uuidof(MMDeviceEnumerator), NULL, CLSCTX_INPROC_SERVER,
|
||||||
|
__uuidof(IMMDeviceEnumerator), (void**)&pEnumerator);
|
||||||
|
RETURN_ON_FAIL(result);
|
||||||
|
enumerator = std::shared_ptr<IMMDeviceEnumerator>(pEnumerator, &release<IMMDeviceEnumerator>);
|
||||||
|
}
|
||||||
|
|
||||||
|
std::shared_ptr<IMMDeviceCollection> endpoints;
|
||||||
|
{
|
||||||
|
IMMDeviceCollection* pEndpoints;
|
||||||
|
result = enumerator->EnumAudioEndpoints(eCapture, DEVICE_STATE_ACTIVE, &pEndpoints);
|
||||||
|
RETURN_ON_FAIL(result);
|
||||||
|
endpoints = std::shared_ptr<IMMDeviceCollection>(pEndpoints, &release<IMMDeviceCollection>);
|
||||||
|
}
|
||||||
|
|
||||||
|
UINT count;
|
||||||
|
{
|
||||||
|
result = endpoints->GetCount(&count);
|
||||||
|
RETURN_ON_FAIL(result);
|
||||||
|
}
|
||||||
|
|
||||||
|
IMMDevice* pDevice;
|
||||||
|
std::shared_ptr<IMMDevice> device;
|
||||||
|
IAudioMeterInformation* pMeterInfo;
|
||||||
|
std::shared_ptr<IAudioMeterInformation> meterInfo;
|
||||||
|
IAudioClient* pAudioClient;
|
||||||
|
std::shared_ptr<IAudioClient> audioClient;
|
||||||
|
DWORD hardwareSupport;
|
||||||
|
LPWSTR pDeviceId = NULL;
|
||||||
|
LPWAVEFORMATEX format;
|
||||||
|
float peakValue;
|
||||||
|
QString deviceName;
|
||||||
|
int deviceIndex;
|
||||||
|
for (UINT i = 0; i < count; ++i) {
|
||||||
|
result = endpoints->Item(i, &pDevice);
|
||||||
|
CONTINUE_ON_FAIL(result);
|
||||||
|
device = std::shared_ptr<IMMDevice>(pDevice, &release<IMMDevice>);
|
||||||
|
|
||||||
|
// if the device isn't listed through Qt, skip it
|
||||||
|
deviceName = ::getWinDeviceName(pDevice);
|
||||||
|
deviceIndex = 0;
|
||||||
|
for (; deviceIndex < _inputDevices.size(); ++deviceIndex) {
|
||||||
|
if (deviceName == _inputDevices[deviceIndex].deviceName()) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (deviceIndex >= _inputDevices.size()) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
//continue;
|
||||||
|
|
||||||
|
result = device->Activate(__uuidof(IAudioMeterInformation), CLSCTX_ALL, NULL, (void**)&pMeterInfo);
|
||||||
|
CONTINUE_ON_FAIL(result);
|
||||||
|
meterInfo = std::shared_ptr<IAudioMeterInformation>(pMeterInfo, &release<IAudioMeterInformation>);
|
||||||
|
|
||||||
|
//continue;
|
||||||
|
|
||||||
|
hardwareSupport;
|
||||||
|
result = meterInfo->QueryHardwareSupport(&hardwareSupport);
|
||||||
|
CONTINUE_ON_FAIL(result);
|
||||||
|
|
||||||
|
//continue;
|
||||||
|
|
||||||
|
// if the device has no hardware support (USB)...
|
||||||
|
if (!(hardwareSupport & ENDPOINT_HARDWARE_SUPPORT_METER)) {
|
||||||
|
result = device->GetId(&pDeviceId);
|
||||||
|
CONTINUE_ON_FAIL(result);
|
||||||
|
std::wstring deviceId(pDeviceId);
|
||||||
|
CoTaskMemFree(pDeviceId);
|
||||||
|
|
||||||
|
//continue;
|
||||||
|
|
||||||
|
// ...and no active client...
|
||||||
|
if (activeClients.find(deviceId) == activeClients.end()) {
|
||||||
|
result = device->Activate(__uuidof(IAudioClient), CLSCTX_ALL, NULL, (void**)&pAudioClient);
|
||||||
|
CONTINUE_ON_FAIL(result);
|
||||||
|
audioClient = std::shared_ptr<IAudioClient>(pAudioClient, &release<IAudioClient>);
|
||||||
|
|
||||||
|
//continue;
|
||||||
|
|
||||||
|
// ...activate a client
|
||||||
|
audioClient->GetMixFormat(&format);
|
||||||
|
audioClient->Initialize(AUDCLNT_SHAREMODE_SHARED, 0, 0, 0, format, NULL);
|
||||||
|
audioClient->Start();
|
||||||
|
|
||||||
|
//continue;
|
||||||
|
|
||||||
|
activeClients[deviceId] = audioClient;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// get the peak value and put it in the payload
|
||||||
|
meterInfo->GetPeakValue(&peakValue);
|
||||||
|
peakValueList[deviceIndex] = peakValue;
|
||||||
|
}
|
||||||
|
|
||||||
|
emit peakValueListChanged(peakValueList);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool AudioClient::peakValuesAvailable() const {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
#else
|
||||||
|
void AudioClient::checkPeakValues() {
|
||||||
|
}
|
||||||
|
|
||||||
|
bool AudioClient::peakValuesAvailable() const {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
#endif
|
Loading…
Reference in a new issue