mika/switch-examples
1
0
Fork 0
mirror of https://github.com/switchbrew/switch-examples.git synced 2025-06-21 05:12:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Attempt to fix audio playback issue (#12)

Browse Source 
* Attempt to fix audio playback issue
* Adding sanity checks
This commit is contained in:
Mike H 2018-02-20 21:14:45 +00:00 committed by yellows8
parent 3f363c5735
commit 1b7f374daf
1 changed files with 35 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
audio/playtone/source/main.c
View File

@ -1,15 +1,18 @@
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
#include <malloc.h>
#include <math.h> #include <math.h>
#include <switch.h> #include <switch.h>
#define SAMPLERATE 48000 #define SAMPLERATE 48000
#define SAMPLESPERBUF (SAMPLERATE / 10) #define SAMPLESPERBUF (SAMPLERATE / 10)
#define BYTESPERSAMPLE 4
void fill_audio_buffer(void* audio_buffer, size_t offset, size_t size, int frequency) { void fill_audio_buffer(void* audio_buffer, size_t offset, size_t size, int frequency) {
u32* dest = (u32*) audio_buffer; if (audio_buffer == NULL) return;
u32* dest = (u32*) audio_buffer;
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
// This is a simple sine wave, with a frequency of `frequency` Hz, and an amplitude 30% of maximum. // This is a simple sine wave, with a frequency of `frequency` Hz, and an amplitude 30% of maximum.
s16 sample = 0.3 * 0x7FFF * sin(frequency * (2 * M_PI) * (offset + i) / SAMPLERATE); s16 sample = 0.3 * 0x7FFF * sin(frequency * (2 * M_PI) * (offset + i) / SAMPLERATE);
@ -32,17 +35,32 @@ int main(int argc, char **argv)
7040, 3520, 1760, 880, 440 7040, 3520, 1760, 880, 440
}; };
u32 raw_data[SAMPLESPERBUF * 2];
fill_audio_buffer(raw_data, 0, SAMPLESPERBUF * 2, notefreq[4]);
gfxInitDefault(); gfxInitDefault();
// Initialize console. Using NULL as the second argument tells the console library to use the internal console structure as current one. // Initialize console. Using NULL as the second argument tells the console library to use the internal console structure as current one.
consoleInit(NULL); consoleInit(NULL);
// Initialize the default audio output device // Make sure the sample buffer is aligned to 0x1000 bytes
rc = audoutInitialize(); u32 raw_data_size = (SAMPLESPERBUF * BYTESPERSAMPLE * 2);
printf("audoutInitialize() returned 0x%x\n", rc); u32 raw_data_size_aligned = (raw_data_size + 0xfff) & ~0xfff;
u8* raw_data = memalign(0x1000, raw_data_size_aligned);
// Ensure buffer was properly allocated
if (raw_data == NULL)
{
rc = MAKERESULT(Module_Libnx, LibnxError_OutOfMemory);
printf("Failed to allocate sample data buffer\n");
}
if (R_SUCCEEDED(rc))
memset(raw_data, 0, raw_data_size_aligned);
if (R_SUCCEEDED(rc))
{
// Initialize the default audio output device
rc = audoutInitialize();
printf("audoutInitialize() returned 0x%x\n", rc);
}
if (R_SUCCEEDED(rc)) if (R_SUCCEEDED(rc))
{ {
@ -141,18 +159,21 @@ int main(int argc, char **argv)
play_tone = true; play_tone = true;
} }
if (play_tone) if (R_SUCCEEDED(rc) && play_tone)
{ {
// Prepare the audio data source buffer. // Prepare the audio data source buffer.
source_buffer.next = 0; source_buffer.next = 0;
source_buffer.buffer = raw_data; source_buffer.buffer = raw_data;
source_buffer.buffer_size = sizeof(raw_data); source_buffer.buffer_size = raw_data_size;
source_buffer.data_size = SAMPLESPERBUF * 2; source_buffer.data_size = SAMPLESPERBUF * 2;
source_buffer.data_offset = 0; source_buffer.data_offset = 0;
// Play this buffer once. // Play this buffer once.
audoutPlayBuffer(&source_buffer, &released_buffer); rc = audoutPlayBuffer(&source_buffer, &released_buffer);
play_tone = false; play_tone = false;
if (!R_SUCCEEDED(rc))
printf("audoutPlayBuffer() returned 0x%x\n", rc);
} }
gfxFlushBuffers(); gfxFlushBuffers();