-/* 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
#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
char name[32]; /* only editable while allocated == 0 */
audio_clip *source; /* ... */
u32 flags; /* ... */
+ u32 colour; /* ... */
/* internal non-readable state
* -----------------------------*/
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
}
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;
+ ch->colour = 0x00333333;
strcpy( ch->name, clip->path );
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
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
return n;
}
-static float audio_lfo_pull_sample( audio_lfo *lfo )
+static inline float audio_lfo_pull_sample( audio_lfo *lfo )
{
lfo->time ++;
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;
+ u32 buffer_length = AUDIO_MIX_FRAME_SIZE;
if( ch->_.sampling_rate != 1.0f )
{
- buffer_length = ceilf( (float)frame_count * ch->_.sampling_rate ) + 1;
+ float l = ceilf( (float)(AUDIO_MIX_FRAME_SIZE) * ch->_.sampling_rate );
+ buffer_length = l+1;
}
- float *pcf = alloca( buffer_length * 2 * sizeof(float) );
+ float pcf[ AUDIO_MIX_FRAME_SIZE * 2 * 2 ];
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;
framevol_r *= (vol * 0.5f) * (1.0f + pan);
}
- for( u32 j=0; j<frame_count; j++ )
- {
- if( ch->volume_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<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;
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 );
}
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) )
{
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();
}
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,
"Vorbis"
};
+ const char *activties[] =
+ {
+ "reset",
+ "wake ",
+ "alive",
+ "end ",
+ "error"
+ };
+
int format_index = 0;
if( ch->source->flags & AUDIO_FLAG_STEREO )
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 );
}
else
{
- ui_fill_rect( vg_uictx.cursor, 0xa0333333 );
+ ui_fill_rect( vg_uictx.cursor, 0xa0000000 | ch->colour );
}
vg_uictx.cursor[0] += 2;
projects / vg.git / blobdiff