X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=vg_audio.h;h=59ad0574e88acf1ade05b94a422291375812a20f;hb=b37cac2c8562dd54066162cbbab359937d5399b1;hp=120622cc658307bcb15239b88b08f9c8b733d584;hpb=4eaab4b787d2534b4dce8114a360183355062d20;p=vg.git diff --git a/vg_audio.h b/vg_audio.h index 120622c..59ad057 100644 --- a/vg_audio.h +++ b/vg_audio.h @@ -10,15 +10,11 @@ #include "vg/vg_platform.h" #include "vg/vg_io.h" #include "vg/vg_m.h" -#include "vg/vg_ui.h" #include "vg/vg_console.h" #include "vg/vg_store.h" #include "vg/vg_profiler.h" #include "vg/vg_audio_synth_bird.h" -#include -#include - #ifdef __GNUC__ #ifndef __clang__ #pragma GCC push_options @@ -65,7 +61,7 @@ enum audio_format k_audio_format_none4 = 0xE00u, k_audio_format_bird = 0x1000u, - k_audio_format_none5 = 0x1200u, + k_audio_format_gen = 0x1200u, k_audio_format_none6 = 0x1400u, k_audio_format_none7 = 0x1600u, k_audio_format_none8 = 0x1800u, @@ -83,14 +79,24 @@ typedef struct audio_channel audio_channel; typedef struct audio_lfo audio_lfo; struct audio_clip{ - const char *path; + union { /* TODO oof.. */ + u64 _p64_; + const char *path; + void *func; + }; + u32 flags; u32 size; - void *data; + + union{ + u64 _p64; + void *data; + }; }; -static struct vg_audio_system{ +struct vg_audio_system{ SDL_AudioDeviceID sdl_output_device; + vg_str device_choice; /* buffer is null? use default from OS */ void *audio_pool, *decode_buffer; @@ -125,7 +131,8 @@ static struct vg_audio_system{ struct audio_channel{ int allocated; - u32 group; + u16 group; + u8 world_id; char name[32]; /* only editable while allocated == 0 */ audio_clip *source; /* ... */ @@ -186,7 +193,7 @@ static struct vg_audio_system{ } channels[ AUDIO_CHANNELS ]; - int debug_ui, debug_ui_3d, debug_dsp; + int debug_ui, debug_ui_3d, debug_dsp, dsp_enabled; v3f internal_listener_pos, internal_listener_ears, @@ -199,7 +206,7 @@ static struct vg_audio_system{ float internal_global_volume, external_global_volume; } -vg_audio = { .external_global_volume = 1.0f }; +static vg_audio = { .external_global_volume = 1.0f, .dsp_enabled = 1 }; #include "vg/vg_audio_dsp.h" @@ -218,7 +225,7 @@ static struct vg_profile * These functions are called from the main thread and used to prevent bad * access. TODO: They should be no-ops in release builds. */ -VG_STATIC int audio_lock_checker_load(void) +static int audio_lock_checker_load(void) { int value; SDL_AtomicLock( &vg_audio.sl_checker ); @@ -227,14 +234,14 @@ VG_STATIC int audio_lock_checker_load(void) return value; } -VG_STATIC void audio_lock_checker_store( int value ) +static void audio_lock_checker_store( int value ) { SDL_AtomicLock( &vg_audio.sl_checker ); vg_audio.sync_locked = value; SDL_AtomicUnlock( &vg_audio.sl_checker ); } -VG_STATIC void audio_require_lock(void) +static void audio_require_lock(void) { if( audio_lock_checker_load() ) return; @@ -243,41 +250,20 @@ VG_STATIC void audio_require_lock(void) abort(); } -VG_STATIC void audio_lock(void) +static void audio_lock(void) { SDL_AtomicLock( &vg_audio.sl_sync ); audio_lock_checker_store(1); } -VG_STATIC void audio_unlock(void) +static void audio_unlock(void) { audio_lock_checker_store(0); SDL_AtomicUnlock( &vg_audio.sl_sync ); } +static void audio_mixer_callback( void *user, u8 *stream, int frame_count ); -VG_STATIC void audio_mixer_callback( void *user, u8 *stream, int frame_count ); -VG_STATIC void vg_audio_init(void) -{ - /* TODO: Move here? */ - vg_console_reg_var( "debug_audio", &vg_audio.debug_ui, - k_var_dtype_i32, VG_VAR_CHEAT ); - vg_console_reg_var( "debug_dsp", &vg_audio.debug_dsp, - k_var_dtype_i32, VG_VAR_CHEAT ); - vg_console_reg_var( "volume", &vg_audio.external_global_volume, - k_var_dtype_f32, VG_VAR_PERSISTENT ); - - /* allocate memory */ - /* 32mb fixed */ - vg_audio.audio_pool = - vg_create_linear_allocator( vg_mem.rtmemory, 1024*1024*32, - VG_MEMORY_SYSTEM ); - - /* fixed */ - u32 decode_size = AUDIO_DECODE_SIZE * AUDIO_CHANNELS; - vg_audio.decode_buffer = vg_linear_alloc( vg_mem.rtmemory, decode_size ); - - vg_dsp_init(); - +static void vg_audio_device_init(void){ SDL_AudioSpec spec_desired, spec_got; spec_desired.callback = audio_mixer_callback; spec_desired.channels = 2; @@ -290,13 +276,20 @@ VG_STATIC void vg_audio_init(void) spec_desired.userdata = NULL; vg_audio.sdl_output_device = - SDL_OpenAudioDevice( NULL, 0, &spec_desired, &spec_got,0 ); + SDL_OpenAudioDevice( vg_audio.device_choice.buffer, 0, + &spec_desired, &spec_got,0 ); + + vg_info( "Start audio device (%u, F32, %u) @%s\n", + spec_desired.freq, + AUDIO_FRAME_SIZE, + vg_audio.device_choice.buffer ); if( vg_audio.sdl_output_device ){ SDL_PauseAudioDevice( vg_audio.sdl_output_device, 0 ); + vg_success( "Unpaused device %d.\n", vg_audio.sdl_output_device ); } else{ - vg_fatal_error( + vg_error( "SDL_OpenAudioDevice failed. Your default audio device must support:\n" " Frequency: 44100 hz\n" " Buffer size: 512\n" @@ -305,7 +298,35 @@ VG_STATIC void vg_audio_init(void) } } -VG_STATIC void vg_audio_free(void) +static void vg_audio_register(void){ + vg_console_reg_var( "debug_audio", &vg_audio.debug_ui, + k_var_dtype_i32, VG_VAR_CHEAT ); + vg_console_reg_var( "debug_dsp", &vg_audio.debug_dsp, + k_var_dtype_i32, VG_VAR_CHEAT ); + vg_console_reg_var( "volume", &vg_audio.external_global_volume, + k_var_dtype_f32, VG_VAR_PERSISTENT ); + vg_console_reg_var( "vg_audio_device", &vg_audio.device_choice, + k_var_dtype_str, VG_VAR_PERSISTENT ); + vg_console_reg_var( "vg_dsp", &vg_audio.dsp_enabled, + k_var_dtype_i32, VG_VAR_PERSISTENT ); +} + +static void vg_audio_init(void){ + /* allocate memory */ + /* 32mb fixed */ + vg_audio.audio_pool = + vg_create_linear_allocator( vg_mem.rtmemory, 1024*1024*32, + VG_MEMORY_SYSTEM ); + + /* fixed */ + u32 decode_size = AUDIO_DECODE_SIZE * AUDIO_CHANNELS; + vg_audio.decode_buffer = vg_linear_alloc( vg_mem.rtmemory, decode_size ); + + vg_dsp_init(); + vg_audio_device_init(); +} + +static void vg_audio_free(void) { vg_dsp_free(); SDL_CloseAudioDevice( vg_audio.sdl_output_device ); @@ -324,15 +345,19 @@ VG_STATIC void vg_audio_free(void) #define AUDIO_EDIT_OWNERSHIP 0x40 #define AUDIO_EDIT_SAMPLING_RATE 0x80 -static void audio_channel_init( audio_channel *ch, audio_clip *clip, u32 flags ) -{ +static void audio_channel_init( audio_channel *ch, audio_clip *clip, + u32 flags ){ + audio_require_lock(); ch->group = 0; + ch->world_id = 0; ch->source = clip; ch->flags = flags; ch->colour = 0x00333333; if( (ch->source->flags & AUDIO_FLAG_FORMAT) == k_audio_format_bird ) strcpy( ch->name, "[array]" ); + else if( (ch->source->flags & AUDIO_FLAG_FORMAT) == k_audio_format_gen ) + strcpy( ch->name, "[program]" ); else vg_strncpy( clip->path, ch->name, 32, k_strncpy_always_add_null ); @@ -352,14 +377,22 @@ static void audio_channel_init( audio_channel *ch, audio_clip *clip, u32 flags ) ch->editble_state_write_mask = 0x00; } -static void audio_channel_group( audio_channel *ch, u32 group ) +static void audio_channel_group( audio_channel *ch, u16 group ) { + audio_require_lock(); ch->group = group; - ch->colour = ((group * 29986577) & 0x00ffffff) | 0xff000000; + ch->colour = (((u32)group * 29986577) & 0x00ffffff) | 0xff000000; +} + +static void audio_channel_world( audio_channel *ch, u8 world_id ) +{ + audio_require_lock(); + ch->world_id = world_id; } static audio_channel *audio_get_first_idle_channel(void) { + audio_require_lock(); for( int i=0; iallocated && (ch->group == group) ) @@ -409,6 +444,7 @@ static audio_channel *audio_get_group_first_active_channel( u32 group ) static int audio_channel_finished( audio_channel *ch ) { + audio_require_lock(); if( ch->readable_activity == k_channel_activity_end ) return 1; else @@ -417,6 +453,7 @@ static int audio_channel_finished( audio_channel *ch ) static audio_channel *audio_relinquish_channel( audio_channel *ch ) { + audio_require_lock(); ch->editable_state.relinquished = 1; ch->editble_state_write_mask |= AUDIO_EDIT_OWNERSHIP; return NULL; @@ -425,6 +462,7 @@ static audio_channel *audio_relinquish_channel( audio_channel *ch ) static void audio_channel_slope_volume( audio_channel *ch, float length, float new_volume ) { + audio_require_lock(); ch->editable_state.volume_target = new_volume; ch->editable_state.volume_rate = length * 44100.0f; ch->editble_state_write_mask |= AUDIO_EDIT_VOLUME_SLOPE; @@ -432,6 +470,7 @@ static void audio_channel_slope_volume( audio_channel *ch, float length, static void audio_channel_set_sampling_rate( audio_channel *ch, float rate ) { + audio_require_lock(); ch->editable_state.sampling_rate = rate; ch->editble_state_write_mask |= AUDIO_EDIT_SAMPLING_RATE; } @@ -439,6 +478,7 @@ static void audio_channel_set_sampling_rate( audio_channel *ch, float rate ) static void audio_channel_edit_volume( audio_channel *ch, float new_volume, int instant ) { + audio_require_lock(); if( instant ){ ch->editable_state.volume = new_volume; ch->editble_state_write_mask |= AUDIO_EDIT_VOLUME; @@ -450,12 +490,14 @@ static void audio_channel_edit_volume( audio_channel *ch, static audio_channel *audio_channel_fadeout( audio_channel *ch, float length ) { + audio_require_lock(); audio_channel_slope_volume( ch, length, 0.0f ); return audio_relinquish_channel( ch ); } static void audio_channel_fadein( audio_channel *ch, float length ) { + audio_require_lock(); audio_channel_edit_volume( ch, 0.0f, 1 ); audio_channel_slope_volume( ch, length, 1.0f ); } @@ -464,6 +506,7 @@ static audio_channel *audio_channel_crossfade( audio_channel *ch, audio_clip *new_clip, float length, u32 flags ) { + audio_require_lock(); u32 cursor = 0; if( ch ) @@ -482,6 +525,7 @@ static audio_channel *audio_channel_crossfade( audio_channel *ch, static void audio_channel_sidechain_lfo( audio_channel *ch, int lfo_id, float amount ) { + audio_require_lock(); ch->editable_state.lfo = &vg_audio.oscillators[ lfo_id ]; ch->editable_state.lfo_amount = amount; ch->editble_state_write_mask |= AUDIO_EDIT_LFO_ATTACHMENT; @@ -489,6 +533,7 @@ static void audio_channel_sidechain_lfo( audio_channel *ch, int lfo_id, static void audio_channel_set_spacial( audio_channel *ch, v3f co, float range ) { + audio_require_lock(); if( ch->flags & AUDIO_FLAG_SPACIAL_3D ){ v3_copy( co, ch->editable_state.spacial_falloff ); @@ -508,6 +553,7 @@ static void audio_channel_set_spacial( audio_channel *ch, v3f co, float range ) static int audio_oneshot_3d( audio_clip *clip, v3f position, float range, float volume ) { + audio_require_lock(); audio_channel *ch = audio_get_first_idle_channel(); if( ch ){ @@ -524,6 +570,7 @@ static int audio_oneshot_3d( audio_clip *clip, v3f position, static int audio_oneshot( audio_clip *clip, float volume, float pan ) { + audio_require_lock(); audio_channel *ch = audio_get_first_idle_channel(); if( ch ){ @@ -540,6 +587,7 @@ static int audio_oneshot( audio_clip *clip, float volume, float pan ) static void audio_set_lfo_wave( int id, enum lfo_wave_type type, float coefficient ) { + audio_require_lock(); audio_lfo *lfo = &vg_audio.oscillators[ id ]; lfo->editable_state.polynomial_coefficient = coefficient; lfo->editable_state.wave_type = type; @@ -549,6 +597,7 @@ static void audio_set_lfo_wave( int id, enum lfo_wave_type type, static void audio_set_lfo_frequency( int id, float freq ) { + audio_require_lock(); audio_lfo *lfo = &vg_audio.oscillators[ id ]; lfo->editable_state.period = 44100.0f / freq; lfo->editble_state_write_mask |= AUDIO_EDIT_LFO_PERIOD; @@ -605,6 +654,9 @@ static int audio_channel_load_source( audio_channel *ch ) else if( format == k_audio_format_stereo ){ ch->source_length = ch->source->size / 2; } + else if( format == k_audio_format_gen ){ + ch->source_length = 0xffffffff; + } else{ ch->source_length = ch->source->size; } @@ -612,7 +664,7 @@ static int audio_channel_load_source( audio_channel *ch ) return 1; } -VG_STATIC void audio_decode_uncompressed_mono( i16 *src, u32 count, float *dst ) +static void audio_decode_uncompressed_mono( i16 *src, u32 count, float *dst ) { for( u32 i=0; istereo */ -VG_STATIC int +static int stb_vorbis_get_samples_float_interleaved_stereo( stb_vorbis *f, float *buffer, int len ) { @@ -657,7 +709,7 @@ stb_vorbis_get_samples_float_interleaved_stereo( stb_vorbis *f, float *buffer, /* * ........ more wrecked code sorry! */ -VG_STATIC int +static int stb_vorbis_get_samples_i16_downmixed( stb_vorbis *f, i16 *buffer, int len ) { int n = 0, @@ -767,6 +819,10 @@ static void audio_channel_get_samples( audio_channel *ch, else if( format == k_audio_format_bird ){ synth_bird_generate_samples( ch->bird_handle, dst, samples_this_run ); } + else if( format == k_audio_format_gen ){ + void (*fn)( void *data, f32 *buf, u32 count ) = ch->source->func; + fn( ch->source->data, dst, samples_this_run ); + } else{ i16 *src_buffer = ch->source->data, *src = &src_buffer[ch->cursor]; @@ -838,10 +894,25 @@ static void audio_channel_mix( audio_channel *ch, float *buffer ) } } - if( !vg_validf( framevol_l ) ) vg_fatal_error( "NaN left channel" ); - if( !vg_validf( framevol_r ) ) vg_fatal_error( "NaN right channel" ); - if( !vg_validf( frame_samplerate ) ) - vg_fatal_error( "NaN sample rate" ); + if( !vg_validf( framevol_l ) || + !vg_validf( framevol_r ) || + !vg_validf( frame_samplerate ) ){ + vg_fatal_error( "Invalid sampling conditions.\n" + "This crash is to protect your ears.\n" + " channel: %p (%s)\n" + " sample_rate: %f\n" + " volume: L%f R%f\n" + " listener: %.2f %.2f %.2f [%.2f %.2f %.2f]\n", + ch, ch->name, frame_samplerate, + framevol_l, framevol_r, + vg_audio.internal_listener_pos[0], + vg_audio.internal_listener_pos[1], + vg_audio.internal_listener_pos[2], + vg_audio.internal_listener_ears[0], + vg_audio.internal_listener_ears[1], + vg_audio.internal_listener_ears[2] + ); + } } u32 buffer_length = AUDIO_MIX_FRAME_SIZE; @@ -909,12 +980,12 @@ static void audio_channel_mix( audio_channel *ch, float *buffer ) vg_profile_end( &_vg_prof_audio_mix ); } -VG_STATIC void audio_mixer_callback( void *user, u8 *stream, int byte_count ) -{ +static void audio_mixer_callback( void *user, u8 *stream, int byte_count ){ /* * Copy data and move edit flags to commit flags * ------------------------------------------------------------- */ audio_lock(); + int use_dsp = vg_audio.dsp_enabled; v3_copy( vg_audio.external_listener_pos, vg_audio.internal_listener_pos ); v3_copy( vg_audio.external_listener_ears, vg_audio.internal_listener_ears ); @@ -1094,12 +1165,12 @@ VG_STATIC void audio_mixer_callback( void *user, u8 *stream, int byte_count ) } } - vg_profile_begin( &_vg_prof_dsp ); - - for( int i=0; iflags & AUDIO_FLAG_FORMAT) != k_audio_format_bird ){ + clip->flags &= ~AUDIO_FLAG_FORMAT; + clip->flags |= k_audio_format_vorbis; + } + +#endif + /* load in directly */ u32 format = clip->flags & AUDIO_FLAG_FORMAT; @@ -1220,19 +1300,21 @@ VG_STATIC void audio_clip_load( audio_clip *clip, void *lin_alloc ) if( read_samples != length_samples ) vg_fatal_error( "Decode error" ); +#if 0 float mb = (float)(data_size) / (1024.0f*1024.0f); vg_info( "Loaded audio clip '%s' (%.1fmb) %u samples\n", clip->path, mb, length_samples ); +#endif } } -VG_STATIC void audio_clip_loadn( audio_clip *arr, int count, void *lin_alloc ) +static void audio_clip_loadn( audio_clip *arr, int count, void *lin_alloc ) { for( int i=0; idata && clip->size ) return; @@ -1245,8 +1327,15 @@ VG_STATIC void audio_require_clip_loaded( audio_clip *clip ) * Debugging */ -VG_STATIC void audio_debug_ui( m4x4f mtx_pv ) -{ +static void audio_debug_ui( + +#ifdef VG_3D + m4x4f +#else + m3x3f +#endif + mtx_pv ){ + if( !vg_audio.debug_ui ) return; @@ -1262,37 +1351,28 @@ VG_STATIC void audio_debug_ui( m4x4f mtx_pv ) * ----------------------------------------------------------------------- */ -#if 0 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, &vg_prof_audio_dsp}, 3, budget, (ui_rect){ 4, VG_PROFILE_SAMPLE_COUNT*2 + 8, - 512, 0 }, 3 ); + 512, 0 }, 3, 0 ); char perf[128]; /* Draw UI */ - 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 window = { + 0, + 0, + 800, + AUDIO_CHANNELS * 18 + }; if( vg_audio.debug_dsp ){ ui_rect view_thing = { 4, vg.window_y-512-4, 512, 512 }; - ui_push_image( view_thing, vg_dsp.view_texture ); + ui_image( view_thing, vg_dsp.view_texture ); } - - float mb1 = 1024.0f*1024.0f, - usage = vg_linear_get_cur( vg_audio.audio_pool ) / mb1, - total = vg_linear_get_capacity( vg_audio.audio_pool ) / mb1, - percent = (usage/total) * 100.0f; - - snprintf( perf, 127, "Mem: %.1f/%.1fmb (%.1f%%)\n", usage, total, percent ); - - ui_text( vg_uictx.cursor, perf, 1, 0 ); - vg_uictx.cursor[1] += 20; ui_rect overlap_buffer[ AUDIO_CHANNELS ]; u32 overlap_length = 0; @@ -1301,16 +1381,11 @@ VG_STATIC void audio_debug_ui( m4x4f mtx_pv ) for( int i=0; iallocated ){ - ui_fill_rect( vg_uictx.cursor, 0x50333333 ); - - ui_end_down(); - vg_uictx.cursor[1] += 1; + ui_fill( row, 0x50333333 ); continue; } @@ -1345,8 +1420,9 @@ VG_STATIC void audio_debug_ui( m4x4f mtx_pv ) u32 format_index = (ch->source->flags & AUDIO_FLAG_FORMAT)>>9; - snprintf( perf, 127, "%02d %c%c%cD %s [%s] %4.2fv'%s'", + snprintf( perf, 127, "%02d[%#04x.%#06x]%c%c%cD %s [%s] %4.2fv'%s'", i, + ch->world_id, ch->group, (ch->editable_state.relinquished)? 'r': '_', 0? 'r': '_', 0? '3': '2', @@ -1355,15 +1431,10 @@ VG_STATIC void audio_debug_ui( m4x4f mtx_pv ) ch->editable_state.volume, ch->name ); - ui_fill_rect( vg_uictx.cursor, 0xa0000000 | ch->colour ); - - vg_uictx.cursor[0] += 2; - vg_uictx.cursor[1] += 2; - ui_text( vg_uictx.cursor, perf, 1, 0 ); - - ui_end_down(); - vg_uictx.cursor[1] += 1; + ui_fill( row, 0xa0000000 | ch->colour ); + ui_text( row, perf, 1, k_ui_align_middle_left, 0 ); +#ifdef VG_3D if( AUDIO_FLAG_SPACIAL_3D ){ v4f wpos; v3_copy( ch->editable_state.spacial_falloff, wpos ); @@ -1378,7 +1449,7 @@ VG_STATIC void audio_debug_ui( m4x4f mtx_pv ) ui_rect wr; wr[0] = vg_clampf(wpos[0] * vg.window_x, -32000.0f,32000.0f); wr[1] = vg_clampf((1.0f-wpos[1]) * vg.window_y,-32000.0f,32000.0f); - wr[2] = 100; + wr[2] = 1000; wr[3] = 17; for( int j=0; j<12; j++ ){ @@ -1399,13 +1470,12 @@ VG_STATIC void audio_debug_ui( m4x4f mtx_pv ) wr[1] += 18; } - ui_text( wr, perf, 1, 0 ); - - ui_rect_copy( wr, overlap_buffer[ overlap_length ++ ] ); + ui_text( wr, perf, 1, k_ui_align_middle_left, 0 ); + rect_copy( wr, overlap_buffer[ overlap_length ++ ] ); } } - } #endif + } audio_unlock(); }