fix some UB
This commit is contained in:
1 parent
003fc0cb1b
commit
5e5f08c4f9
4 files changed
+14
-6
No files matched your search
@@ -1,7 +1,10 @@
|
|||||||
CC = gcc
|
CC = gcc
|
||||||
CFLAGS = -g3 -Wall -Wextra -pedantic -Wconversion -Wdouble-promotion \
|
CFLAGS = -g3 -Wall -Wextra -pedantic -Wconversion -Wdouble-promotion \
|
||||||
-Wno-unused-parameter -Wno-unused-function -Wno-sign-conversion \
|
-Wno-unused-parameter -Wno-unused-function -Wno-sign-conversion \
|
||||||
-fsanitize=undefined -fsanitize-trap -fanalyzer
|
-fsanitize=undefined -fsanitize=float-cast-overflow -fsanitize=float-divide-by-zero \
|
||||||
|
-fsanitize=address
|
||||||
|
#CFLAGS += -fsanitize-trap
|
||||||
|
CFLAGS += -fanalyzer
|
||||||
|
|
||||||
main: main.c synth.c
|
main: main.c synth.c
|
||||||
$(CC) $(CFLAGS) -o main main.c synth.c -lasound -lm
|
$(CC) $(CFLAGS) -o main main.c synth.c -lasound -lm
|
||||||
|
|||||||
@@ -6,6 +6,7 @@
|
|||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include "synth.h"
|
#include "synth.h"
|
||||||
|
|
||||||
|
#define clamp(n, a, b) ((n) < (a) ? (a) : (n) > (b) ? (b) : (n))
|
||||||
#define ALSA_CHK(stmt, msg) do { \
|
#define ALSA_CHK(stmt, msg) do { \
|
||||||
int alsa_chk_err = (stmt); \
|
int alsa_chk_err = (stmt); \
|
||||||
if (alsa_chk_err < 0) { \
|
if (alsa_chk_err < 0) { \
|
||||||
@@ -221,10 +222,10 @@ int main(int argc, const char** argv) {
|
|||||||
// mix voices into playing buffer
|
// mix voices into playing buffer
|
||||||
for (size_t i = 0; i < PLAYBACK_BUFFER_SIZE; i++) {
|
for (size_t i = 0; i < PLAYBACK_BUFFER_SIZE; i++) {
|
||||||
// TODO: handle saturation (sum ouf of int16 range)
|
// TODO: handle saturation (sum ouf of int16 range)
|
||||||
playing_buffer[i] = (int16_t) (mixing_buffer[i] * (float) INT16_MAX);
|
playing_buffer[i] = (int16_t) clamp((mixing_buffer[i] * (float) INT16_MAX), INT16_MIN, INT16_MAX);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (write_audio(handle, playing_buffer) < 0) {
|
if (write_audio(handle, playing_buffer) != 0) {
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,7 +5,8 @@
|
|||||||
void play_note(Note *note, float *buffer, int buffer_size) {
|
void play_note(Note *note, float *buffer, int buffer_size) {
|
||||||
for (int i = 0; i < buffer_size; i++) {
|
for (int i = 0; i < buffer_size; i++) {
|
||||||
// update phase counter
|
// update phase counter
|
||||||
note->phase = fmodf(note->phase + note->freq / SAMPLE_RATE, 1.0f);
|
note->phase = note->phase + note->freq / SAMPLE_RATE;
|
||||||
|
if (note->phase >= 1.0f) { note->phase -= 1.0f; }
|
||||||
|
|
||||||
// oscillator
|
// oscillator
|
||||||
float sample = 0.0f;
|
float sample = 0.0f;
|
||||||
@@ -21,9 +22,11 @@ void play_note(Note *note, float *buffer, int buffer_size) {
|
|||||||
//sample = note->lp;
|
//sample = note->lp;
|
||||||
|
|
||||||
// basic attack / release
|
// basic attack / release
|
||||||
|
float attack_sec = fmaxf(note->attack_ms / 1000.0f, 1e-6f); // apply minimum value to avoid division by zero
|
||||||
|
float release_sec = fmaxf(note->release_ms / 1000.0f, 1e-6f);
|
||||||
// convert attack / release time to a number of steps to reach target gain
|
// convert attack / release time to a number of steps to reach target gain
|
||||||
float attack_step = 0.2f / ((note->attack_ms / 1000.0f) * SAMPLE_RATE);
|
float attack_step = 0.2f / (attack_sec * SAMPLE_RATE);
|
||||||
float release_step = 0.2f / ((note->release_ms / 1000.0f) * SAMPLE_RATE);
|
float release_step = 0.2f / (release_sec * SAMPLE_RATE);
|
||||||
note->gain = note->is_playing
|
note->gain = note->is_playing
|
||||||
? fminf(note->gain + attack_step, 0.2f) // attack
|
? fminf(note->gain + attack_step, 0.2f) // attack
|
||||||
: fmaxf(note->gain - release_step, 0); // release
|
: fmaxf(note->gain - release_step, 0); // release
|
||||||
|
|||||||
Reference in new issue
Block a user