angel/mice-3ds
1
0
Fork 0
Code Issues Pull Requests Actions Releases 3 Activity

Fix Flac playing

Browse Source 
Fixed an issue whereby the size of the buffer was incorrect causing
malformed audio output when playing a flac music file.
Additionally removed some debugging code and old chaff.

Tested working with stereo and mono 16 bit flac files.

Signed-off-by: Mahyar Koshkouei <deltabeard@users.noreply.github.com>
This commit is contained in:
Mahyar Koshkouei
2016-12-27 12:30:32 +00:00
parent c769cf65dd
commit 914571aac7
2 changed files with 24 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/main.c
View File

@@ -243,7 +243,7 @@ int getFileType(const char *file)
*/
int playWav(const char *wav)
{
FILE *file = fopen(wav, "rb");
FILE* file = fopen(wav, "rb");
char header[45];
u32 sample;
u8 format;
@@ -333,12 +333,13 @@ int playWav(const char *wav)
buffer2 = (s16*) linearAlloc(BUFFER_SIZE);
fread(buffer1, 1, BUFFER_SIZE, file);
fread(buffer2, 1, BUFFER_SIZE, file);
waveBuf[0].nsamples = BUFFER_SIZE / blockalign;
waveBuf[0].data_vaddr = &buffer1[0];
ndspChnWaveBufAdd(CHANNEL, &waveBuf[0]);
fread(buffer2, 1, BUFFER_SIZE, file);
waveBuf[1].nsamples = BUFFER_SIZE / blockalign;
waveBuf[1].data_vaddr = &buffer2[0];
ndspChnWaveBufAdd(CHANNEL, &waveBuf[0]);
ndspChnWaveBufAdd(CHANNEL, &waveBuf[1]);
printf("Playing %s\n", wav);
@@ -368,7 +369,7 @@ int playWav(const char *wav)
if(kDown & KEY_B)
break;
if(kDown & KEY_A)
if(kDown & (KEY_A | KEY_R))
playing = !playing;
if(playing == false || lastbuf == true)
@@ -409,12 +410,6 @@ int playWav(const char *wav)
DSP_FlushDataCache(buffer1, BUFFER_SIZE);
DSP_FlushDataCache(buffer2, BUFFER_SIZE);
// TODO: Remove this printf.
// \33[2K clears the current line.
printf("\33[2K\rSamp: %lu\tBuf0: %s\tBuf1: %s", read / blockalign,
waveBuf[0].status == NDSP_WBUF_QUEUED ? "Q" : "P",
waveBuf[1].status == NDSP_WBUF_QUEUED ? "Q" : "P");
}
debug_print("Pos: %lx\n", ndspChnGetSamplePos(CHANNEL));