X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=vg_audio.h;h=0968957a64dbe7983f9e7d629960647bf3b83a0b;hb=d5882ddde922fff8f5164bd6930df7ed35c5d1f9;hp=20972c082a4dffa21ec68d3fd21e99bc1f942567;hpb=ff8e8a170cb29b450f7f26580683ec3ae81cf4bd;p=vg.git diff --git a/vg_audio.h b/vg_audio.h index 20972c0..0968957 100644 --- a/vg_audio.h +++ b/vg_audio.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2021-2022 Harry Godden (hgn) - All Rights Reserved */ +/* Copyright (C) 2021-2023 Harry Godden (hgn) - All Rights Reserved */ #ifndef VG_AUDIO_H #define VG_AUDIO_H @@ -40,10 +40,15 @@ #endif #endif +#define AUDIO_FRAME_SIZE 512 +#define AUDIO_MIX_FRAME_SIZE 256 + #define AUDIO_CHANNELS 32 #define AUDIO_LFOS 8 +#define AUDIO_FILTERS 16 #define AUDIO_FLAG_LOOP 0x1 -#define AUDIO_FLAG_SPACIAL_3D 0x2 +#define AUDIO_FLAG_SPACIAL_3D 0x4 +#define AUDIO_FLAG_AUTO_START 0x8 /* Vorbis will ALWAYS use the maximum amount of channels it can */ //#define AUDIO_FLAG_MONO 0x100 NOTE: This is the default, so its not used @@ -111,6 +116,7 @@ static struct vg_audio_system char name[32]; /* only editable while allocated == 0 */ audio_clip *source; /* ... */ u32 flags; /* ... */ + u32 colour; /* ... */ /* internal non-readable state * -----------------------------*/ @@ -130,9 +136,11 @@ static struct vg_audio_system k_channel_activity_reset, /* will advance if allocated==1, to wake */ k_channel_activity_wake, /* will advance to either of next two */ k_channel_activity_alive, + k_channel_activity_end, k_channel_activity_error } - activity; + activity, + readable_activity; /* * editable structure, can be modified inside _lock and _unlock @@ -146,7 +154,8 @@ static struct vg_audio_system float volume, /* current volume */ volume_target, /* target volume */ pan, - pan_target; + pan_target, + sampling_rate; u32 volume_rate, pan_rate; @@ -174,14 +183,18 @@ static struct vg_audio_system } vg_audio = { .volume_console = 1.0f }; +#include "vg/vg_audio_dsp.h" static struct vg_profile _vg_prof_audio_decode = {.mode = k_profile_mode_accum, .name = "[T2] audio_decode()"}, _vg_prof_audio_mix = {.mode = k_profile_mode_accum, .name = "[T2] audio_mix()"}, + _vg_prof_dsp = {.mode = k_profile_mode_accum, + .name = "[T2] dsp_process()"}, vg_prof_audio_decode, - vg_prof_audio_mix; + vg_prof_audio_mix, + vg_prof_audio_dsp; /* * These functions are called from the main thread and used to prevent bad @@ -258,20 +271,21 @@ VG_STATIC void vg_audio_init(void) u32 decode_size = AUDIO_DECODE_SIZE * AUDIO_CHANNELS; vg_audio.decode_buffer = vg_linear_alloc( vg_mem.rtmemory, decode_size ); + vg_dsp_init(); + SDL_AudioSpec spec_desired, spec_got; spec_desired.callback = audio_mixer_callback; spec_desired.channels = 2; spec_desired.format = AUDIO_F32; spec_desired.freq = 44100; spec_desired.padding = 0; - spec_desired.samples = 512; + spec_desired.samples = AUDIO_FRAME_SIZE; spec_desired.silence = 0; spec_desired.size = 0; spec_desired.userdata = NULL; vg_audio.sdl_output_device = - SDL_OpenAudioDevice( NULL, 0, &spec_desired, &spec_got, - SDL_AUDIO_ALLOW_SAMPLES_CHANGE ); + SDL_OpenAudioDevice( NULL, 0, &spec_desired, &spec_got,0 ); if( vg_audio.sdl_output_device ) { @@ -292,6 +306,7 @@ VG_STATIC void vg_audio_init(void) VG_STATIC void vg_audio_free(void) { + vg_dsp_free(); SDL_CloseAudioDevice( vg_audio.sdl_output_device ); } @@ -306,6 +321,7 @@ VG_STATIC void vg_audio_free(void) #define AUDIO_EDIT_LFO_ATTACHMENT 0x10 #define AUDIO_EDIT_SPACIAL 0x20 #define AUDIO_EDIT_OWNERSHIP 0x40 +#define AUDIO_EDIT_SAMPLING_RATE 0x80 static audio_channel *audio_request_channel( audio_clip *clip, u32 flags ) { @@ -317,6 +333,7 @@ static audio_channel *audio_request_channel( audio_clip *clip, u32 flags ) { ch->source = clip; ch->flags = flags; + ch->colour = 0x00333333; strcpy( ch->name, clip->path ); ch->allocated = 1; @@ -331,6 +348,7 @@ static audio_channel *audio_request_channel( audio_clip *clip, u32 flags ) v4_copy((v4f){0.0f,0.0f,0.0f,1.0f},ch->editable_state.spacial_falloff); ch->editable_state.lfo = NULL; ch->editable_state.lfo_amount = 0.0f; + ch->editable_state.sampling_rate = 1.0f; ch->editble_state_write_mask = 0x00; return ch; } @@ -339,6 +357,14 @@ static audio_channel *audio_request_channel( audio_clip *clip, u32 flags ) return NULL; } +static int audio_channel_finished( audio_channel *ch ) +{ + if( ch->readable_activity == k_channel_activity_end ) + return 1; + else + return 0; +} + static audio_channel *audio_relinquish_channel( audio_channel *ch ) { ch->editable_state.relinquished = 1; @@ -346,45 +372,44 @@ static audio_channel *audio_relinquish_channel( audio_channel *ch ) return NULL; } -static audio_channel *audio_channel_slope_volume( audio_channel *ch, - float length, - float new_volume ) +static void audio_channel_slope_volume( audio_channel *ch, float length, + float new_volume ) { ch->editable_state.volume_target = new_volume; ch->editable_state.volume_rate = length * 44100.0f; ch->editble_state_write_mask |= AUDIO_EDIT_VOLUME_SLOPE; +} - return ch; +static void audio_channel_set_sampling_rate( audio_channel *ch, float rate ) +{ + ch->editable_state.sampling_rate = rate; + ch->editble_state_write_mask |= AUDIO_EDIT_SAMPLING_RATE; } -static audio_channel *audio_channel_edit_volume( audio_channel *ch, - float new_volume, int instant ) +static void audio_channel_edit_volume( audio_channel *ch, + float new_volume, int instant ) { if( instant ) { - ch->editable_state.volume = 0.0f; + ch->editable_state.volume = new_volume; ch->editble_state_write_mask |= AUDIO_EDIT_VOLUME; - return ch; } else { - return audio_channel_slope_volume( ch, 0.05f, new_volume ); + audio_channel_slope_volume( ch, 0.05f, new_volume ); } } static audio_channel *audio_channel_fadeout( audio_channel *ch, float length ) { - ch = audio_channel_slope_volume( ch, length, 0.0f ); - ch = audio_relinquish_channel( ch ); - - return ch; + audio_channel_slope_volume( ch, length, 0.0f ); + return audio_relinquish_channel( ch ); } -static audio_channel *audio_channel_fadein( audio_channel *ch, float length ) +static void audio_channel_fadein( audio_channel *ch, float length ) { - ch = audio_channel_edit_volume( ch, 0.0f, 1 ); - ch = audio_channel_slope_volume( ch, length, 1.0f ); - return ch; + audio_channel_edit_volume( ch, 0.0f, 1 ); + audio_channel_slope_volume( ch, length, 1.0f ); } static audio_channel *audio_channel_crossfade( audio_channel *ch, @@ -394,37 +419,35 @@ static audio_channel *audio_channel_crossfade( audio_channel *ch, u32 cursor = 0; if( ch ) - { ch = audio_channel_fadeout( ch, length ); - } audio_channel *replacement = audio_request_channel( new_clip, flags ); if( replacement ) - { - replacement = audio_channel_fadein( replacement, length ); - } + audio_channel_fadein( replacement, length ); return replacement; } -static audio_channel *audio_channel_sidechain_lfo( audio_channel *ch, - int lfo_id, float amount ) +static void audio_channel_sidechain_lfo( audio_channel *ch, int lfo_id, + float amount ) { ch->editable_state.lfo = &vg_audio.oscillators[ lfo_id ]; ch->editable_state.lfo_amount = amount; ch->editble_state_write_mask |= AUDIO_EDIT_LFO_ATTACHMENT; - - return ch; } -static audio_channel *audio_channel_set_spacial( audio_channel *ch, - v3f co, float range ) +static void audio_channel_set_spacial( audio_channel *ch, v3f co, float range ) { if( ch->flags & AUDIO_FLAG_SPACIAL_3D ) { v3_copy( co, ch->editable_state.spacial_falloff ); - ch->editable_state.spacial_falloff[3] = 1.0f/range; + + if( range == 0.0f ) + ch->editable_state.spacial_falloff[3] = 1.0f; + else + ch->editable_state.spacial_falloff[3] = 1.0f/range; + ch->editble_state_write_mask |= AUDIO_EDIT_SPACIAL; } else @@ -432,36 +455,38 @@ static audio_channel *audio_channel_set_spacial( audio_channel *ch, vg_warn( "Tried to set spacialization paramaters for 2D channel (%s)\n", ch->name ); } - - return ch; } -static audio_channel *audio_oneshot_3d( audio_clip *clip, v3f position, - float range, float volume ) +static int audio_oneshot_3d( audio_clip *clip, v3f position, + float range, float volume ) { audio_channel *ch = audio_request_channel( clip, AUDIO_FLAG_SPACIAL_3D ); if( ch ) { - ch = audio_channel_set_spacial( ch, position, range ); - ch = audio_channel_edit_volume( ch, volume, 1 ); + audio_channel_set_spacial( ch, position, range ); + audio_channel_edit_volume( ch, volume, 1 ); ch = audio_relinquish_channel( ch ); - } - return ch; + return 1; + } + else + return 0; } -static audio_channel *audio_oneshot( audio_clip *clip, float volume, float pan ) +static int audio_oneshot( audio_clip *clip, float volume, float pan ) { audio_channel *ch = audio_request_channel( clip, 0x00 ); if( ch ) { - ch = audio_channel_edit_volume( ch, volume, 1 ); + audio_channel_edit_volume( ch, volume, 1 ); ch = audio_relinquish_channel( ch ); - } - return ch; + return 1; + } + else + return 0; } static void audio_set_lfo_wave( int id, enum lfo_wave_type type, @@ -612,7 +637,7 @@ stb_vorbis_get_samples_i16_downmixed( stb_vorbis *f, i16 *buffer, int len ) return n; } -static float audio_lfo_pull_sample( audio_lfo *lfo ) +static inline float audio_lfo_pull_sample( audio_lfo *lfo ) { lfo->time ++; @@ -727,18 +752,18 @@ static void audio_channel_get_samples( audio_channel *ch, vg_profile_end( &_vg_prof_audio_decode ); } -static void audio_channel_mix( audio_channel *ch, - float *buffer, u32 frame_count ) +static void audio_channel_mix( audio_channel *ch, float *buffer ) { - u32 buffer_pos = 0; - float *pcf = alloca( frame_count * 2 * sizeof(float) ); - u32 frames_write = frame_count; + u32 buffer_length = AUDIO_MIX_FRAME_SIZE; + if( ch->_.sampling_rate != 1.0f ) + { + float l = ceilf( (float)(AUDIO_MIX_FRAME_SIZE) * ch->_.sampling_rate ); + buffer_length = l+1; + } - audio_channel_get_samples( ch, frame_count, pcf ); - vg_profile_begin( &_vg_prof_audio_mix ); + float pcf[ AUDIO_MIX_FRAME_SIZE * 2 * 2 ]; - if( ch->_.lfo ) - ch->_.lfo->time = ch->_.lfo->time_startframe; + audio_channel_get_samples( ch, buffer_length, pcf ); float framevol_l = 1.0f, framevol_r = 1.0f; @@ -772,35 +797,74 @@ static void audio_channel_mix( audio_channel *ch, framevol_r *= (vol * 0.5f) * (1.0f + pan); } - for( u32 j=0; jvolume_movement < ch->_.volume_rate ) - { - ch->volume_movement ++; + vg_profile_begin( &_vg_prof_audio_mix ); - float movement_t = ch->volume_movement; - movement_t /= (float)ch->_.volume_rate; + float volume_movement = ch->volume_movement; + float const fvolume_rate = vg_maxf( 1.0f, ch->_.volume_rate ); + const float inv_volume_rate = 1.0f/fvolume_rate; - ch->_.volume = vg_lerpf( ch->volume_movement_start, - ch->_.volume_target, - movement_t ); - } + float volume = ch->_.volume; + const float volume_start = ch->volume_movement_start; + const float volume_target = ch->_.volume_target; - float vol_norm = ch->_.volume * ch->_.volume; + for( u32 j=0; j_.lfo ) - vol_norm *= 1.0f + audio_lfo_pull_sample( ch->_.lfo ) - * ch->_.lfo_amount; - - float vol_l = vol_norm * framevol_l, - vol_r = vol_norm * framevol_r; + vol_norm *= 1.0f + audio_lfo_pull_sample(ch->_.lfo) * ch->_.lfo_amount; - buffer[ buffer_pos*2+0 ] += pcf[ buffer_pos*2+0 ] * vol_l; - buffer[ buffer_pos*2+1 ] += pcf[ buffer_pos*2+1 ] * vol_r; + float vol_l = vol_norm * framevol_l, + vol_r = vol_norm * framevol_r, + sample_l, + sample_r; - buffer_pos ++; + if( ch->_.sampling_rate != 1.0f ) + { + /* absolutely garbage resampling, but it will do + */ + + float sample_index = ch->_.sampling_rate * (float)j; + float t = vg_fractf( sample_index ); + + u32 i0 = floorf( sample_index ), + i1 = i0+1; + + sample_l = pcf[ i0*2+0 ]*(1.0f-t) + pcf[ i1*2+0 ]*t; + sample_r = pcf[ i0*2+1 ]*(1.0f-t) + pcf[ i1*2+1 ]*t; + } + else + { + sample_l = pcf[ j*2+0 ]; + sample_r = pcf[ j*2+1 ]; + } + + buffer[ j*2+0 ] += sample_l * vol_l; + buffer[ j*2+1 ] += sample_r * vol_r; } + ch->volume_movement += AUDIO_MIX_FRAME_SIZE; + ch->volume_movement = VG_MIN( ch->volume_movement, ch->_.volume_rate ); + ch->_.volume = volume; + vg_profile_end( &_vg_prof_audio_mix ); } @@ -817,10 +881,19 @@ VG_STATIC void audio_mixer_callback( void *user, u8 *stream, int byte_count ) if( !ch->allocated ) continue; + if( ch->activity == k_channel_activity_alive ) + { + if( (ch->cursor >= ch->source_length) && + !(ch->flags & AUDIO_FLAG_LOOP) ) + { + ch->activity = k_channel_activity_end; + } + } + /* process relinquishments */ if( (ch->activity != k_channel_activity_reset) && ch->_.relinquished ) { - if( (ch->cursor >= ch->source_length && !(ch->flags & AUDIO_FLAG_LOOP)) + if( (ch->activity == k_channel_activity_end) || (ch->_.volume == 0.0f) || (ch->activity == k_channel_activity_error) ) { @@ -865,7 +938,13 @@ VG_STATIC void audio_mixer_callback( void *user, u8 *stream, int byte_count ) ch->editable_state.volume_target = ch->_.volume_target; ch->editable_state.volume_rate = ch->_.volume_rate; } - + + + if( ch->editble_state_write_mask & AUDIO_EDIT_SAMPLING_RATE ) + ch->_.sampling_rate = ch->editable_state.sampling_rate; + else + ch->editable_state.sampling_rate = ch->_.sampling_rate; + if( ch->editble_state_write_mask & AUDIO_EDIT_LFO_ATTACHMENT ) { @@ -928,7 +1007,7 @@ VG_STATIC void audio_mixer_callback( void *user, u8 *stream, int byte_count ) lfo->editble_state_write_mask = 0x00; } - + dsp_update_tunings(); audio_unlock(); /* @@ -968,23 +1047,54 @@ VG_STATIC void audio_mixer_callback( void *user, u8 *stream, int byte_count ) audio_channel *ch = &vg_audio.channels[i]; if( ch->activity == k_channel_activity_alive ) - audio_channel_mix( ch, pOut32F, frame_count ); + { + if( ch->_.lfo ) + ch->_.lfo->time = ch->_.lfo->time_startframe; + + u32 remaining = frame_count, + subpos = 0; + + while( remaining ) + { + audio_channel_mix( ch, pOut32F+subpos ); + remaining -= AUDIO_MIX_FRAME_SIZE; + subpos += AUDIO_MIX_FRAME_SIZE*2; + } + } } - /* - * Relinquishing conditions - * ------------------------------------------------------------------ - */ + vg_profile_begin( &_vg_prof_dsp ); + + for( int i=0; ireadable_activity = ch->activity; + } + /* Profiling information * ----------------------------------------------- */ vg_profile_increment( &_vg_prof_audio_decode ); vg_profile_increment( &_vg_prof_audio_mix ); + vg_profile_increment( &_vg_prof_dsp ); + vg_prof_audio_mix = _vg_prof_audio_mix; vg_prof_audio_decode = _vg_prof_audio_decode; + vg_prof_audio_dsp = _vg_prof_dsp; + vg_audio.samples_last = frame_count; + if( vg_audio.debug_ui ) + { + vg_dsp_update_texture(); + } + audio_unlock(); } @@ -1081,6 +1191,11 @@ VG_STATIC void audio_debug_ui( m4x4f mtx_pv ) audio_lock(); + glBindTexture( GL_TEXTURE_2D, vg_dsp.view_texture ); + glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, 256, 256, + GL_RGBA, GL_UNSIGNED_BYTE, + vg_dsp.view_texture_buffer ); + /* * Profiler * ----------------------------------------------------------------------- @@ -1088,18 +1203,22 @@ VG_STATIC void audio_debug_ui( m4x4f mtx_pv ) float budget = ((double)vg_audio.samples_last / 44100.0) * 1000.0; vg_profile_drawn( (struct vg_profile *[]){ &vg_prof_audio_decode, - &vg_prof_audio_mix }, 2, + &vg_prof_audio_mix, + &vg_prof_audio_dsp}, 3, budget, (ui_rect){ 4, VG_PROFILE_SAMPLE_COUNT*2 + 8, - 250, 0 }, 3 ); + 512, 0 }, 3 ); char perf[128]; /* Draw UI */ - vg_uictx.cursor[0] = 258; - vg_uictx.cursor[1] = VG_PROFILE_SAMPLE_COUNT*2+8+24+12; + vg_uictx.cursor[0] = 512 + 8; + vg_uictx.cursor[1] = VG_PROFILE_SAMPLE_COUNT*2+8+24+12+12; vg_uictx.cursor[2] = 150; vg_uictx.cursor[3] = 12; + + ui_rect view_thing = { 4, vg.window_y-512-4, 512, 512 }; + ui_push_image( view_thing, vg_dsp.view_texture ); float mb1 = 1024.0f*1024.0f, usage = vg_linear_get_cur( vg_audio.audio_pool ) / mb1, @@ -1141,6 +1260,15 @@ VG_STATIC void audio_debug_ui( m4x4f mtx_pv ) "Vorbis" }; + const char *activties[] = + { + "reset", + "wake ", + "alive", + "end ", + "error" + }; + int format_index = 0; if( ch->source->flags & AUDIO_FLAG_STEREO ) @@ -1150,12 +1278,13 @@ VG_STATIC void audio_debug_ui( m4x4f mtx_pv ) else format_index = 1; - snprintf( perf, 127, "%02d %c%c%cD %s %4.2fv'%s'", + snprintf( perf, 127, "%02d %c%c%cD %s [%s] %4.2fv'%s'", i, - (ch->editable_state.relinquished)? 'r': ' ', - 0? 'r': ' ', + (ch->editable_state.relinquished)? 'r': '_', + 0? 'r': '_', 0? '3': '2', formats[format_index], + activties[ch->readable_activity], ch->editable_state.volume, ch->name ); @@ -1165,7 +1294,7 @@ VG_STATIC void audio_debug_ui( m4x4f mtx_pv ) } else { - ui_fill_rect( vg_uictx.cursor, 0xa0333333 ); + ui_fill_rect( vg_uictx.cursor, 0xa0000000 | ch->colour ); } vg_uictx.cursor[0] += 2;