oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

audio: removed hardcoded stereo value

Browse Source 
Fixes bug that caused AudioMonitor to only show two channels regardless of the
actual number of channels being mixed.
This commit is contained in:
itsmattkc
2020-04-14 23:55:28 +10:00
parent 2646d424d8
commit fd1ecfae6f
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/audio/bufferaverage.cpp
+3 -4
View File
@@ -22,20 +22,19 @@
OLIVE_NAMESPACE_ENTER
QVector<double> AudioBufferAverage::ProcessAverages(const char *data, int length)
QVector<double> AudioBufferAverage::ProcessAverages(const char *data, int length, int channel_count)
{
// FIXME: Assumes float and stereo
const float* samples = reinterpret_cast<const float*>(data);
int sample_count = static_cast<int>(length / static_cast<int>(sizeof(float)));
int channels = 2;
// Create array of samples to send
QVector<double> averages(channels);
QVector<double> averages(channel_count);
averages.fill(0);
// Add all samples together
for (int i=0;i<sample_count;i++) {
averages[i%channels] = qMax(averages[i%channels], static_cast<double>(qAbs(samples[i])));
averages[i%channel_count] = qMax(averages[i%channel_count], static_cast<double>(qAbs(samples[i])));
}
return averages;
app/audio/bufferaverage.h
+1 -1
View File
@@ -32,7 +32,7 @@ class AudioBufferAverage
public:
AudioBufferAverage() = default;
static QVector<double> ProcessAverages(const char* data, int length);
static QVector<double> ProcessAverages(const char* data, int length, int channel_count);
};
OLIVE_NAMESPACE_EXIT
app/audio/outputdeviceproxy.cpp
+1 -1
View File
@@ -94,7 +94,7 @@ qint64 AudioOutputDeviceProxy::readData(char *data, qint64 maxlen)
// If we read any
if (read_count > 0 && send_averages_) {
emit ProcessedAverages(AudioBufferAverage::ProcessAverages(data, static_cast<int>(read_count)));
emit ProcessedAverages(AudioBufferAverage::ProcessAverages(data, static_cast<int>(read_count), params_.channel_count()));
}
return read_count;
app/audio/outputmanager.cpp
+1 -1
View File
@@ -151,7 +151,7 @@ void AudioOutputManager::ProcessAverages(const char *data, int length)
return;
}
emit SentSamples(AudioBufferAverage::ProcessAverages(data, length));
emit SentSamples(AudioBufferAverage::ProcessAverages(data, length, output_.get()->format().channelCount()));
}
OLIVE_NAMESPACE_EXIT