From 7edd381593de14a7ab7214ce7faf5308a8e65490 Mon Sep 17 00:00:00 2001 From: hexkyz Date: Tue, 13 Feb 2018 19:17:54 +0000 Subject: [PATCH 01/13] Initial audio support --- nx/include/switch.h | 1 + nx/include/switch/services/audout.h | 49 ++++ nx/source/services/audout.c | 387 ++++++++++++++++++++++++++++ 3 files changed, 437 insertions(+) create mode 100644 nx/include/switch/services/audout.h create mode 100644 nx/source/services/audout.c diff --git a/nx/include/switch.h b/nx/include/switch.h index 706160a3..006fa1f0 100644 --- a/nx/include/switch.h +++ b/nx/include/switch.h @@ -32,6 +32,7 @@ extern "C" { #include "switch/services/acc.h" #include "switch/services/apm.h" #include "switch/services/applet.h" +#include "switch/services/audout.h" #include "switch/services/bsd.h" #include "switch/services/fatal.h" #include "switch/services/usb.h" diff --git a/nx/include/switch/services/audout.h b/nx/include/switch/services/audout.h new file mode 100644 index 00000000..d4cb38cd --- /dev/null +++ b/nx/include/switch/services/audout.h @@ -0,0 +1,49 @@ +/** + * @file audout.h + * @brief Audio output service. + * @author hexkyz + * @copyright libnx Authors + */ +#pragma once + +#include "../types.h" + +typedef enum { + PcmFormat_Invalid = 0, + PcmFormat_INT8 = 1, + PcmFormat_INT16 = 2, + PcmFormat_INT24 = 3, + PcmFormat_INT32 = 4, + PcmFormat_FLOAT = 5, + PcmFormat_ADPCM = 6, +} PcmFormat; + +typedef enum { + AudioOutState_Started = 0, + AudioOutState_Stopped = 1, +} AudioOutState; + +/// audio output buffer format +typedef struct AudioOutBuffer AudioOutBuffer; + +struct AudioOutBuffer +{ + AudioOutBuffer* next; ///< Next buffer. + void* buffer; ///< Sample buffer. + u64 buffer_size; ///< Sample buffer size. + u64 data_size; ///< Size of data inside the buffer. + u64 data_offset; ///< Offset of data inside the buffer. +}; + +Result audoutInitialize(void); +void audoutExit(void); + +Result audoutListAudioOuts(char *DeviceNames, u32 *DeviceNamesCount); +Result audoutOpenAudioOut(const char *DeviceNameIn, char *DeviceNameOut, u32 SampleRateIn, u32 ChannelCountIn, u32 *SampleRateOut, u32 *ChannelCountOut, PcmFormat *Format, AudioOutState *State); +Result audoutGetAudioOutState(AudioOutState *State); +Result audoutStartAudioOut(void); +Result audoutStopAudioOut(void); +Result audoutAppendAudioOutBuffer(AudioOutBuffer *Buffer); +Result audoutRegisterBufferEvent(Handle *BufferEvent); +Result audoutGetReleasedAudioOutBuffer(AudioOutBuffer *Buffer, u32 *ReleasedBuffersCount); +Result audoutContainsAudioOutBuffer(AudioOutBuffer *Buffer, bool *ContainsBuffer); diff --git a/nx/source/services/audout.c b/nx/source/services/audout.c new file mode 100644 index 00000000..3d273565 --- /dev/null +++ b/nx/source/services/audout.c @@ -0,0 +1,387 @@ +#include +#include "types.h" +#include "result.h" +#include "ipc.h" +#include "services/audout.h" +#include "services/sm.h" + +#define DEVICE_NAME_LENGTH 0x100 +#define DEFAULT_SAMPLE_RATE 0xBB80 +#define CHANNEL_COUNT_MAGIC 0xCAFE0000 + +static Service g_audoutSrv; +static Service g_audoutIAudioOut; + +Result audoutInitialize(void) +{ + if (serviceIsActive(&g_audoutSrv)) + return MAKERESULT(Module_Libnx, LibnxError_AlreadyInitialized); + + Result rc = 0; + rc = smGetService(&g_audoutSrv, "audout:u"); + + // Setup the default device + if (R_SUCCEEDED(rc)) + { + u32 SampleRate = 0; + u32 ChannelCount = 0; + PcmFormat Format = 0; + AudioOutState State = 0; + + // Passing an empty device name will open the default "DeviceOut" + char DeviceNameIn[DEVICE_NAME_LENGTH]; + char DeviceNameOut[DEVICE_NAME_LENGTH]; + + rc = audoutOpenAudioOut(DeviceNameIn, DeviceNameOut, DEFAULT_SAMPLE_RATE, CHANNEL_COUNT_MAGIC, &SampleRate, &ChannelCount, &Format, &State); + } + + if (R_FAILED(rc)) + audoutExit(); + + return rc; +} + +void audoutExit(void) +{ + serviceClose(&g_audoutIAudioOut); + serviceClose(&g_audoutSrv); +} + +Result audoutListAudioOuts(char *DeviceNames, u32 *DeviceNamesCount) { + IpcCommand c; + ipcInitialize(&c); + + struct { + u64 magic; + u64 cmd_id; + } *raw; + + ipcAddRecvBuffer(&c, DeviceNames, DEVICE_NAME_LENGTH, 0); + + raw = ipcPrepareHeader(&c, sizeof(*raw)); + + raw->magic = SFCI_MAGIC; + raw->cmd_id = 0; + + Result rc = serviceIpcDispatch(&g_audoutSrv); + + if (R_SUCCEEDED(rc)) { + IpcParsedCommand r; + ipcParse(&r); + + struct { + u64 magic; + u64 result; + u32 DeviceNamesCount; + } *resp = r.Raw; + + rc = resp->result; + + if (R_SUCCEEDED(rc) && DeviceNamesCount) + *DeviceNamesCount = resp->DeviceNamesCount; + } + + return rc; +} + +Result audoutOpenAudioOut(const char *DeviceNameIn, char *DeviceNameOut, u32 SampleRateIn, u32 ChannelCountIn, u32 *SampleRateOut, u32 *ChannelCountOut, PcmFormat *Format, AudioOutState *State) { + IpcCommand c; + ipcInitialize(&c); + + struct { + u64 magic; + u64 cmd_id; + u32 sample_rate; + u32 channel_count; + u64 client_pid; + } *raw; + + ipcSendPid(&c); + ipcSendHandleCopy(&c, CUR_PROCESS_HANDLE); + ipcAddSendBuffer(&c, DeviceNameIn, DEVICE_NAME_LENGTH, 0); + ipcAddRecvBuffer(&c, DeviceNameOut, DEVICE_NAME_LENGTH, 0); + + raw = ipcPrepareHeader(&c, sizeof(*raw)); + + raw->magic = SFCI_MAGIC; + raw->cmd_id = 1; + raw->sample_rate = SampleRateIn; + raw->channel_count = ChannelCountIn; + raw->client_pid = 0; + + Result rc = serviceIpcDispatch(&g_audoutSrv); + + if (R_SUCCEEDED(rc)) { + IpcParsedCommand r; + ipcParse(&r); + + struct { + u64 magic; + u64 result; + u32 sample_rate; + u32 channel_count; + u32 pcm_format; + u32 state; + } *resp = r.Raw; + + rc = resp->result; + + if (R_SUCCEEDED(rc)) { + serviceCreate(&g_audoutIAudioOut, r.Handles[0]); + + if (SampleRateOut) + *SampleRateOut = resp->sample_rate; + + if (ChannelCountOut) + *ChannelCountOut = resp->channel_count; + + if (Format) + *Format = resp->pcm_format; + + if (State) + *State = resp->state; + } + } + + return rc; +} + +Result audoutGetAudioOutState(AudioOutState *State) { + IpcCommand c; + ipcInitialize(&c); + + struct { + u64 magic; + u64 cmd_id; + } *raw; + + raw = ipcPrepareHeader(&c, sizeof(*raw)); + + raw->magic = SFCI_MAGIC; + raw->cmd_id = 0; + + Result rc = serviceIpcDispatch(&g_audoutIAudioOut); + + if (R_SUCCEEDED(rc)) { + IpcParsedCommand r; + ipcParse(&r); + + struct { + u64 magic; + u64 result; + u32 state; + } *resp = r.Raw; + + rc = resp->result; + + if (R_SUCCEEDED(rc) && State) + *State = resp->state; + } + + return rc; +} + +Result audoutStartAudioOut(void) { + IpcCommand c; + ipcInitialize(&c); + + struct { + u64 magic; + u64 cmd_id; + } *raw; + + raw = ipcPrepareHeader(&c, sizeof(*raw)); + + raw->magic = SFCI_MAGIC; + raw->cmd_id = 1; + + Result rc = serviceIpcDispatch(&g_audoutIAudioOut); + + if (R_SUCCEEDED(rc)) { + IpcParsedCommand r; + ipcParse(&r); + + struct { + u64 magic; + u64 result; + } *resp = r.Raw; + + rc = resp->result; + } + + return rc; +} + +Result audoutStopAudioOut(void) { + IpcCommand c; + ipcInitialize(&c); + + struct { + u64 magic; + u64 cmd_id; + } *raw; + + raw = ipcPrepareHeader(&c, sizeof(*raw)); + + raw->magic = SFCI_MAGIC; + raw->cmd_id = 2; + + Result rc = serviceIpcDispatch(&g_audoutIAudioOut); + + if (R_SUCCEEDED(rc)) { + IpcParsedCommand r; + ipcParse(&r); + + struct { + u64 magic; + u64 result; + } *resp = r.Raw; + + rc = resp->result; + } + + return rc; +} + +Result audoutAppendAudioOutBuffer(AudioOutBuffer *Buffer) { + IpcCommand c; + ipcInitialize(&c); + + struct { + u64 magic; + u64 cmd_id; + u64 tag; + } *raw; + + ipcAddSendBuffer(&c, Buffer, sizeof(AudioOutBuffer), 0); + + raw = ipcPrepareHeader(&c, sizeof(*raw)); + + raw->magic = SFCI_MAGIC; + raw->cmd_id = 3; + raw->tag = (u64)&Buffer; + + Result rc = serviceIpcDispatch(&g_audoutIAudioOut); + + if (R_SUCCEEDED(rc)) { + IpcParsedCommand r; + ipcParse(&r); + + struct { + u64 magic; + u64 result; + } *resp = r.Raw; + + rc = resp->result; + } + + return rc; +} + +Result audoutRegisterBufferEvent(Handle *BufferEvent) { + IpcCommand c; + ipcInitialize(&c); + + struct { + u64 magic; + u64 cmd_id; + } *raw; + + raw = ipcPrepareHeader(&c, sizeof(*raw)); + + raw->magic = SFCI_MAGIC; + raw->cmd_id = 4; + + Result rc = serviceIpcDispatch(&g_audoutIAudioOut); + + if (R_SUCCEEDED(rc)) { + IpcParsedCommand r; + ipcParse(&r); + + struct { + u64 magic; + u64 result; + } *resp = r.Raw; + + rc = resp->result; + + if (R_SUCCEEDED(rc) && BufferEvent) + *BufferEvent = r.Handles[0]; + } + + return rc; +} + +Result audoutGetReleasedAudioOutBuffer(AudioOutBuffer *Buffer, u32 *ReleasedBuffersCount) { + IpcCommand c; + ipcInitialize(&c); + + struct { + u64 magic; + u64 cmd_id; + } *raw; + + ipcAddRecvBuffer(&c, Buffer, sizeof(AudioOutBuffer), 0); + + raw = ipcPrepareHeader(&c, sizeof(*raw)); + + raw->magic = SFCI_MAGIC; + raw->cmd_id = 5; + + Result rc = serviceIpcDispatch(&g_audoutIAudioOut); + + if (R_SUCCEEDED(rc)) { + IpcParsedCommand r; + ipcParse(&r); + + struct { + u64 magic; + u64 result; + u32 released_buffers_count; + } *resp = r.Raw; + + rc = resp->result; + + if (R_SUCCEEDED(rc) && ReleasedBuffersCount) + *ReleasedBuffersCount = resp->released_buffers_count; + } + + return rc; +} + +Result audoutContainsAudioOutBuffer(AudioOutBuffer *Buffer, bool *ContainsBuffer) { + IpcCommand c; + ipcInitialize(&c); + + struct { + u64 magic; + u64 cmd_id; + u64 tag; + } *raw; + + raw = ipcPrepareHeader(&c, sizeof(*raw)); + + raw->magic = SFCI_MAGIC; + raw->cmd_id = 6; + raw->tag = (u64)&Buffer; + + Result rc = serviceIpcDispatch(&g_audoutIAudioOut); + + if (R_SUCCEEDED(rc)) { + IpcParsedCommand r; + ipcParse(&r); + + struct { + u64 magic; + u64 result; + u32 contains_buffer; + } *resp = r.Raw; + + rc = resp->result; + + if (R_SUCCEEDED(rc) && ContainsBuffer) + *ContainsBuffer = (resp->contains_buffer & 0x01); + } + + return rc; +} From 9c9ff5f8a7b082babf3aa54478255ec9699cee7f Mon Sep 17 00:00:00 2001 From: Mike H Date: Tue, 13 Feb 2018 19:41:02 +0000 Subject: [PATCH 02/13] Initialize arrays --- nx/source/services/audout.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nx/source/services/audout.c b/nx/source/services/audout.c index 3d273565..23b6ef8c 100644 --- a/nx/source/services/audout.c +++ b/nx/source/services/audout.c @@ -29,8 +29,8 @@ Result audoutInitialize(void) AudioOutState State = 0; // Passing an empty device name will open the default "DeviceOut" - char DeviceNameIn[DEVICE_NAME_LENGTH]; - char DeviceNameOut[DEVICE_NAME_LENGTH]; + char DeviceNameIn[DEVICE_NAME_LENGTH] = {0}; + char DeviceNameOut[DEVICE_NAME_LENGTH] = {0}; rc = audoutOpenAudioOut(DeviceNameIn, DeviceNameOut, DEFAULT_SAMPLE_RATE, CHANNEL_COUNT_MAGIC, &SampleRate, &ChannelCount, &Format, &State); } From d7a513f1c55ed6b31094db89b4449366d9d11e62 Mon Sep 17 00:00:00 2001 From: Mike H Date: Tue, 13 Feb 2018 19:43:47 +0000 Subject: [PATCH 03/13] Moving comment for doxygen --- nx/include/switch/services/audout.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nx/include/switch/services/audout.h b/nx/include/switch/services/audout.h index d4cb38cd..ed73fc74 100644 --- a/nx/include/switch/services/audout.h +++ b/nx/include/switch/services/audout.h @@ -23,9 +23,9 @@ typedef enum { AudioOutState_Stopped = 1, } AudioOutState; -/// audio output buffer format typedef struct AudioOutBuffer AudioOutBuffer; +/// audio output buffer format struct AudioOutBuffer { AudioOutBuffer* next; ///< Next buffer. From d4c586bdb88ecee6dbb8f8300c8a8ad4625832bd Mon Sep 17 00:00:00 2001 From: Mike H Date: Tue, 13 Feb 2018 21:38:02 +0000 Subject: [PATCH 04/13] Add functions for state retrieval --- nx/include/switch/services/audout.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/nx/include/switch/services/audout.h b/nx/include/switch/services/audout.h index ed73fc74..952f1d2f 100644 --- a/nx/include/switch/services/audout.h +++ b/nx/include/switch/services/audout.h @@ -23,9 +23,9 @@ typedef enum { AudioOutState_Stopped = 1, } AudioOutState; +/// audio output buffer format typedef struct AudioOutBuffer AudioOutBuffer; -/// audio output buffer format struct AudioOutBuffer { AudioOutBuffer* next; ///< Next buffer. @@ -47,3 +47,9 @@ Result audoutAppendAudioOutBuffer(AudioOutBuffer *Buffer); Result audoutRegisterBufferEvent(Handle *BufferEvent); Result audoutGetReleasedAudioOutBuffer(AudioOutBuffer *Buffer, u32 *ReleasedBuffersCount); Result audoutContainsAudioOutBuffer(AudioOutBuffer *Buffer, bool *ContainsBuffer); + +/// These return the state associated with the currently active audio output device. +u32 audoutGetSampleRate(void); +u32 audoutGetChannelCount(void); +PcmFormat audoutGetPcmFormat(void); +AudioOutState audoutGetDeviceState(void); From f52337147476f8e4e80769db533b97bcce66ae26 Mon Sep 17 00:00:00 2001 From: Mike H Date: Tue, 13 Feb 2018 21:38:42 +0000 Subject: [PATCH 05/13] Add functions for state retrieval --- nx/source/services/audout.c | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/nx/source/services/audout.c b/nx/source/services/audout.c index 23b6ef8c..7f607aa4 100644 --- a/nx/source/services/audout.c +++ b/nx/source/services/audout.c @@ -12,6 +12,11 @@ static Service g_audoutSrv; static Service g_audoutIAudioOut; +static u32 g_sampleRate = 0; +static u32 g_channelCount = 0; +static PcmFormat g_pcmFormat = PcmFormat_Invalid; +static AudioOutState g_deviceState = AudioOutState_Stopped; + Result audoutInitialize(void) { if (serviceIsActive(&g_audoutSrv)) @@ -22,17 +27,12 @@ Result audoutInitialize(void) // Setup the default device if (R_SUCCEEDED(rc)) - { - u32 SampleRate = 0; - u32 ChannelCount = 0; - PcmFormat Format = 0; - AudioOutState State = 0; - + { // Passing an empty device name will open the default "DeviceOut" char DeviceNameIn[DEVICE_NAME_LENGTH] = {0}; char DeviceNameOut[DEVICE_NAME_LENGTH] = {0}; - rc = audoutOpenAudioOut(DeviceNameIn, DeviceNameOut, DEFAULT_SAMPLE_RATE, CHANNEL_COUNT_MAGIC, &SampleRate, &ChannelCount, &Format, &State); + rc = audoutOpenAudioOut(DeviceNameIn, DeviceNameOut, DEFAULT_SAMPLE_RATE, CHANNEL_COUNT_MAGIC, &g_sampleRate, &g_channelCount, &g_pcmFormat, &g_deviceState); } if (R_FAILED(rc)) @@ -43,10 +43,31 @@ Result audoutInitialize(void) void audoutExit(void) { + g_sampleRate = 0; + g_channelCount = 0; + g_pcmFormat = PcmFormat_Invalid; + g_deviceState = AudioOutState_Stopped; + serviceClose(&g_audoutIAudioOut); serviceClose(&g_audoutSrv); } +u32 audoutGetSampleRate(void) { + return g_sampleRate; +} + +u32 audoutGetChannelCount(void) { + return g_channelCount; +} + +PcmFormat audoutGetPcmFormat(void) { + return g_pcmFormat; +} + +AudioOutState audoutGetDeviceState(void) { + return g_deviceState; +} + Result audoutListAudioOuts(char *DeviceNames, u32 *DeviceNamesCount) { IpcCommand c; ipcInitialize(&c); From 0acaf0462f5f7bba5e1b7c0f647bc3fb151b24b8 Mon Sep 17 00:00:00 2001 From: Mike H Date: Wed, 14 Feb 2018 15:33:19 +0000 Subject: [PATCH 06/13] Introducing wrapper function for buffer playback --- nx/include/switch/services/audout.h | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/nx/include/switch/services/audout.h b/nx/include/switch/services/audout.h index 952f1d2f..12f4476f 100644 --- a/nx/include/switch/services/audout.h +++ b/nx/include/switch/services/audout.h @@ -23,7 +23,7 @@ typedef enum { AudioOutState_Stopped = 1, } AudioOutState; -/// audio output buffer format +/// Audio output buffer format typedef struct AudioOutBuffer AudioOutBuffer; struct AudioOutBuffer @@ -48,6 +48,16 @@ Result audoutRegisterBufferEvent(Handle *BufferEvent); Result audoutGetReleasedAudioOutBuffer(AudioOutBuffer *Buffer, u32 *ReleasedBuffersCount); Result audoutContainsAudioOutBuffer(AudioOutBuffer *Buffer, bool *ContainsBuffer); +/** + * @brief Submits an audio sample data buffer for playing. + * @param event Handle obtained from audoutRegisterBufferEvent. + * @param source AudioOutBuffer containing the source sample data to be played. + * @param released AudioOutBuffer to receive the last played buffer. + * @param duration Playback duration in ticks. + * @return Whether a timeout occurred while waiting for data to be played. + */ +bool audoutPlayBuffer(Handle *event, AudioOutBuffer *source, AudioOutBuffer *released, u64 duration); + /// These return the state associated with the currently active audio output device. u32 audoutGetSampleRate(void); u32 audoutGetChannelCount(void); From da712eb4df6cebfd47f30c87ecaac04b46839ee6 Mon Sep 17 00:00:00 2001 From: Mike H Date: Wed, 14 Feb 2018 15:33:51 +0000 Subject: [PATCH 07/13] Introducing wrapper function for buffer playback --- nx/source/services/audout.c | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/nx/source/services/audout.c b/nx/source/services/audout.c index 7f607aa4..1f53f3be 100644 --- a/nx/source/services/audout.c +++ b/nx/source/services/audout.c @@ -7,7 +7,7 @@ #define DEVICE_NAME_LENGTH 0x100 #define DEFAULT_SAMPLE_RATE 0xBB80 -#define CHANNEL_COUNT_MAGIC 0xCAFE0000 +#define DEFAULT_CHANNEL_COUNT 0x00020000 static Service g_audoutSrv; static Service g_audoutIAudioOut; @@ -32,7 +32,7 @@ Result audoutInitialize(void) char DeviceNameIn[DEVICE_NAME_LENGTH] = {0}; char DeviceNameOut[DEVICE_NAME_LENGTH] = {0}; - rc = audoutOpenAudioOut(DeviceNameIn, DeviceNameOut, DEFAULT_SAMPLE_RATE, CHANNEL_COUNT_MAGIC, &g_sampleRate, &g_channelCount, &g_pcmFormat, &g_deviceState); + rc = audoutOpenAudioOut(DeviceNameIn, DeviceNameOut, DEFAULT_SAMPLE_RATE, DEFAULT_CHANNEL_COUNT, &g_sampleRate, &g_channelCount, &g_pcmFormat, &g_deviceState); } if (R_FAILED(rc)) @@ -68,6 +68,37 @@ AudioOutState audoutGetDeviceState(void) { return g_deviceState; } +bool audoutPlayBuffer(Handle *event, AudioOutBuffer *source, AudioOutBuffer *released, u64 duration) { + bool timeout = false; + u64 time_now = svcGetSystemTick(); + + while ((svcGetSystemTick() - time_now) < duration) + { + Result do_wait = svcWaitSynchronizationSingle(*event, U64_MAX); + + if (R_SUCCEEDED(do_wait)) + { + svcResetSignal(*event); + + u32 released_count = 0; + Result do_release = audoutGetReleasedAudioOutBuffer(released, &released_count); + + while (R_SUCCEEDED(do_release) && (released_count > 0)) + { + do_release = audoutGetReleasedAudioOutBuffer(released, &released_count); + audoutAppendAudioOutBuffer(source); + } + } + else + { + timeout = true; + break; + } + } + + return timeout; +} + Result audoutListAudioOuts(char *DeviceNames, u32 *DeviceNamesCount) { IpcCommand c; ipcInitialize(&c); From c53beed7f242b7e10571ca1a6a43f34bb13c1df4 Mon Sep 17 00:00:00 2001 From: Mike H Date: Fri, 16 Feb 2018 18:28:31 +0000 Subject: [PATCH 08/13] Improved handling of buffer playback --- nx/include/switch/services/audout.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/nx/include/switch/services/audout.h b/nx/include/switch/services/audout.h index 12f4476f..a94f1d4b 100644 --- a/nx/include/switch/services/audout.h +++ b/nx/include/switch/services/audout.h @@ -50,13 +50,10 @@ Result audoutContainsAudioOutBuffer(AudioOutBuffer *Buffer, bool *ContainsBuffer /** * @brief Submits an audio sample data buffer for playing. - * @param event Handle obtained from audoutRegisterBufferEvent. * @param source AudioOutBuffer containing the source sample data to be played. * @param released AudioOutBuffer to receive the last played buffer. - * @param duration Playback duration in ticks. - * @return Whether a timeout occurred while waiting for data to be played. */ -bool audoutPlayBuffer(Handle *event, AudioOutBuffer *source, AudioOutBuffer *released, u64 duration); +void audoutPlayBuffer(AudioOutBuffer *source, AudioOutBuffer *released); /// These return the state associated with the currently active audio output device. u32 audoutGetSampleRate(void); From 7b4af3a1366950720bf6f8834cf41d5330cb4d65 Mon Sep 17 00:00:00 2001 From: Mike H Date: Fri, 16 Feb 2018 18:29:06 +0000 Subject: [PATCH 09/13] Improved handling of buffer playback --- nx/source/services/audout.c | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/nx/source/services/audout.c b/nx/source/services/audout.c index 1f53f3be..04ff2a48 100644 --- a/nx/source/services/audout.c +++ b/nx/source/services/audout.c @@ -12,6 +12,8 @@ static Service g_audoutSrv; static Service g_audoutIAudioOut; +static Handle g_audoutBufferEventHandle = INVALID_HANDLE; + static u32 g_sampleRate = 0; static u32 g_channelCount = 0; static PcmFormat g_pcmFormat = PcmFormat_Invalid; @@ -32,9 +34,14 @@ Result audoutInitialize(void) char DeviceNameIn[DEVICE_NAME_LENGTH] = {0}; char DeviceNameOut[DEVICE_NAME_LENGTH] = {0}; + // Open audio output device rc = audoutOpenAudioOut(DeviceNameIn, DeviceNameOut, DEFAULT_SAMPLE_RATE, DEFAULT_CHANNEL_COUNT, &g_sampleRate, &g_channelCount, &g_pcmFormat, &g_deviceState); } + // Register global handle for buffer events + if (R_SUCCEEDED(rc)) + rc = audoutRegisterBufferEvent(&g_audoutBufferEventHandle); + if (R_FAILED(rc)) audoutExit(); @@ -43,6 +50,11 @@ Result audoutInitialize(void) void audoutExit(void) { + if (g_audoutBufferEventHandle != INVALID_HANDLE) { + svcCloseHandle(g_audoutBufferEventHandle); + g_audoutBufferEventHandle = INVALID_HANDLE; + } + g_sampleRate = 0; g_channelCount = 0; g_pcmFormat = PcmFormat_Invalid; @@ -68,35 +80,27 @@ AudioOutState audoutGetDeviceState(void) { return g_deviceState; } -bool audoutPlayBuffer(Handle *event, AudioOutBuffer *source, AudioOutBuffer *released, u64 duration) { - bool timeout = false; - u64 time_now = svcGetSystemTick(); +void audoutPlayBuffer(AudioOutBuffer *source, AudioOutBuffer *released) { + // Try to push the supplied buffer to the audio output device + Result do_append = audoutAppendAudioOutBuffer(source); - while ((svcGetSystemTick() - time_now) < duration) + if (R_SUCCEEDED(do_append)) { - Result do_wait = svcWaitSynchronizationSingle(*event, U64_MAX); + // Wait on the buffer event handle + Result do_wait = svcWaitSynchronizationSingle(g_audoutBufferEventHandle, U64_MAX); if (R_SUCCEEDED(do_wait)) { - svcResetSignal(*event); + svcResetSignal(g_audoutBufferEventHandle); u32 released_count = 0; Result do_release = audoutGetReleasedAudioOutBuffer(released, &released_count); + // Ensure that all buffers are released and return the last one only while (R_SUCCEEDED(do_release) && (released_count > 0)) - { do_release = audoutGetReleasedAudioOutBuffer(released, &released_count); - audoutAppendAudioOutBuffer(source); - } - } - else - { - timeout = true; - break; } } - - return timeout; } Result audoutListAudioOuts(char *DeviceNames, u32 *DeviceNamesCount) { From aebe96338c9f84619ad7195187a04d6643ac3851 Mon Sep 17 00:00:00 2001 From: Mike H Date: Fri, 16 Feb 2018 21:28:21 +0000 Subject: [PATCH 10/13] No need to expose internal function --- nx/include/switch/services/audout.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/nx/include/switch/services/audout.h b/nx/include/switch/services/audout.h index a94f1d4b..1f8a20a5 100644 --- a/nx/include/switch/services/audout.h +++ b/nx/include/switch/services/audout.h @@ -44,7 +44,6 @@ Result audoutGetAudioOutState(AudioOutState *State); Result audoutStartAudioOut(void); Result audoutStopAudioOut(void); Result audoutAppendAudioOutBuffer(AudioOutBuffer *Buffer); -Result audoutRegisterBufferEvent(Handle *BufferEvent); Result audoutGetReleasedAudioOutBuffer(AudioOutBuffer *Buffer, u32 *ReleasedBuffersCount); Result audoutContainsAudioOutBuffer(AudioOutBuffer *Buffer, bool *ContainsBuffer); @@ -56,7 +55,7 @@ Result audoutContainsAudioOutBuffer(AudioOutBuffer *Buffer, bool *ContainsBuffer void audoutPlayBuffer(AudioOutBuffer *source, AudioOutBuffer *released); /// These return the state associated with the currently active audio output device. -u32 audoutGetSampleRate(void); -u32 audoutGetChannelCount(void); -PcmFormat audoutGetPcmFormat(void); -AudioOutState audoutGetDeviceState(void); +u32 audoutGetSampleRate(void); ///< Supported sample rate (48000Hz). +u32 audoutGetChannelCount(void); ///< Supported channel count (2 channels). +PcmFormat audoutGetPcmFormat(void); ///< Supported PCM format (INT16). +AudioOutState audoutGetDeviceState(void); ///< Initial device state (stopped). From e0b2fa2e70fc133976a759e7549e01444f832a27 Mon Sep 17 00:00:00 2001 From: Mike H Date: Fri, 16 Feb 2018 21:28:42 +0000 Subject: [PATCH 11/13] No need to expose internal function --- nx/source/services/audout.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nx/source/services/audout.c b/nx/source/services/audout.c index 04ff2a48..9ca8d613 100644 --- a/nx/source/services/audout.c +++ b/nx/source/services/audout.c @@ -19,6 +19,8 @@ static u32 g_channelCount = 0; static PcmFormat g_pcmFormat = PcmFormat_Invalid; static AudioOutState g_deviceState = AudioOutState_Stopped; +static Result _audoutRegisterBufferEvent(Handle *BufferEvent); + Result audoutInitialize(void) { if (serviceIsActive(&g_audoutSrv)) @@ -40,7 +42,7 @@ Result audoutInitialize(void) // Register global handle for buffer events if (R_SUCCEEDED(rc)) - rc = audoutRegisterBufferEvent(&g_audoutBufferEventHandle); + rc = _audoutRegisterBufferEvent(&g_audoutBufferEventHandle); if (R_FAILED(rc)) audoutExit(); @@ -334,7 +336,7 @@ Result audoutAppendAudioOutBuffer(AudioOutBuffer *Buffer) { return rc; } -Result audoutRegisterBufferEvent(Handle *BufferEvent) { +static Result _audoutRegisterBufferEvent(Handle *BufferEvent) { IpcCommand c; ipcInitialize(&c); From 0292acffe58c98c8f9224d9e9cfe6bc07a40e6bb Mon Sep 17 00:00:00 2001 From: Mike H Date: Mon, 19 Feb 2018 20:26:45 +0000 Subject: [PATCH 12/13] Return result in audoutPlayBuffer --- nx/include/switch/services/audout.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nx/include/switch/services/audout.h b/nx/include/switch/services/audout.h index 1f8a20a5..5775d9d9 100644 --- a/nx/include/switch/services/audout.h +++ b/nx/include/switch/services/audout.h @@ -52,7 +52,7 @@ Result audoutContainsAudioOutBuffer(AudioOutBuffer *Buffer, bool *ContainsBuffer * @param source AudioOutBuffer containing the source sample data to be played. * @param released AudioOutBuffer to receive the last played buffer. */ -void audoutPlayBuffer(AudioOutBuffer *source, AudioOutBuffer *released); +Result audoutPlayBuffer(AudioOutBuffer *source, AudioOutBuffer *released); /// These return the state associated with the currently active audio output device. u32 audoutGetSampleRate(void); ///< Supported sample rate (48000Hz). From 5e26c486fa38f70ec2542150809214a26abf0320 Mon Sep 17 00:00:00 2001 From: Mike H Date: Mon, 19 Feb 2018 20:27:29 +0000 Subject: [PATCH 13/13] Return result from audoutPlayBuffer --- nx/source/services/audout.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nx/source/services/audout.c b/nx/source/services/audout.c index 9ca8d613..6c2a6096 100644 --- a/nx/source/services/audout.c +++ b/nx/source/services/audout.c @@ -82,7 +82,7 @@ AudioOutState audoutGetDeviceState(void) { return g_deviceState; } -void audoutPlayBuffer(AudioOutBuffer *source, AudioOutBuffer *released) { +Result audoutPlayBuffer(AudioOutBuffer *source, AudioOutBuffer *released) { // Try to push the supplied buffer to the audio output device Result do_append = audoutAppendAudioOutBuffer(source); @@ -103,6 +103,8 @@ void audoutPlayBuffer(AudioOutBuffer *source, AudioOutBuffer *released) { do_release = audoutGetReleasedAudioOutBuffer(released, &released_count); } } + + return do_append; } Result audoutListAudioOuts(char *DeviceNames, u32 *DeviceNamesCount) {