mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 06:44:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

(audio_driver.c) Cleanup

Browse Source
This commit is contained in:
twinaphex 2016-03-04 21:38:18 +01:00
parent 3d6e6efe49
commit f3a9a38987
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
audio/audio_driver.c
View File

@ -52,9 +52,12 @@ typedef struct audio_driver_input_data
float *outsamples; float *outsamples;
int16_t *conv_outsamples; int16_t *conv_outsamples;
int16_t *rewind_buf; struct
size_t rewind_ptr; {
size_t rewind_size; int16_t *buf;
size_t ptr;
size_t size;
} rewind;
rarch_dsp_filter_t *dsp; rarch_dsp_filter_t *dsp;
@ -252,9 +255,10 @@ static bool uninit_audio(void)
audio_driver_data.conv_outsamples = NULL; audio_driver_data.conv_outsamples = NULL;
audio_driver_data.data_ptr = 0; audio_driver_data.data_ptr = 0;
if (audio_driver_data.rewind_buf) if (audio_driver_data.rewind.buf)
free(audio_driver_data.rewind_buf); free(audio_driver_data.rewind.buf);
audio_driver_data.rewind_buf = NULL; audio_driver_data.rewind.buf = NULL;
audio_driver_data.rewind.size = 0;
if (!settings->audio.enable) if (!settings->audio.enable)
{ {
@ -303,13 +307,13 @@ static bool init_audio(void)
/* Needs to be able to hold full content of a full max_bufsamples /* Needs to be able to hold full content of a full max_bufsamples
* in addition to its own. */ * in addition to its own. */
retro_assert(audio_driver_data.rewind_buf = (int16_t*) retro_assert(audio_driver_data.rewind.buf = (int16_t*)
malloc(max_bufsamples * sizeof(int16_t))); malloc(max_bufsamples * sizeof(int16_t)));
if (!audio_driver_data.rewind_buf) if (!audio_driver_data.rewind.buf)
goto error; goto error;
audio_driver_data.rewind_size = max_bufsamples; audio_driver_data.rewind.size = max_bufsamples;
if (!settings->audio.enable) if (!settings->audio.enable)
{ {
@ -623,8 +627,8 @@ size_t audio_driver_sample_batch(const int16_t *data, size_t frames)
**/ **/
void audio_driver_sample_rewind(int16_t left, int16_t right) void audio_driver_sample_rewind(int16_t left, int16_t right)
{ {
audio_driver_data.rewind_buf[--audio_driver_data.rewind_ptr] = right; audio_driver_data.rewind.buf[--audio_driver_data.rewind.ptr] = right;
audio_driver_data.rewind_buf[--audio_driver_data.rewind_ptr] = left; audio_driver_data.rewind.buf[--audio_driver_data.rewind.ptr] = left;
} }
/** /**
@ -646,7 +650,7 @@ size_t audio_driver_sample_batch_rewind(const int16_t *data, size_t frames)
size_t samples = frames << 1; size_t samples = frames << 1;
for (i = 0; i < samples; i++) for (i = 0; i < samples; i++)
audio_driver_data.rewind_buf[--audio_driver_data.rewind_ptr] = data[i]; audio_driver_data.rewind.buf[--audio_driver_data.rewind.ptr] = data[i];
return frames; return frames;
} }
@ -729,14 +733,14 @@ static void audio_driver_setup_rewind(void)
unsigned i; unsigned i;
/* Push audio ready to be played. */ /* Push audio ready to be played. */
audio_driver_data.rewind_ptr = audio_driver_data.rewind_size; audio_driver_data.rewind.ptr = audio_driver_data.rewind.size;
for (i = 0; i < audio_driver_data.data_ptr; i += 2) for (i = 0; i < audio_driver_data.data_ptr; i += 2)
{ {
audio_driver_data.rewind_buf[--audio_driver_data.rewind_ptr] = audio_driver_data.rewind.buf[--audio_driver_data.rewind.ptr] =
audio_driver_data.conv_outsamples[i + 1]; audio_driver_data.conv_outsamples[i + 1];
audio_driver_data.rewind_buf[--audio_driver_data.rewind_ptr] = audio_driver_data.rewind.buf[--audio_driver_data.rewind.ptr] =
audio_driver_data.conv_outsamples[i + 0]; audio_driver_data.conv_outsamples[i + 0];
} }
@ -896,8 +900,8 @@ bool audio_driver_ctl(enum rarch_audio_ctl_state state, void *data)
case RARCH_AUDIO_CTL_FRAME_IS_REVERSE: case RARCH_AUDIO_CTL_FRAME_IS_REVERSE:
/* We just rewound. Flush rewind audio buffer. */ /* We just rewound. Flush rewind audio buffer. */
audio_driver_flush( audio_driver_flush(
audio_driver_data.rewind_buf + audio_driver_data.rewind_ptr, audio_driver_data.rewind.buf + audio_driver_data.rewind.ptr,
audio_driver_data.rewind_size - audio_driver_data.rewind_ptr); audio_driver_data.rewind.size - audio_driver_data.rewind.ptr);
return true; return true;
case RARCH_AUDIO_CTL_NONE: case RARCH_AUDIO_CTL_NONE:
default: default: