X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=vg_audio.h;h=39f494ffa0b843e501c28aaab94db4cfa7dd443e;hb=76d234b7dc5e6500e8a54009b367e7620f11ef97;hp=75a8c7ea97cb829a42a6aa839b77d1f90e52eb0e;hpb=8110d74786fb065c0e69f1e171a69e519c3f8c74;p=vg.git diff --git a/vg_audio.h b/vg_audio.h index 75a8c7e..39f494f 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 @@ -51,13 +47,6 @@ #define AUDIO_FLAG_NO_DOPPLER 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 -//#define AUDIO_FLAG_STEREO 0x200 -//#define AUDIO_FLAG_VORBIS 0x400 -//#define AUDIO_FLAG_BIRD_SYNTH 0x800 - #define AUDIO_FLAG_FORMAT 0x1E00 enum audio_format @@ -90,13 +79,21 @@ 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; + }; + 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; void *audio_pool, @@ -132,7 +129,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; /* ... */ @@ -193,7 +191,7 @@ static struct vg_audio_system{ } channels[ AUDIO_CHANNELS ]; - int debug_ui, debug_ui_3d; + int debug_ui, debug_ui_3d, debug_dsp; v3f internal_listener_pos, internal_listener_ears, @@ -206,7 +204,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 }; #include "vg/vg_audio_dsp.h" @@ -225,7 +223,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 ); @@ -234,14 +232,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; @@ -250,40 +248,30 @@ 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 ); } -VG_STATIC void audio_mixer_callback( void *user, u8 *stream, int frame_count ); -VG_STATIC void vg_audio_init(void) +static void audio_mixer_callback( void *user, u8 *stream, int frame_count ); +static void vg_audio_init(void) { /* TODO: Move here? */ - vg_var_push( (struct vg_var){ - .name = "debug_audio", - .data = &vg_audio.debug_ui, - .data_type = k_var_dtype_i32, - .opt_i32 = { .min=0, .max=1, .clamp=1 }, - .persistent = 1 - }); - - vg_var_push( (struct vg_var){ - .name = "volume", - .data = &vg_audio.external_global_volume, - .data_type = k_var_dtype_f32, - .opt_f32 = { .min=0.0f, .max=2.0f, .clamp=1 }, - .persistent = 1 - }); + 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, @@ -313,18 +301,16 @@ VG_STATIC void vg_audio_init(void) SDL_PauseAudioDevice( vg_audio.sdl_output_device, 0 ); } else{ - vg_fatal_exit_loop( + vg_fatal_error( "SDL_OpenAudioDevice failed. Your default audio device must support:\n" " Frequency: 44100 hz\n" " Buffer size: 512\n" " Channels: 2\n" " Format: s16 or f32\n" ); } - - vg_success( "Ready\n" ); } -VG_STATIC void vg_audio_free(void) +static void vg_audio_free(void) { vg_dsp_free(); SDL_CloseAudioDevice( vg_audio.sdl_output_device ); @@ -346,6 +332,7 @@ VG_STATIC void vg_audio_free(void) static void audio_channel_init( audio_channel *ch, audio_clip *clip, u32 flags ) { ch->group = 0; + ch->world_id = 0; ch->source = clip; ch->flags = flags; ch->colour = 0x00333333; @@ -353,7 +340,7 @@ static void audio_channel_init( audio_channel *ch, audio_clip *clip, u32 flags ) if( (ch->source->flags & AUDIO_FLAG_FORMAT) == k_audio_format_bird ) strcpy( ch->name, "[array]" ); else - strncpy( ch->name, clip->path, 31 ); + vg_strncpy( clip->path, ch->name, 32, k_strncpy_always_add_null ); ch->allocated = 1; @@ -371,10 +358,15 @@ 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 ) { 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 ) +{ + ch->world_id = world_id; } static audio_channel *audio_get_first_idle_channel(void) @@ -390,7 +382,7 @@ static audio_channel *audio_get_first_idle_channel(void) return NULL; } -static audio_channel *audio_get_group_idle_channel( u32 group, u32 max_count ) +static audio_channel *audio_get_group_idle_channel( u16 group, u32 max_count ) { u32 count = 0; audio_channel *dest = NULL; @@ -416,7 +408,7 @@ static audio_channel *audio_get_group_idle_channel( u32 group, u32 max_count ) return NULL; } -static audio_channel *audio_get_group_first_active_channel( u32 group ) +static audio_channel *audio_get_group_first_active_channel( u16 group ) { for( int i=0; istereo */ -VG_STATIC int +static int stb_vorbis_get_samples_float_interleaved_stereo( stb_vorbis *f, float *buffer, int len ) { @@ -676,7 +668,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, @@ -857,10 +849,25 @@ static void audio_channel_mix( audio_channel *ch, float *buffer ) } } - if( !vg_validf( framevol_l ) ) vg_fatal_exit_loop( "NaN left channel" ); - if( !vg_validf( framevol_r ) ) vg_fatal_exit_loop( "NaN right channel" ); - if( !vg_validf( frame_samplerate ) ) - vg_fatal_exit_loop( "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; @@ -928,7 +935,7 @@ 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 @@ -1139,14 +1146,14 @@ VG_STATIC void audio_mixer_callback( void *user, u8 *stream, int byte_count ) vg_audio.samples_last = frame_count; - if( vg_audio.debug_ui ){ + if( vg_audio.debug_dsp ){ vg_dsp_update_texture(); } audio_unlock(); } -VG_STATIC void audio_clip_load( audio_clip *clip, void *lin_alloc ) +static void audio_clip_load( audio_clip *clip, void *lin_alloc ) { if( lin_alloc == NULL ) lin_alloc = vg_audio.audio_pool; @@ -1163,7 +1170,7 @@ VG_STATIC void audio_clip_load( audio_clip *clip, void *lin_alloc ) if( format == k_audio_format_vorbis ){ if( !clip->path ){ - vg_fatal_exit_loop( "No path specified, embeded vorbis unsupported" ); + vg_fatal_error( "No path specified, embeded vorbis unsupported" ); } audio_lock(); @@ -1171,17 +1178,17 @@ VG_STATIC void audio_clip_load( audio_clip *clip, void *lin_alloc ) audio_unlock(); if( !clip->data ) - vg_fatal_exit_loop( "Audio failed to load" ); + vg_fatal_error( "Audio failed to load" ); float mb = (float)(clip->size) / (1024.0f*1024.0f); vg_info( "Loaded audio clip '%s' (%.1fmb)\n", clip->path, mb ); } else if( format == k_audio_format_stereo ){ - vg_fatal_exit_loop( "Unsupported format (Stereo uncompressed)" ); + vg_fatal_error( "Unsupported format (Stereo uncompressed)" ); } else if( format == k_audio_format_bird ){ if( !clip->data ){ - vg_fatal_exit_loop( "No data, external birdsynth unsupported" ); + vg_fatal_error( "No data, external birdsynth unsupported" ); } u32 total_size = clip->size + sizeof(struct synth_bird); @@ -1189,7 +1196,7 @@ VG_STATIC void audio_clip_load( audio_clip *clip, void *lin_alloc ) total_size = vg_align8( total_size ); if( total_size > AUDIO_DECODE_SIZE ) - vg_fatal_exit_loop( "Bird coding too long\n" ); + vg_fatal_error( "Bird coding too long\n" ); struct synth_bird *bird = vg_linear_alloc( lin_alloc, total_size ); memcpy( &bird->settings, clip->data, clip->size ); @@ -1201,7 +1208,7 @@ VG_STATIC void audio_clip_load( audio_clip *clip, void *lin_alloc ) } else{ if( !clip->path ){ - vg_fatal_exit_loop( "No path specified, embeded mono unsupported" ); + vg_fatal_error( "No path specified, embeded mono unsupported" ); } vg_linear_clear( vg_mem.scratch ); @@ -1221,7 +1228,7 @@ VG_STATIC void audio_clip_load( audio_clip *clip, void *lin_alloc ) if( !decoder ){ vg_error( "stb_vorbis_open_memory failed on '%s' (%d)\n", clip->path, err ); - vg_fatal_exit_loop( "Vorbis decode error" ); + vg_fatal_error( "Vorbis decode error" ); } /* only mono is supported in uncompressed */ @@ -1237,34 +1244,36 @@ VG_STATIC void audio_clip_load( audio_clip *clip, void *lin_alloc ) decoder, clip->data, length_samples ); if( read_samples != length_samples ) - vg_fatal_exit_loop( "Decode error" ); + 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; audio_unlock(); - vg_fatal_exit_loop( "Must load audio clip before playing! \n" ); + vg_fatal_error( "Must load audio clip before playing! \n" ); } /* * Debugging */ -VG_STATIC void audio_debug_ui( m4x4f mtx_pv ) +static void audio_debug_ui( m4x4f mtx_pv ) { if( !vg_audio.debug_ui ) return; @@ -1292,23 +1301,17 @@ VG_STATIC void audio_debug_ui( m4x4f mtx_pv ) 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 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, - 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 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_image( view_thing, vg_dsp.view_texture ); + } ui_rect overlap_buffer[ AUDIO_CHANNELS ]; u32 overlap_length = 0; @@ -1317,16 +1320,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; } @@ -1361,8 +1359,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', @@ -1371,14 +1370,8 @@ 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 ); if( AUDIO_FLAG_SPACIAL_3D ){ v4f wpos; @@ -1394,7 +1387,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++ ){ @@ -1415,9 +1408,8 @@ 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 ++ ] ); } } }