mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-28 08:37:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change more functions

Browse Source
This commit is contained in:
twinaphex 2016-05-08 16:09:08 +02:00
parent fc5f1524cc
commit 0c05828874
2 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
audio/audio_driver.c
View File

@ -396,7 +396,7 @@ static bool audio_driver_init_internal(bool audio_cb_inited)
audio_driver_data.audio_rate.source_ratio.current = audio_driver_data.audio_rate.source_ratio.current =
(double)settings->audio.out_rate / audio_driver_data.audio_rate.input; (double)settings->audio.out_rate / audio_driver_data.audio_rate.input;
if (!audio_driver_ctl(RARCH_AUDIO_CTL_RESAMPLER_INIT, NULL)) if (!audio_driver_init_resampler())
{ {
RARCH_ERR("Failed to initialize resampler \"%s\".\n", RARCH_ERR("Failed to initialize resampler \"%s\".\n",
settings->audio.resampler); settings->audio.resampler);
@ -572,7 +572,7 @@ static bool audio_driver_flush(const int16_t *data, size_t samples)
if (runloop_ctl(RUNLOOP_CTL_IS_SLOWMOTION, NULL)) if (runloop_ctl(RUNLOOP_CTL_IS_SLOWMOTION, NULL))
src_data.ratio *= settings->slowmotion_ratio; src_data.ratio *= settings->slowmotion_ratio;
audio_driver_ctl(RARCH_AUDIO_CTL_RESAMPLER_PROCESS, &src_data); audio_driver_process_resampler(&src_data);
output_data = audio_driver_data.output_samples.buf; output_data = audio_driver_data.output_samples.buf;
output_frames = src_data.output_frames; output_frames = src_data.output_frames;
@ -825,26 +825,31 @@ bool audio_driver_get_devices_list(void **data)
return true; return true;
} }
bool audio_driver_init_resampler(void)
{
settings_t *settings = config_get_ptr();
return rarch_resampler_realloc(
&audio_driver_resampler_data,
&audio_driver_resampler,
settings->audio.resampler,
audio_driver_data.audio_rate.source_ratio.original);
}
void audio_driver_process_resampler(struct resampler_data *data)
{
rarch_perf_init(&resampler_proc, "resampler_proc");
retro_perf_start(&resampler_proc);
rarch_resampler_process(audio_driver_resampler,
audio_driver_resampler_data, data);
retro_perf_stop(&resampler_proc);
}
bool audio_driver_ctl(enum rarch_audio_ctl_state state, void *data) bool audio_driver_ctl(enum rarch_audio_ctl_state state, void *data)
{ {
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
switch (state) switch (state)
{ {
case RARCH_AUDIO_CTL_RESAMPLER_INIT:
return rarch_resampler_realloc(
&audio_driver_resampler_data,
&audio_driver_resampler,
settings->audio.resampler,
audio_driver_data.audio_rate.source_ratio.original);
case RARCH_AUDIO_CTL_RESAMPLER_PROCESS:
rarch_perf_init(&resampler_proc, "resampler_proc");
retro_perf_start(&resampler_proc);
rarch_resampler_process(audio_driver_resampler,
audio_driver_resampler_data,
(struct resampler_data*)data);
retro_perf_stop(&resampler_proc);
break;
case RARCH_AUDIO_CTL_DESTROY: case RARCH_AUDIO_CTL_DESTROY:
audio_driver_active = false; audio_driver_active = false;
audio_driver_data_own = false; audio_driver_data_own = false;

9
audio/audio_driver.h
View File

@ -24,6 +24,7 @@
#include <boolean.h> #include <boolean.h>
#include "audio_dsp_filter.h" #include "audio_dsp_filter.h"
#include "audio_resampler_driver.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -63,9 +64,7 @@ enum rarch_audio_ctl_state
RARCH_AUDIO_CTL_OWNS_DRIVER, RARCH_AUDIO_CTL_OWNS_DRIVER,
RARCH_AUDIO_CTL_SET_ACTIVE, RARCH_AUDIO_CTL_SET_ACTIVE,
RARCH_AUDIO_CTL_UNSET_ACTIVE, RARCH_AUDIO_CTL_UNSET_ACTIVE,
RARCH_AUDIO_CTL_IS_ACTIVE, RARCH_AUDIO_CTL_IS_ACTIVE
RARCH_AUDIO_CTL_RESAMPLER_INIT,
RARCH_AUDIO_CTL_RESAMPLER_PROCESS
}; };
typedef struct audio_driver typedef struct audio_driver
@ -124,6 +123,10 @@ bool audio_driver_ctl(enum rarch_audio_ctl_state state, void *data);
void audio_driver_deinit_resampler(void); void audio_driver_deinit_resampler(void);
bool audio_driver_init_resampler(void);
void audio_driver_process_resampler(struct resampler_data *data);
bool audio_driver_free_devices_list(void); bool audio_driver_free_devices_list(void);
bool audio_driver_new_devices_list(void); bool audio_driver_new_devices_list(void);