flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-31 12:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

[AFV] Ref T730, pass channel count to input

Browse Source
This commit is contained in:
Klaus Basan
2019-10-13 02:38:23 +02:00
parent f76448fbaf
commit 745eb01000
2 changed files with 10 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/blackcore/afv/audio/input.cpp
View File

@@ -34,8 +34,10 @@ namespace BlackCore
this->setObjectName("CAudioInputBuffer");
}
void CAudioInputBuffer::start()
void CAudioInputBuffer::start(int channelCount)
{
m_channelCount = channelCount;
m_buffer.clear();
if (!this->isOpen())
{
open(QIODevice::WriteOnly | QIODevice::Unbuffered);
@@ -57,34 +59,16 @@ namespace BlackCore
qint64 CAudioInputBuffer::writeData(const char *data, qint64 len)
{
m_buffer.append(data, static_cast<int>(len));
while (m_buffer.size() > 1920)
const int byteCount = 1920 * m_channelCount;
while (m_buffer.size() > byteCount)
{
// qDebug() << QDateTime::currentMSecsSinceEpoch() << "CAudioInputBuffer::writeData " << m_buffer.size();
emit frameAvailable(m_buffer.left(1920));
m_buffer.remove(0, 1920);
emit frameAvailable(m_buffer.left(byteCount));
m_buffer.remove(0, byteCount);
}
return len;
}
/**
void CAudioInputBuffer::timerEvent(QTimerEvent *event)
{
Q_UNUSED(event)
// 20 ms = 960 samples * 2 bytes = 1920 Bytes
if (m_buffer.size() < 1920) { return; }
const qint64 now = QDateTime::currentMSecsSinceEpoch();
const qint64 delta = now - m_lastFrameSent;
if (delta >= 19)
{
// qDebug() << now << "[signal] frameAvailable - buffer size" << m_buffer.size();
m_buffer.remove(0, 1920);
m_lastFrameSent = now;
emit frameAvailable(m_buffer.left(1920));
}
}
**/
CInput::CInput(int sampleRate, QObject *parent) :
QObject(parent),
m_sampleRate(sampleRate),
@@ -116,7 +100,7 @@ namespace BlackCore
QAudioDeviceInfo selectedDevice = getLowestLatencyDevice(inputDevice, m_inputFormat);
m_audioInput.reset(new QAudioInput(selectedDevice, m_inputFormat));
m_audioInputBuffer.start();
m_audioInputBuffer.start(m_inputFormat.channelCount());
#ifdef Q_OS_MAC
CMacOSMicrophoneAccess::AuthorizationStatus status = m_micAccess.getAuthorizationStatus();

3
src/blackcore/afv/audio/input.h
View File

@@ -40,7 +40,7 @@ namespace BlackCore
CAudioInputBuffer(QObject *parent = nullptr);
//! Start
void start();
void start(int channelCount);
//! Stop
void stop();
@@ -58,6 +58,7 @@ namespace BlackCore
private:
static constexpr qint64 frameSize = 960;
QByteArray m_buffer;
int m_channelCount = 1;
};
//! Opus data arguments