diff --git a/Makefile.common b/Makefile.common index 3ecacbbcd6..9233e8b9d5 100644 --- a/Makefile.common +++ b/Makefile.common @@ -873,7 +873,8 @@ endif ifeq ($(TARGET), retroarch_switch) OBJ += gfx/drivers/switch_gfx.o \ input/drivers/switch_input.o \ - input/drivers_joypad/switch_joypad.o + input/drivers_joypad/switch_joypad.o \ + audio/drivers/switch_audio.o endif ifeq ($(HAVE_WAYLAND), 1) diff --git a/audio/audio_driver.c b/audio/audio_driver.c index 4d9788f20d..7139acdccf 100644 --- a/audio/audio_driver.c +++ b/audio/audio_driver.c @@ -115,6 +115,9 @@ static const audio_driver_t *audio_drivers[] = { #ifdef _3DS &audio_ctr_csnd, &audio_ctr_dsp, +#endif +#ifdef SWITCH + &audio_switch, #endif &audio_null, NULL, diff --git a/audio/audio_driver.h b/audio/audio_driver.h index 27b6a4205c..0869f224d4 100644 --- a/audio/audio_driver.h +++ b/audio/audio_driver.h @@ -277,6 +277,7 @@ extern audio_driver_t audio_ax; extern audio_driver_t audio_psp; extern audio_driver_t audio_ctr_csnd; extern audio_driver_t audio_ctr_dsp; +extern audio_driver_t audio_switch; extern audio_driver_t audio_rwebaudio; extern audio_driver_t audio_null; diff --git a/audio/drivers/switch_audio.c b/audio/drivers/switch_audio.c new file mode 100644 index 0000000000..7f3d8ec461 --- /dev/null +++ b/audio/drivers/switch_audio.c @@ -0,0 +1,253 @@ +/* RetroArch - A frontend for libretro. + * Copyright (C) 2014-2017 - Ali Bouhlel + * Copyright (C) 2016-2017 - FIX94 + * + * RetroArch is free software: you can redistribute it and/or modify it under the terms + * of the GNU General Public License as published by the Free Software Found- + * ation, either version 3 of the License, or (at your option) any later version. + * + * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + * PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with RetroArch. + * If not, see . + */ + +#include +#include +#include +#include + +#include "../audio_driver.h" + +#include + +static const int sample_rate = 48000; +static const int max_num_samples = sample_rate; +static const int num_channels = 2; +static const size_t sample_buffer_size = ((max_num_samples * num_channels * sizeof(uint16_t)) + 0xfff) & ~0xfff; +// don't think this can be in mapped memory, since samples get DMA'd out of it +static uint16_t __attribute__((aligned(0x1000))) sample_buffer_1[sample_buffer_size/sizeof(uint16_t)]; +static uint16_t __attribute__((aligned(0x1000))) sample_buffer_2[sample_buffer_size/sizeof(uint16_t)]; +static uint16_t __attribute__((aligned(0x1000))) sample_buffer_3[sample_buffer_size/sizeof(uint16_t)]; +static uint16_t *sample_buffers[3] = {sample_buffer_1, sample_buffer_2, sample_buffer_3}; + +typedef struct { + audio_output_t output; + handle_t event; + audio_output_buffer_t buffers[3]; + audio_output_buffer_t *current_buffer; + bool blocking; + bool is_paused; +} switch_audio_t; + +static ssize_t switch_audio_write(void *data, const void *buf, size_t size) { + switch_audio_t *swa = (switch_audio_t*) data; + + //printf("write %ld samples\n", size/sizeof(uint16_t)); + + if(swa->current_buffer == NULL) { + uint32_t num; + if(audio_ipc_output_get_released_buffer(&swa->output, &num, &swa->current_buffer) != RESULT_OK) { + printf("failed to get released buffer?\n"); + return -1; + } + printf("got buffer, num %d, ptr %p\n", num, swa->current_buffer); + if(num < 1) { + swa->current_buffer = NULL; + } + + if(swa->current_buffer == NULL) { + if(swa->blocking) { + printf("no buffer, blocking...\n"); + while(swa->current_buffer == NULL) { + uint32_t handle_idx; + svcWaitSynchronization(&handle_idx, &swa->event, 1, 33333333); + svcResetSignal(swa->event); + + uint32_t num; + if(audio_ipc_output_get_released_buffer(&swa->output, &num, &swa->current_buffer) != RESULT_OK) { + return -1; + } + } + } else { + printf("no buffer, nonblocking...\n"); + return 0; + } + } + } + + size_t to_write = size; + if(size > sample_buffer_size) { + size = sample_buffer_size; + } + + memcpy(swa->current_buffer->sample_data, buf, to_write); + swa->current_buffer->data_size = to_write; + swa->current_buffer->buffer_size = sample_buffer_size; + result_t r; + if((r = audio_ipc_output_append_buffer(&swa->output, swa->current_buffer)) != RESULT_OK) { + printf("failed to append buffer: 0x%x\n", r); + return -1; + } + swa->current_buffer = NULL; + + //printf("submitted samples\n"); + + return to_write; +} + +static bool switch_audio_stop(void *data) { + switch_audio_t *swa = (switch_audio_t*) data; + swa->is_paused = true; + return audio_ipc_output_stop(&swa->output) == RESULT_OK; +} + +static bool switch_audio_start(void *data, bool is_shutdown) { + switch_audio_t *swa = (switch_audio_t*) data; + + if(audio_ipc_output_start(&swa->output) != RESULT_OK) { + return false; + } + + swa->is_paused = false; + return true; +} + +static bool switch_audio_alive(void *data) { + switch_audio_t *swa = (switch_audio_t*) data; + if(!swa) { + return false; + } + return !swa->is_paused; +} + +static void switch_audio_free(void *data) { + switch_audio_t *swa = (switch_audio_t*) data; + + audio_ipc_output_close(&swa->output); + audio_ipc_finalize(); + free(swa); +} + +static bool switch_audio_use_float(void *data) { + (void) data; + return false; // force INT16 +} + +static size_t switch_audio_write_avail(void *data) { + switch_audio_t *swa = (switch_audio_t*) data; + + return swa->current_buffer == NULL ? 0 : swa->current_buffer->buffer_size; +} + +static void switch_audio_set_nonblock_state(void *data, bool state) { + switch_audio_t *swa = (switch_audio_t*) data; + + if(swa) { + swa->blocking = !state; + } +} + +static void *switch_audio_init(const char *device, + unsigned rate, unsigned latency, + unsigned block_frames, + unsigned *new_rate) { + switch_audio_t *swa = (switch_audio_t*) calloc(1, sizeof(*swa)); + if(!swa) { + return NULL; + } + + result_t r; + if((r = audio_ipc_init()) != RESULT_OK) { + goto fail; + } + + char names[8][0x20]; + uint32_t num_names; + if(audio_ipc_list_outputs(&names[0], 8, &num_names) != RESULT_OK) { + goto fail_audio_ipc; + } + if(num_names != 1) { + printf("got back more than one AudioOut\n"); + goto fail_audio_ipc; + } + + if(audio_ipc_open_output(names[0], &swa->output) != RESULT_OK) { + goto fail_audio_ipc; + } + + if(swa->output.sample_rate != sample_rate) { + printf("expected sample rate of %d, got sample rate of %d\n", sample_rate, swa->output.sample_rate); + goto fail_audio_output; + } + + if(swa->output.num_channels != num_channels) { + printf("expected %d channels, got %d\n", num_channels, swa->output.num_channels); + goto fail_audio_output; + } + + if(swa->output.sample_format != PCM_INT16) { + printf("expected PCM_INT16, got %d\n", swa->output.sample_format); + goto fail_audio_output; + } + + if(audio_ipc_output_register_buffer_event(&swa->output, &swa->event) != RESULT_OK) { + goto fail_audio_output; + } + + swa->blocking = block_frames; + + *new_rate = swa->output.sample_rate; + + for(int i = 0; i < 3; i++) { + swa->buffers[i].ptr = &swa->buffers[i].sample_data; + swa->buffers[i].sample_data = sample_buffers[i]; + swa->buffers[i].buffer_size = sample_buffer_size; + swa->buffers[i].data_size = sample_buffer_size; + swa->buffers[i].unknown = 0; + + if(audio_ipc_output_append_buffer(&swa->output, &swa->buffers[i]) != RESULT_OK) { + goto fail_audio_output; + } + } + + swa->current_buffer = NULL; + + if(audio_ipc_output_start(&swa->output) != RESULT_OK) { + goto fail_audio_output; + } + + printf("init'd switch audio driver\n"); + + return swa; +fail_audio_output: + audio_ipc_output_close(&swa->output); +fail_audio_ipc: + audio_ipc_finalize(); +fail: + free(swa); + return NULL; +} + +static size_t switch_audio_buffer_size(void *data) { + (void) data; + return sample_buffer_size; +} + +audio_driver_t audio_switch = { + switch_audio_init, + switch_audio_write, + switch_audio_stop, + switch_audio_start, + switch_audio_alive, + switch_audio_set_nonblock_state, + switch_audio_free, + switch_audio_use_float, + "switch", + NULL, /* device_list_new */ + NULL, /* device_list_free */ + switch_audio_write_avail, + switch_audio_buffer_size, /* buffer_size */ +}; diff --git a/configuration.c b/configuration.c index 87d8caddb0..36c247529b 100644 --- a/configuration.c +++ b/configuration.c @@ -169,6 +169,7 @@ enum audio_driver_enum AUDIO_RWEBAUDIO, AUDIO_PSP, AUDIO_CTR, + AUDIO_SWITCH, AUDIO_NULL }; @@ -321,6 +322,8 @@ static enum audio_driver_enum AUDIO_DEFAULT_DRIVER = AUDIO_WIIU; static enum audio_driver_enum AUDIO_DEFAULT_DRIVER = AUDIO_PSP; #elif defined(_3DS) static enum audio_driver_enum AUDIO_DEFAULT_DRIVER = AUDIO_CTR; +#elif defined(SWITCH) +static enum audio_driver_enum AUDIO_DEFAULT_DRIVER = AUDIO_SWITCH; #elif defined(HAVE_PULSE) static enum audio_driver_enum AUDIO_DEFAULT_DRIVER = AUDIO_PULSE; #elif defined(HAVE_ALSA) && defined(HAVE_VIDEOCORE) @@ -607,6 +610,8 @@ const char *config_get_default_audio(void) #endif case AUDIO_CTR: return "csnd"; + case AUDIO_SWITCH: + return "switch"; case AUDIO_RWEBAUDIO: return "rwebaudio"; case AUDIO_JACK: