-/* 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
#include "vg/vg_console.h"
#include "vg/vg_store.h"
#include "vg/vg_profiler.h"
+#include "vg/vg_audio_synth_bird.h"
#include <sys/time.h>
#include <math.h>
#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
-#define AUDIO_FLAG_STEREO 0x200
-#define AUDIO_FLAG_VORBIS 0x400
+//#define AUDIO_FLAG_STEREO 0x200
+//#define AUDIO_FLAG_VORBIS 0x400
+//#define AUDIO_FLAG_BIRD_SYNTH 0x800
+
+#define AUDIO_FLAG_FORMAT 0x1E00
+
+enum audio_format
+{
+ k_audio_format_mono = 0x000u,
+ k_audio_format_stereo = 0x200u,
+ k_audio_format_vorbis = 0x400u,
+ k_audio_format_none0 = 0x600u,
+ k_audio_format_none1 = 0x800u,
+ k_audio_format_none2 = 0xA00u,
+ k_audio_format_none3 = 0xC00u,
+ k_audio_format_none4 = 0xE00u,
+
+ k_audio_format_bird = 0x1000u,
+ k_audio_format_none5 = 0x1200u,
+ k_audio_format_none6 = 0x1400u,
+ k_audio_format_none7 = 0x1600u,
+ k_audio_format_none8 = 0x1800u,
+ k_audio_format_none9 = 0x1A00u,
+ k_audio_format_none10 = 0x1C00u,
+ k_audio_format_none11 = 0x1E00u,
+};
#define AUDIO_DECODE_SIZE (1024*256) /* 256 kb decoding buffers */
#define AUDIO_MUTE_VOLUME 0.0f
char name[32]; /* only editable while allocated == 0 */
audio_clip *source; /* ... */
u32 flags; /* ... */
+ u32 colour; /* ... */
/* internal non-readable state
* -----------------------------*/
u32 volume_movement,
pan_movement;
- stb_vorbis *vorbis_handle;
+ union
+ {
+ struct synth_bird *bird_handle;
+ stb_vorbis *vorbis_handle;
+ };
+
stb_vorbis_alloc vorbis_alloc;
enum channel_activity
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
int debug_ui, debug_ui_3d;
v3f listener_pos,
- listener_ears;
+ listener_ears,
+ listener_velocity;
float volume,
volume_target,
}
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
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 )
{
VG_STATIC void vg_audio_free(void)
{
+ vg_dsp_free();
SDL_CloseAudioDevice( vg_audio.sdl_output_device );
}
{
ch->source = clip;
ch->flags = flags;
- strcpy( ch->name, clip->path );
+ ch->colour = 0x00333333;
+
+ if( (ch->source->flags & AUDIO_FLAG_FORMAT) == k_audio_format_bird )
+ strcpy( ch->name, "[array]" );
+ else
+ strncpy( ch->name, clip->path, 31 );
ch->allocated = 1;
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;
{
if( instant )
{
- ch->editable_state.volume = 0.0f;
+ ch->editable_state.volume = new_volume;
ch->editble_state_write_mask |= AUDIO_EDIT_VOLUME;
}
else
static void audio_channel_set_spacial( audio_channel *ch, v3f co, float range )
{
- if( ch->flags & AUDIO_FLAG_SPACIAL_3D )
- {
+ 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
- {
+ else{
vg_warn( "Tried to set spacialization paramaters for 2D channel (%s)\n",
ch->name );
}
{
audio_channel *ch = audio_request_channel( clip, AUDIO_FLAG_SPACIAL_3D );
- if( ch )
- {
+ if( ch ){
audio_channel_set_spacial( ch, position, range );
audio_channel_edit_volume( ch, volume, 1 );
ch = audio_relinquish_channel( ch );
{
audio_channel *ch = audio_request_channel( clip, 0x00 );
- if( ch )
- {
+ if( ch ){
audio_channel_edit_volume( ch, volume, 1 );
ch = audio_relinquish_channel( ch );
lfo->editble_state_write_mask |= AUDIO_EDIT_LFO_PERIOD;
}
+
/*
* Committers
* -----------------------------------------------------------------------------
*/
static int audio_channel_load_source( audio_channel *ch )
{
- if( ch->source->flags & AUDIO_FLAG_VORBIS )
+ u32 format = ch->source->flags & AUDIO_FLAG_FORMAT;
+
+ if( format == k_audio_format_vorbis )
{
/* Setup vorbis decoder */
u32 index = ch - vg_audio.channels;
ch->vorbis_handle = decoder;
}
}
- else if( ch->source->flags & AUDIO_FLAG_STEREO )
+ else if( format == k_audio_format_bird )
+ {
+ u32 index = ch - vg_audio.channels;
+
+ u8 *buf = (u8*)vg_audio.decode_buffer;
+ struct synth_bird *loc = (void *)&buf[AUDIO_DECODE_SIZE*index];
+
+ memcpy( loc, ch->source->data, ch->source->size );
+ synth_bird_reset( loc );
+
+ ch->bird_handle = loc;
+ ch->source_length = synth_bird_get_length_in_samples( loc );
+ }
+ else if( format == k_audio_format_stereo )
{
ch->source_length = ch->source->size / 2;
}
int n = 0,
c = VG_MIN( 1, f->channels - 1 );
- while( n < len )
- {
+ while( n < len ) {
int k = f->channel_buffer_end - f->channel_buffer_start;
if( n+k >= len )
k = len - n;
- for( int j=0; j < k; ++j )
- {
+ for( int j=0; j < k; ++j ) {
float sl = f->channel_buffers[ 0 ][f->channel_buffer_start+j],
sr = f->channel_buffers[ c ][f->channel_buffer_start+j];
return n;
}
-static float audio_lfo_pull_sample( audio_lfo *lfo )
+static inline float audio_lfo_pull_sample( audio_lfo *lfo )
{
lfo->time ++;
float t = lfo->time;
t /= (float)lfo->_.period;
- if( lfo->_.wave_type == k_lfo_polynomial_bipolar )
- {
+ if( lfo->_.wave_type == k_lfo_polynomial_bipolar ){
/*
* #
* # #
) * (1.0f-fabsf(t));
}
- else
- {
+ else{
return 0.0f;
}
}
u32 remaining = count;
u32 buffer_pos = 0;
- while( remaining )
- {
- u32 samples_this_run = VG_MIN( remaining, ch->source_length -ch->cursor );
+ u32 format = ch->source->flags & AUDIO_FLAG_FORMAT;
+
+ while( remaining ){
+ u32 samples_this_run = VG_MIN(remaining, ch->source_length - ch->cursor);
remaining -= samples_this_run;
float *dst = &buf[ buffer_pos * 2 ];
- if( ch->source->flags & AUDIO_FLAG_STEREO )
- {
- for( int i=0;i<samples_this_run; i++ )
- {
+ if( format == k_audio_format_stereo ){
+ for( int i=0;i<samples_this_run; i++ ){
dst[i*2+0] = 0.0f;
dst[i*2+1] = 0.0f;
}
}
- else if( ch->source->flags & AUDIO_FLAG_VORBIS )
- {
+ else if( format == k_audio_format_vorbis ){
int read_samples = stb_vorbis_get_samples_float_interleaved_stereo(
ch->vorbis_handle,
dst,
samples_this_run );
- if( read_samples != samples_this_run )
- {
+ if( read_samples != samples_this_run ){
vg_warn( "Invalid samples read (%s)\n", ch->source->path );
- for( int i=0; i<samples_this_run; i++ )
- {
+ for( int i=0; i<samples_this_run; i++ ){
dst[i*2+0] = 0.0f;
dst[i*2+1] = 0.0f;
}
}
}
- else
- {
+ else if( format == k_audio_format_bird ){
+ synth_bird_generate_samples( ch->bird_handle, dst, samples_this_run );
+ }
+ else{
i16 *src_buffer = ch->source->data,
*src = &src_buffer[ch->cursor];
ch->cursor += samples_this_run;
buffer_pos += samples_this_run;
- if( (ch->flags & AUDIO_FLAG_LOOP) && remaining )
- {
- if( ch->source->flags & AUDIO_FLAG_VORBIS )
+ if( (ch->flags & AUDIO_FLAG_LOOP) && remaining ){
+ if( format == k_audio_format_vorbis )
stb_vorbis_seek_start( ch->vorbis_handle );
+ else if( format == k_audio_format_bird )
+ synth_bird_reset( ch->bird_handle );
ch->cursor = 0;
continue;
break;
}
- while( remaining )
- {
+ while( remaining ){
buf[ buffer_pos*2 + 0 ] = 0.0f;
buf[ buffer_pos*2 + 1 ] = 0.0f;
buffer_pos ++;
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 frames_write = frame_count;
-
- u32 buffer_length = frame_count;
- if( ch->_.sampling_rate != 1.0f )
- {
- buffer_length = ceilf( (float)frame_count * ch->_.sampling_rate ) + 1;
- }
-
- float *pcf = alloca( buffer_length * 2 * sizeof(float) );
-
- audio_channel_get_samples( ch, buffer_length, pcf );
- vg_profile_begin( &_vg_prof_audio_mix );
-
- if( ch->_.lfo )
- ch->_.lfo->time = ch->_.lfo->time_startframe;
-
float framevol_l = 1.0f,
framevol_r = 1.0f;
- if( ch->flags & AUDIO_FLAG_SPACIAL_3D )
- {
- if( !vg_validf(vg_audio.listener_pos[0]) ||
- !vg_validf(vg_audio.listener_pos[1]) ||
- !vg_validf(vg_audio.listener_pos[2]) ||
- !vg_validf(ch->_.spacial_falloff[0]) ||
- !vg_validf(ch->_.spacial_falloff[1]) ||
- !vg_validf(ch->_.spacial_falloff[2]) )
- {
- vg_error( "NaN listener/world position (%s)\n", ch->name );
-
- framevol_l = 0.0f;
- framevol_r = 0.0f;
- }
+ float frame_samplerate = ch->_.sampling_rate;
+ if( ch->flags & AUDIO_FLAG_SPACIAL_3D ){
v3f delta;
v3_sub( ch->_.spacial_falloff, vg_audio.listener_pos, delta );
float dist = v3_length( delta ),
vol = vg_maxf( 0.0f, 1.0f - ch->_.spacial_falloff[3]*dist );
- v3_muls( delta, 1.0f/dist, delta );
- float pan = v3_dot( vg_audio.listener_ears, delta );
- vol = powf( vol, 5.0f );
+ if( dist <= 0.01f ){
+
+ }
+ else{
+ v3_muls( delta, 1.0f/dist, delta );
+ float pan = v3_dot( vg_audio.listener_ears, delta );
+ vol = powf( vol, 5.0f );
+
+ framevol_l *= (vol * 0.5f) * (1.0f - pan);
+ framevol_r *= (vol * 0.5f) * (1.0f + pan);
+
+ const float vs = 100.0f;
+ float doppler = (vs+v3_dot(delta,vg_audio.listener_velocity))/vs;
+ doppler = vg_clampf( doppler, 0.6f, 1.4f );
+
+ if( fabsf(doppler-1.0f) > 0.01f )
+ frame_samplerate *= doppler;
+ }
- framevol_l *= (vol * 0.5f) * (1.0f - pan);
- framevol_r *= (vol * 0.5f) * (1.0f + pan);
+ 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" );
}
- for( u32 j=0; j<frame_count; j++ )
- {
- if( ch->volume_movement < ch->_.volume_rate )
- {
- ch->volume_movement ++;
+ u32 buffer_length = AUDIO_MIX_FRAME_SIZE;
+ if( frame_samplerate != 1.0f ){
+ float l = ceilf( (float)(AUDIO_MIX_FRAME_SIZE) * frame_samplerate );
+ buffer_length = l+1;
+ }
- float movement_t = ch->volume_movement;
- movement_t /= (float)ch->_.volume_rate;
+ float pcf[ AUDIO_MIX_FRAME_SIZE * 2 * 2 ];
- ch->_.volume = vg_lerpf( ch->volume_movement_start,
- ch->_.volume_target,
- movement_t );
- }
+ audio_channel_get_samples( ch, buffer_length, pcf );
+
+ vg_profile_begin( &_vg_prof_audio_mix );
+
+ 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;
- float vol_norm = ch->_.volume * ch->_.volume;
+ float volume = ch->_.volume;
+ const float volume_start = ch->volume_movement_start;
+ const float volume_target = ch->_.volume_target;
+
+ for( u32 j=0; j<AUDIO_MIX_FRAME_SIZE; j++ ){
+ /*
+ * there is some REALLY weird behaviour with minss,
+ * i cannot begin to guess what the cause is, but the bahaviour when
+ * the second argument is not 1.0 would seemingly tripple or up to
+ * eight times this routine.
+ *
+ * the times it would happen are when moving from empty space into areas
+ * with geometry. in the bvh for skate rift.
+ *
+ * it should be completely unrelated to this, but somehow -- it is
+ * effecting the speed of minss. and severely at that too.
+ **/
+
+ volume_movement += 1.0f;
+ float movement_t = volume_movement * inv_volume_rate;
+ movement_t = vg_minf( volume_movement, 1.0f );
+ volume = vg_lerpf( volume_start, volume_target, movement_t );
+
+ float vol_norm = volume * volume;
if( ch->_.lfo )
- vol_norm *= 1.0f + audio_lfo_pull_sample( ch->_.lfo )
- * ch->_.lfo_amount;
+ 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,
+ float vol_l = vol_norm * framevol_l,
+ vol_r = vol_norm * framevol_r,
sample_l,
sample_r;
- if( ch->_.sampling_rate != 1.0f )
+ if( frame_samplerate != 1.0f )
{
/* absolutely garbage resampling, but it will do
*/
- float sample_index = ch->_.sampling_rate * (float)j;
+ float sample_index = frame_samplerate * (float)j;
float t = vg_fractf( sample_index );
u32 i0 = floorf( sample_index ),
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 );
}
* Copy data and move edit flags to commit flags
* ------------------------------------------------------------- */
audio_lock();
- for( int i=0; i<AUDIO_CHANNELS; i++ )
- {
+ for( int i=0; i<AUDIO_CHANNELS; i++ ){
audio_channel *ch = &vg_audio.channels[i];
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_reset) && ch->_.relinquished ){
+ if( (ch->activity == k_channel_activity_end)
|| (ch->_.volume == 0.0f)
|| (ch->activity == k_channel_activity_error) )
{
}
/* process new channels */
- if( ch->activity == k_channel_activity_reset )
- {
+ if( ch->activity == k_channel_activity_reset ){
ch->_ = ch->editable_state;
ch->cursor = 0;
ch->source_length = 0;
ch->editable_state.relinquished = ch->_.relinquished;
- if( ch->editble_state_write_mask & AUDIO_EDIT_VOLUME )
+ if( ch->editble_state_write_mask & AUDIO_EDIT_VOLUME ){
ch->_.volume = ch->editable_state.volume;
- else
+ ch->_.volume_target = ch->editable_state.volume;
+ }
+ else{
ch->editable_state.volume = ch->_.volume;
+ }
- if( ch->editble_state_write_mask & AUDIO_EDIT_VOLUME_SLOPE )
- {
+ if( ch->editble_state_write_mask & AUDIO_EDIT_VOLUME_SLOPE ){
ch->volume_movement_start = ch->_.volume;
ch->volume_movement = 0;
ch->_.volume_target = ch->editable_state.volume_target;
ch->_.volume_rate = ch->editable_state.volume_rate;
}
- else
- {
+ else{
ch->editable_state.volume_target = ch->_.volume_target;
ch->editable_state.volume_rate = ch->_.volume_rate;
}
ch->editable_state.sampling_rate = ch->_.sampling_rate;
- if( ch->editble_state_write_mask & AUDIO_EDIT_LFO_ATTACHMENT )
- {
+ if( ch->editble_state_write_mask & AUDIO_EDIT_LFO_ATTACHMENT ){
ch->_.lfo = ch->editable_state.lfo;
ch->_.lfo_amount = ch->editable_state.lfo_amount;
}
- else
- {
+ else{
ch->editable_state.lfo = ch->_.lfo;
ch->editable_state.lfo_amount = ch->_.lfo_amount;
}
ch->editble_state_write_mask = 0x00;
}
- for( int i=0; i<AUDIO_LFOS; i++ )
- {
+ for( int i=0; i<AUDIO_LFOS; i++ ){
audio_lfo *lfo = &vg_audio.oscillators[ i ];
- if( lfo->editble_state_write_mask & AUDIO_EDIT_LFO_WAVE )
- {
+ if( lfo->editble_state_write_mask & AUDIO_EDIT_LFO_WAVE ){
lfo->_.wave_type = lfo->editable_state.wave_type;
if( lfo->_.wave_type == k_lfo_polynomial_bipolar )
}
}
- if( lfo->editble_state_write_mask & AUDIO_EDIT_LFO_PERIOD )
- {
- if( lfo->_.period )
- {
+ if( lfo->editble_state_write_mask & AUDIO_EDIT_LFO_PERIOD ){
+ if( lfo->_.period ){
float t = lfo->time;
t/= (float)lfo->_.period;
lfo->_.period = lfo->editable_state.period;
lfo->time = lfo->_.period * t;
}
- else
- {
+ else{
lfo->time = 0;
lfo->_.period = lfo->editable_state.period;
}
lfo->editble_state_write_mask = 0x00;
}
-
+ dsp_update_tunings();
audio_unlock();
/*
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; i<frame_count; i++ )
+ vg_dsp_process( pOut32F + i*2, pOut32F + i*2 );
+
+ vg_profile_end( &_vg_prof_dsp );
+
audio_lock();
+ for( int i=0; i<AUDIO_CHANNELS; i ++ )
+ {
+ audio_channel *ch = &vg_audio.channels[i];
+ ch->readable_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();
}
if( lin_alloc == NULL )
lin_alloc = vg_audio.audio_pool;
-
/* load in directly */
- if( clip->flags & AUDIO_FLAG_VORBIS )
+ u32 format = clip->flags & AUDIO_FLAG_FORMAT;
+
+ /* TODO: This contains audio_lock() and unlock, but i don't know why
+ * can probably remove them. Low priority to check this */
+
+ if( format == k_audio_format_vorbis )
{
audio_lock();
clip->data = vg_file_read( lin_alloc, clip->path, &clip->size );
float mb = (float)(clip->size) / (1024.0f*1024.0f);
vg_info( "Loaded audio clip '%s' (%.1fmb)\n", clip->path, mb );
}
- else if( clip->flags & AUDIO_FLAG_STEREO )
+ else if( format == k_audio_format_stereo )
{
vg_fatal_exit_loop( "Unsupported format (Stereo uncompressed)" );
}
+ else if( format == k_audio_format_bird )
+ {
+ u32 len = strlen( clip->path ),
+ size = synth_bird_memory_requirement( len );
+
+ if( size > AUDIO_DECODE_SIZE )
+ vg_fatal_exit_loop( "Bird code too long\n" );
+
+ clip->size = size;
+ clip->data = vg_linear_alloc( lin_alloc, size );
+
+ synth_bird_load( clip->data, clip->path, len );
+ }
else
{
vg_linear_clear( vg_mem.scratch );
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
* -----------------------------------------------------------------------
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,
const char *formats[] =
{
- "------",
- "Mono ",
- "Stereo",
- "Vorbis"
+ " mono ",
+ " stereo ",
+ " vorbis ",
+ " none0 ",
+ " none1 ",
+ " none2 ",
+ " none3 ",
+ " none4 ",
+ "synth:bird",
+ " none5 ",
+ " none6 ",
+ " none7 ",
+ " none8 ",
+ " none9 ",
+ " none10 ",
+ " none11 ",
};
- int format_index = 0;
+ const char *activties[] =
+ {
+ "reset",
+ "wake ",
+ "alive",
+ "end ",
+ "error"
+ };
- if( ch->source->flags & AUDIO_FLAG_STEREO )
- format_index = 2;
- else if( ch->source->flags & AUDIO_FLAG_VORBIS )
- format_index = 3;
- else
- format_index = 1;
+ u32 format_index = (ch->source->flags & AUDIO_FLAG_FORMAT)>>9;
- 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 );
- if( format_index == 0 )
- {
- ui_fill_rect( vg_uictx.cursor, 0xa00000ff );
- }
- else
- {
- ui_fill_rect( vg_uictx.cursor, 0xa0333333 );
- }
+ ui_fill_rect( vg_uictx.cursor, 0xa0000000 | ch->colour );
vg_uictx.cursor[0] += 2;
vg_uictx.cursor[1] += 2;
projects / vg.git / blobdiff