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

effects/audio/audionoiseeffect.cpp

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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: