From ea1c580839aff9b1e366fe9e873868bc2c8cddd0 Mon Sep 17 00:00:00 2001 From: aliaspider Date: Sat, 22 Feb 2014 02:57:17 +0100 Subject: [PATCH] (PSP) audio now plays correctly. might experience minor latency change after fast forward. --- psp1/psp1_audio.c | 120 ++++++++++++++++++++++++---------------------- 1 file changed, 62 insertions(+), 58 deletions(-) diff --git a/psp1/psp1_audio.c b/psp1/psp1_audio.c index 8ea6050b19..7ab26eedfb 100644 --- a/psp1/psp1_audio.c +++ b/psp1/psp1_audio.c @@ -1,6 +1,6 @@ /* RetroArch - A frontend for libretro. * Copyright (C) 2010-2014 - Hans-Kristian Arntzen - * + * * 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. @@ -28,37 +28,39 @@ typedef struct psp1_audio uint32_t* buffer; uint32_t* zeroBuffer; SceUID thread; - int rate; - uint16_t readPos; - uint16_t writePos; + int rate; + volatile uint16_t readPos; + volatile uint16_t writePos; } psp1_audio_t; -#define AUDIO_OUT_COUNT 128 - -#define AUDIO_BUFFER_SIZE (1u<<12u) +#define AUDIO_OUT_COUNT 128u +#define AUDIO_BUFFER_SIZE (1u<<11u) #define AUDIO_BUFFER_SIZE_MASK (AUDIO_BUFFER_SIZE-1) static int audioMainLoop(SceSize args, void* argp) { - psp1_audio_t* psp = *((psp1_audio_t**)argp); + psp1_audio_t* psp = *((psp1_audio_t**)argp); - sceAudioSRCChReserve(AUDIO_OUT_COUNT, psp->rate, 2); + sceAudioSRCChReserve(AUDIO_OUT_COUNT, psp->rate, 2); - while (psp->running) + while (psp->running) { - if (((uint16_t)(psp->writePos - psp->readPos) & AUDIO_BUFFER_SIZE_MASK) < (uint16_t)AUDIO_OUT_COUNT * 2) + uint16_t readPos = psp->readPos; // get a non volatile copy + + if (((uint16_t)(psp->writePos - readPos) & AUDIO_BUFFER_SIZE_MASK) < (AUDIO_OUT_COUNT * 2)) sceAudioSRCOutputBlocking(PSP_AUDIO_VOLUME_MAX, psp->zeroBuffer); else { - sceAudioSRCOutputBlocking(PSP_AUDIO_VOLUME_MAX, psp->buffer + psp->readPos); - psp->readPos += AUDIO_OUT_COUNT; - psp->readPos &= AUDIO_BUFFER_SIZE_MASK; + sceAudioSRCOutputBlocking(PSP_AUDIO_VOLUME_MAX, psp->buffer + readPos); + readPos += AUDIO_OUT_COUNT; + readPos &= AUDIO_BUFFER_SIZE_MASK; + psp->readPos = readPos; } } - sceAudioSRCChRelease(); - sceKernelExitThread(0); - return 0; + sceAudioSRCChRelease(); + sceKernelExitThread(0); + return 0; } static void *psp_audio_init(const char *device, unsigned rate, unsigned latency) @@ -71,17 +73,21 @@ static void *psp_audio_init(const char *device, unsigned rate, unsigned latency) if (!psp) return NULL; - psp->buffer = (uint32_t*)calloc(AUDIO_BUFFER_SIZE, sizeof(uint32_t)); + psp->buffer = (uint32_t*)memalign(64, AUDIO_BUFFER_SIZE * sizeof(uint32_t)); // cache aligned, not necessary but helpful + memset(psp->buffer, 0, AUDIO_BUFFER_SIZE * sizeof(uint32_t)); + + psp->zeroBuffer = (uint32_t*)memalign(64, AUDIO_OUT_COUNT * sizeof(uint32_t)); + memset(psp->zeroBuffer, 0, AUDIO_OUT_COUNT * sizeof(uint32_t)); + psp->readPos = 0; psp->writePos = 0; - psp->zeroBuffer = (uint32_t*)calloc(AUDIO_OUT_COUNT, sizeof(uint32_t)); psp->rate = rate; - psp->thread = sceKernelCreateThread ("audioMainLoop", audioMainLoop, 0x12, 0x10000, 0, NULL); + psp->thread = sceKernelCreateThread ("audioMainLoop", audioMainLoop, 0x08, 0x10000, 0, NULL); psp->nonblocking = false; - psp->running = true; + psp->running = true; sceKernelStartThread(psp->thread, sizeof(psp1_audio_t*), &psp); - + return psp; } @@ -95,7 +101,7 @@ static void psp_audio_free(void *data) SceUInt timeout = 100000; sceKernelWaitThreadEnd(psp->thread, &timeout); sceKernelDeleteThread(psp->thread); - + free(psp->buffer); free(psp->zeroBuffer); free(psp); @@ -105,30 +111,27 @@ static ssize_t psp_audio_write(void *data, const void *buf, size_t size) { uint16_t sampleCount; psp1_audio_t* psp = (psp1_audio_t*)data; - + uint16_t writePos = psp->writePos; + sampleCount= size / sizeof(uint32_t); - - printf("size: %i sampleCount %i\n",(int)size , (int) sampleCount); - - if (psp->nonblocking) + +// if (psp->nonblocking) +// { +// /* TODO */ +// } + + if((writePos + sampleCount) > AUDIO_BUFFER_SIZE) { - /* TODO */ + memcpy(psp->buffer + writePos, buf, (AUDIO_BUFFER_SIZE - writePos) * sizeof(uint32_t)); + memcpy(psp->buffer, (uint32_t*) buf + (AUDIO_BUFFER_SIZE - writePos), (writePos + sampleCount - AUDIO_BUFFER_SIZE) * sizeof(uint32_t)); } else - { - if((psp->writePos + sampleCount) > AUDIO_BUFFER_SIZE) - { - memcpy(psp->buffer + psp->writePos, buf, (AUDIO_BUFFER_SIZE - psp->writePos) * sizeof(uint32_t)); - memcpy(psp->buffer, buf, (psp->writePos + sampleCount - AUDIO_BUFFER_SIZE) * sizeof(uint32_t)); - } - else - memcpy(psp->buffer + psp->writePos, buf, size); - - psp->writePos += sampleCount; - psp->writePos &= AUDIO_BUFFER_SIZE_MASK; - - } - + memcpy(psp->buffer + writePos, buf, size); + + writePos += sampleCount; + writePos &= AUDIO_BUFFER_SIZE_MASK; + psp->writePos = writePos; + return sampleCount; } @@ -136,18 +139,18 @@ static bool psp_audio_stop(void *data) { SceKernelThreadRunStatus runStatus; psp1_audio_t* psp = (psp1_audio_t*)data; - - runStatus.size = sizeof(SceKernelThreadRunStatus); - - if (sceKernelReferThreadRunStatus(psp->thread, &runStatus) < 0) // error - return false; + + runStatus.size = sizeof(SceKernelThreadRunStatus); + + if (sceKernelReferThreadRunStatus(psp->thread, &runStatus) < 0) // error + return false; if (runStatus.status == PSP_THREAD_STOPPED) return false; - + psp->running = false; SceUInt timeout = 100000; sceKernelWaitThreadEnd(psp->thread, &timeout); - + return true; } @@ -155,16 +158,16 @@ static bool psp_audio_start(void *data) { SceKernelThreadRunStatus runStatus; psp1_audio_t* psp = (psp1_audio_t*)data; - + runStatus.size = sizeof(SceKernelThreadRunStatus); - - if (sceKernelReferThreadRunStatus(psp->thread, &runStatus) < 0) // error - return false; + + if (sceKernelReferThreadRunStatus(psp->thread, &runStatus) < 0) // error + return false; if (runStatus.status != PSP_THREAD_STOPPED) return false; - - psp->running = true; - + + psp->running = true; + sceKernelStartThread(psp->thread, sizeof(psp1_audio_t*), &psp); return true; @@ -185,7 +188,8 @@ static bool psp_audio_use_float(void *data) static size_t psp_write_avail(void *data) { /* TODO */ - return AUDIO_OUT_COUNT; + psp1_audio_t* psp = (psp1_audio_t*)data; + return ((uint16_t)(psp->writePos - psp->readPos) & AUDIO_BUFFER_SIZE_MASK); } static size_t psp_buffer_size(void *data)