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

fixed audio monitor regression

Browse Source
This commit is contained in:
itsmattkc
2019-01-22 12:57:00 +11:00
parent efc868d217
commit e7f05ff64b
5 changed files with 77 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/audiomonitor.cpp
+38 -63
View File
@@ -9,6 +9,8 @@
#include <QLinearGradient>
#include <QtMath>
#include <QDebug>
#define AUDIO_MONITOR_PEAK_HEIGHT 15
#define AUDIO_MONITOR_GAP 3
@@ -16,79 +18,52 @@ extern "C" {
#include "libavformat/avformat.h"
}
AudioMonitor::AudioMonitor(QWidget *parent) : QWidget(parent) {
reset();
AudioMonitor::AudioMonitor(QWidget *parent) :
QWidget(parent)
{
values.resize(2);
values.fill(1.0);
}
void AudioMonitor::reset() {
sample_cache_offset = -1;
sample_cache.clear();
update();
void AudioMonitor::set_value(const QVector<double> &ivalues) {
values = ivalues;
update();
}
void AudioMonitor::resizeEvent(QResizeEvent *e) {
gradient = QLinearGradient(QPoint(0, rect().top()), QPoint(0, rect().bottom()));
gradient.setColorAt(0, Qt::red);
gradient.setColorAt(0.25, Qt::yellow);
gradient.setColorAt(1, Qt::green);
QWidget::resizeEvent(e);
gradient = QLinearGradient(QPoint(0, rect().top()), QPoint(0, rect().bottom()));
gradient.setColorAt(0, Qt::red);
gradient.setColorAt(0.25, Qt::yellow);
gradient.setColorAt(1, Qt::green);
QWidget::resizeEvent(e);
}
void AudioMonitor::paintEvent(QPaintEvent *) {
if (sequence != nullptr) {
QPainter p(this);
int channel_x = AUDIO_MONITOR_GAP;
int channel_count = av_get_channel_layout_nb_channels(sequence->audio_layout);
/*if (peaks.size() != channel_count) {
peaks.resize(channel_count);
peaks.fill(false);
}*/
int channel_width = (width()/channel_count) - AUDIO_MONITOR_GAP;
long playhead_offset = -1;
int i;
for (i=0;i<channel_count;i++) {
QRect r(channel_x, AUDIO_MONITOR_PEAK_HEIGHT + AUDIO_MONITOR_GAP, channel_width, height());
p.fillRect(r, gradient);
if (sequence != nullptr) {
QPainter p(this);
int channel_x = AUDIO_MONITOR_GAP;
// int channel_count = av_get_channel_layout_nb_channels(sequence->audio_layout);
int channel_count = values.size();
int channel_width = (width()/channel_count) - AUDIO_MONITOR_GAP;
int i;
for (i=0;i<channel_count;i++) {
QRect r(channel_x, AUDIO_MONITOR_PEAK_HEIGHT + AUDIO_MONITOR_GAP, channel_width, height());
p.fillRect(r, gradient);
if (sample_cache_offset != -1 && sample_cache.size() > 0) {
playhead_offset = (sequence->playhead - sample_cache_offset) * channel_count;
if (playhead_offset >= 0 && playhead_offset < sample_cache.size()) {
double multiplier = 1 - qAbs((double) sample_cache.at(playhead_offset+i) / 32768.0); // 16-bit int divided to float
/*if (multiplier == (double) 0) {
peaks[i] = true;
}*/
r.setHeight(r.height()*multiplier);
} else {
reset();
}
}
bool peak = false;
/*QRect peak_rect(channel_x, 0, channel_width, AUDIO_MONITOR_PEAK_HEIGHT);
if (peaks.at(i)) {
p.fillRect(peak_rect, QColor(255, 0, 0));
} else {
p.fillRect(peak_rect, QColor(64, 0, 0));
}*/
r.setHeight(qRound(r.height()*(values.at(i))));
p.fillRect(r, QColor(0, 0, 0, 160));
QRect peak_rect(channel_x, 0, channel_width, AUDIO_MONITOR_PEAK_HEIGHT);
if (peak) {
p.fillRect(peak_rect, QColor(255, 0, 0));
} else {
p.fillRect(peak_rect, QColor(64, 0, 0));
}
channel_x += channel_width + AUDIO_MONITOR_GAP;
}
if (playhead_offset > -1) {
// clean up used samples
bool error = false;
while (sample_cache_offset < sequence->playhead && !error) {
sample_cache_offset++;
for (i=0;i<channel_count;i++) {
if (sample_cache.isEmpty()) {
reset();
error = true;
break;
} else {
sample_cache.removeFirst();
}
}
}
}
}
p.fillRect(r, QColor(0, 0, 0, 160));
channel_x += channel_width + AUDIO_MONITOR_GAP;
}
}
}