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

made tone effect, doesn't yet work on NULL clips

Browse Source
This commit is contained in:
itsmattkc
2018-09-09 16:36:50 +10:00
parent 779e6b0a24
commit 96802e971a
14 changed files with 141 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
effects/audio/audionoiseeffect.cpp
+2 -2
View File
@@ -33,8 +33,8 @@ void AudioNoiseEffect::process_audio(double timecode_start, double timecode_end,
if (mix_val->get_bool_value(timecode)) {
qint16 left_sample = (qint16) (((samples[i+1] & 0xFF) << 8) | (samples[i] & 0xFF));
qint16 right_sample = (qint16) (((samples[i+3] & 0xFF) << 8) | (samples[i+2] & 0xFF));
left_noise_sample += left_sample;
right_noise_sample += right_sample;
left_noise_sample = mixAudioSample(left_noise_sample, left_sample);
right_noise_sample = mixAudioSample(right_noise_sample, right_sample);
}
samples[i+3] = (quint8) (right_noise_sample >> 8);
effects/audio/toneeffect.cpp
+56
View File
@@ -0,0 +1,56 @@
#include "toneeffect.h"
#include <QtMath>
#define TONE_TYPE_SINE 0
#include "project/clip.h"
#include "project/sequence.h"
ToneEffect::ToneEffect(Clip* c) : Effect(c, EFFECT_TYPE_AUDIO, AUDIO_TONE_EFFECT), sinX(0) {
type_val = add_row("Type:")->add_field(EFFECT_FIELD_COMBO);
type_val->add_combo_item("Sine", TONE_TYPE_SINE);
freq_val = add_row("Frequency:")->add_field(EFFECT_FIELD_DOUBLE);
freq_val->set_double_minimum_value(20);
freq_val->set_double_maximum_value(20000);
freq_val->set_double_default_value(1000);
amount_val = add_row("Amount:")->add_field(EFFECT_FIELD_DOUBLE);
amount_val->set_double_minimum_value(0);
amount_val->set_double_maximum_value(100);
amount_val->set_double_default_value(80);
mix_val = add_row("Mix:")->add_field(EFFECT_FIELD_BOOL);
mix_val->set_bool_value(true);
connect(freq_val, SIGNAL(changed()), this, SLOT(field_changed()));
connect(amount_val, SIGNAL(changed()), this, SLOT(field_changed()));
connect(mix_val, SIGNAL(changed()), this, SLOT(field_changed()));
}
void ToneEffect::process_audio(double timecode_start, double timecode_end, quint8 *samples, int nb_bytes, int channel_count) {
double interval = (timecode_end - timecode_start)/nb_bytes;
for (int i=0;i<nb_bytes;i+=4) {
double timecode = timecode_start+(interval*i);
qint16 left_tone_sample = qSin((2*M_PI*sinX*freq_val->get_double_value(timecode))/parent_clip->sequence->audio_frequency)*(amount_val->get_double_value(timecode)*0.01)*INT16_MAX;
qint16 right_tone_sample = left_tone_sample;
// mix with source audio
if (mix_val->get_bool_value(timecode)) {
qint16 left_sample = (qint16) (((samples[i+1] & 0xFF) << 8) | (samples[i] & 0xFF));
qint16 right_sample = (qint16) (((samples[i+3] & 0xFF) << 8) | (samples[i+2] & 0xFF));
left_tone_sample = mixAudioSample(left_tone_sample, left_sample);
right_tone_sample = mixAudioSample(right_tone_sample, right_sample);
}
samples[i+3] = (quint8) (right_tone_sample >> 8);
samples[i+2] = (quint8) right_tone_sample;
samples[i+1] = (quint8) (left_tone_sample >> 8);
samples[i] = (quint8) left_tone_sample;
sinX++;
}
}
effects/audio/toneeffect.h
+19
View File
@@ -0,0 +1,19 @@
#ifndef TONEEFFECT_H
#define TONEEFFECT_H
#include "../effect.h"
class ToneEffect : public Effect {
public:
ToneEffect(Clip *c);
void process_audio(double timecode_start, double timecode_end, quint8* samples, int nb_bytes, int channel_count);
EffectField* type_val;
EffectField* freq_val;
EffectField* amount_val;
EffectField* mix_val;
private:
int sinX;
};
#endif // TONEEFFECT_H
effects/effect.cpp
+9
View File
@@ -31,6 +31,7 @@
#include "effects/audio/paneffect.h"
#include "effects/audio/volumeeffect.h"
#include "effects/audio/audionoiseeffect.h"
#include "effects/audio/toneeffect.h"
#include <QCheckBox>
#include <QGridLayout>
@@ -60,6 +61,7 @@ void init_effects() {
audio_effect_names[AUDIO_VOLUME_EFFECT] = "Volume";
audio_effect_names[AUDIO_PAN_EFFECT] = "Pan";
audio_effect_names[AUDIO_NOISE_EFFECT] = "Noise";
audio_effect_names[AUDIO_TONE_EFFECT] = "Tone";
}
Effect* create_effect(int effect_id, Clip* c) {
@@ -81,6 +83,7 @@ Effect* create_effect(int effect_id, Clip* c) {
case AUDIO_VOLUME_EFFECT: return new VolumeEffect(c); break;
case AUDIO_PAN_EFFECT: return new PanEffect(c); break;
case AUDIO_NOISE_EFFECT: return new AudioNoiseEffect(c); break;
case AUDIO_TONE_EFFECT: return new ToneEffect(c); break;
}
}
qDebug() << "[ERROR] Invalid effect ID";
@@ -814,3 +817,9 @@ QColor EffectField::get_color_value(double timecode) {
void EffectField::set_color_value(QColor color) {
static_cast<ColorButton*>(ui_element)->set_color(color);
}
qint16 mixAudioSample(qint16 a, qint16 b) {
qint32 mixed_sample = static_cast<qint32>(a) + static_cast<qint32>(b);
mixed_sample = qMax(qMin(mixed_sample, static_cast<qint32>(INT16_MAX)), static_cast<qint32>(INT16_MIN));
return static_cast<qint16>(mixed_sample);
}
effects/effect.h
+3
View File
@@ -39,6 +39,7 @@ enum AudioEffects {
AUDIO_VOLUME_EFFECT,
AUDIO_PAN_EFFECT,
AUDIO_NOISE_EFFECT,
AUDIO_TONE_EFFECT,
AUDIO_EFFECT_COUNT
};
@@ -82,6 +83,8 @@ struct GLTextureCoords {
double textureBottomLeftY;
};
qint16 mixAudioSample(qint16 a, qint16 b);
class EffectField : public QObject {
Q_OBJECT
public:
olive.pro
+4 -2
View File
@@ -78,7 +78,8 @@ SOURCES += \
effects/video/flipeffect.cpp \
effects/audio/audionoiseeffect.cpp \
effects/video/boxblureffect.cpp \
dialogs/demonotice.cpp
dialogs/demonotice.cpp \
effects/audio/toneeffect.cpp
HEADERS += \
mainwindow.h \
@@ -133,7 +134,8 @@ HEADERS += \
effects/video/flipeffect.h \
effects/audio/audionoiseeffect.h \
effects/video/boxblureffect.h \
dialogs/demonotice.h
dialogs/demonotice.h \
effects/audio/toneeffect.h
FORMS += \
mainwindow.ui \
panels/timeline.cpp
+6 -12
View File
@@ -1173,10 +1173,15 @@ void Timeline::on_addButton_clicked() {
add_menu.addAction(solidMenuItem);
QAction* barsMenuItem = new QAction(&add_menu);
barsMenuItem->setText("Bars and Tone...");
barsMenuItem->setText("Bars...");
barsMenuItem->setData(ADD_OBJ_BARS);
add_menu.addAction(barsMenuItem);
QAction* toneMenuItem = new QAction(&add_menu);
toneMenuItem->setText("Tone...");
toneMenuItem->setData(ADD_OBJ_TONE);
add_menu.addAction(toneMenuItem);
connect(&add_menu, SIGNAL(triggered(QAction*)), this, SLOT(addMenuItem(QAction*)));
add_menu.exec(QCursor::pos());
@@ -1185,15 +1190,4 @@ void Timeline::on_addButton_clicked() {
void Timeline::addMenuItem(QAction* action) {
creating = true;
creatingObject = action->data().toInt();
/*switch (action->data()) {
case ADD_OBJ_TITLE:
break;
case ADD_OBJ_SOLID:
break;
case ADD_OBJ_BARS:
break;
}*/
}
panels/timeline.h
+1
View File
@@ -13,6 +13,7 @@
#define ADD_OBJ_TITLE 0
#define ADD_OBJ_SOLID 1
#define ADD_OBJ_BARS 2
#define ADD_OBJ_TONE 3
class QPushButton;
class SourceTable;
playback/cacher.cpp
+1 -2
View File
@@ -155,8 +155,7 @@ void cache_audio_worker(Clip* c, Clip* nest) {
int lower_byte_index = (c->audio_buffer_write)%audio_ibuffer_size;
qint16 old_sample = static_cast<qint16>((audio_ibuffer[upper_byte_index] & 0xFF) << 8 | (audio_ibuffer[lower_byte_index] & 0xFF));
qint16 new_sample = static_cast<qint16>((frame->data[0][c->frame_sample_index+1] & 0xFF) << 8 | (frame->data[0][c->frame_sample_index] & 0xFF));
qint32 mixed_sample = static_cast<qint32>(old_sample) + static_cast<qint32>(new_sample);
mixed_sample = qMax(qMin(mixed_sample, static_cast<qint32>(INT16_MAX)), static_cast<qint32>(INT16_MIN));
qint16 mixed_sample = mixAudioSample(old_sample, new_sample);
audio_ibuffer[upper_byte_index] = static_cast<quint8>((mixed_sample >> 8) & 0xFF);
audio_ibuffer[lower_byte_index] = static_cast<quint8>(mixed_sample & 0xFF);
playback/playback.cpp
+11 -9
View File
@@ -92,16 +92,18 @@ void close_clip(Clip* clip) {
}
void cache_clip(Clip* clip, long playhead, bool write_A, bool write_B, bool reset, Clip* nest) {
if (clip->multithreaded) {
clip->cacher->playhead = playhead;
clip->cacher->write_A = write_A;
clip->cacher->write_B = write_B;
clip->cacher->reset = reset;
clip->cacher->nest = nest;
if (clip->media_type == MEDIA_TYPE_FOOTAGE) {
if (clip->multithreaded) {
clip->cacher->playhead = playhead;
clip->cacher->write_A = write_A;
clip->cacher->write_B = write_B;
clip->cacher->reset = reset;
clip->cacher->nest = nest;
clip->can_cache.wakeAll();
} else {
cache_clip_worker(clip, playhead, write_A, write_B, reset, nest);
clip->can_cache.wakeAll();
} else {
cache_clip_worker(clip, playhead, write_A, write_B, reset, nest);
}
}
}
ui/timelineheader.cpp
+7 -3
View File
@@ -126,13 +126,17 @@ void TimelineHeader::paintEvent(QPaintEvent*) {
QPainter p(this);
p.setPen(Qt::gray);
int interval = 0;
int multiplier = 0;
int multiplier = 0;
do {
multiplier++;
interval = getScreenPointFromFrame(zoom, sequence->frame_rate*multiplier);
interval = getScreenPointFromFrame(zoom, 1*multiplier);
} while (interval < 10);
for (int i=0;i<width();i+=interval) {
p.drawLine(i, 0, i, height());
int drawHeight = height();
if (i%5 > 0) {
drawHeight = drawHeight>>1;
}
p.drawLine(i, 0, i, drawHeight);
}
// draw in/out selection
ui/timelinewidget.cpp
+19 -9
View File
@@ -26,6 +26,7 @@
#include <QMenu>
#include <QMessageBox>
#include <QtMath>
#include <QScrollBar>
#define MAX_TEXT_WIDTH 20
@@ -542,14 +543,6 @@ void TimelineWidget::mouseReleaseEvent(QMouseEvent *event) {
c->color_b = 64;
c->track = g.track;
Selection s;
s.in = c->timeline_in;
s.out = c->timeline_out;
s.track = c->track;
QVector<Selection> areas;
areas.append(s);
panel_timeline->delete_areas_and_relink(ta, areas);
QVector<Clip*> add;
add.append(c);
ta->add_clips(sequence, add);
@@ -566,11 +559,23 @@ void TimelineWidget::mouseReleaseEvent(QMouseEvent *event) {
ta->add_effect(sequence, clipIndex, VIDEO_SOLID_EFFECT);
break;
case ADD_OBJ_BARS:
c->name = "Bars and Tone";
c->name = "Bars";
ta->add_effect(sequence, clipIndex, VIDEO_SOLID_EFFECT);
break;
case ADD_OBJ_TONE:
c->name = "Tone";
ta->add_effect(sequence, clipIndex, AUDIO_TONE_EFFECT);
break;
}
Selection s;
s.in = c->timeline_in;
s.out = c->timeline_out;
s.track = c->track;
QVector<Selection> areas;
areas.append(s);
panel_timeline->delete_areas_and_relink(ta, areas);
undo_stack.push(ta);
// pretty hacky
@@ -1650,7 +1655,12 @@ void TimelineWidget::redraw_clips() {
if (minimumWidth() != panel_width || clip_pixmap.height() != height() || panel_height != minimumHeight()) {
panel_timeline->ui->headers->setMinimumWidth(panel_width + 100);
setMinimumWidth(panel_width);
int scrollOffset = (panel_height-minimumHeight());
setMinimumHeight(panel_height);
if (bottom_align) {
updateGeometry();
container->verticalScrollBar()->setValue(container->verticalScrollBar()->value()+scrollOffset);
}
clip_pixmap = QPixmap(qMax(width(), panel_width), qMax(height(), panel_height));
}
ui/timelinewidget.h
+2 -1
View File
@@ -14,6 +14,7 @@ struct Sequence;
struct Clip;
class Timeline;
class TimelineAction;
class QScrollArea;
bool same_sign(int a, int b);
@@ -26,7 +27,7 @@ public:
void redraw_clips();
QWidget* container;
QScrollArea* container;
protected:
void paintEvent(QPaintEvent*);
void resizeEvent(QResizeEvent*);
ui/viewerwidget.cpp
+1 -1
View File
@@ -309,7 +309,7 @@ GLuint ViewerWidget::compose_sequence(Clip* nest, bool render_audio) {
glPopMatrix();
} else {
if (c->media_type == MEDIA_TYPE_FOOTAGE
if ((c->media_type == MEDIA_TYPE_FOOTAGE || c->media_type == MEDIA_TYPE_SOLID)
&& render_audio
&& c->lock.tryLock()) {
// clip is not caching, start caching audio