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

audio/hwopus-decoder: fix glitchy playback (#110)

Browse Source 
* audio/hwopus-decoder: fix offset for pointer to wavebuf start
* audio/hwopus-decoder: change to 4 wavebufs and reduce size of wavebufs
This commit is contained in:
Kripesh Adhikari 2024-10-26 20:21:59 +05:45 committed by GitHub
parent 5e36dc2902
commit bf9df10259
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
audio/hwopus-decoder/source/main.c
View File

@ -74,15 +74,15 @@ int main(void)
size_t num_channels = 1; size_t num_channels = 1;
size_t samplerate = 48000; size_t samplerate = 48000;
size_t max_samples = samplerate; size_t max_samples = samplerate/20;//each wavebuf can hold upto 1sec/20 = 50ms of audio data
size_t max_samples_datasize = max_samples*num_channels*sizeof(opus_int16); size_t max_samples_datasize = max_samples*num_channels*sizeof(opus_int16);
size_t mempool_size = (max_samples_datasize*2 + 0xFFF) &~ 0xFFF;//*2 for 2 wavebufs. size_t mempool_size = (max_samples_datasize*4 + 0xFFF) &~ 0xFFF;//*4 for 4 wavebufs.
void* mempool_ptr = memalign(0x1000, mempool_size); void* mempool_ptr = memalign(0x1000, mempool_size);
void* tmpdata_ptr = malloc(max_samples_datasize); void* tmpdata_ptr = malloc(max_samples_datasize);
opuspkt_tmpbuf = (u8*)malloc(opuspkt_tmpbuf_size); opuspkt_tmpbuf = (u8*)malloc(opuspkt_tmpbuf_size);
opus_int16* curbuf = NULL; opus_int16* curbuf = NULL;
AudioDriverWaveBuf wavebuf[2] = {0}; AudioDriverWaveBuf wavebuf[4] = {0};
int i, wavei; int i, wavei;
HwopusDecoder hwdecoder = {0}; HwopusDecoder hwdecoder = {0};
@ -151,9 +151,9 @@ int main(void)
} }
audrvVoiceStart(&drv, 0); audrvVoiceStart(&drv, 0);
for(i=0; i<2; i++) { for(i=0; i<4; i++) {
wavebuf[i].data_raw = mempool_ptr; wavebuf[i].data_raw = mempool_ptr;
wavebuf[i].size = max_samples_datasize*2;//*2 for 2 wavebufs. wavebuf[i].size = max_samples_datasize*4;//*4 for 4 wavebufs.
wavebuf[i].start_sample_offset = i * max_samples; wavebuf[i].start_sample_offset = i * max_samples;
wavebuf[i].end_sample_offset = wavebuf[i].start_sample_offset + max_samples; wavebuf[i].end_sample_offset = wavebuf[i].start_sample_offset + max_samples;
} }
@ -198,7 +198,7 @@ int main(void)
if (audio_playing) { if (audio_playing) {
wavei = -1; wavei = -1;
for(i=0; i<2; i++) { for(i=0; i<4; i++) {
if (wavebuf[i].state == AudioDriverWaveBufState_Free || wavebuf[i].state == AudioDriverWaveBufState_Done) { if (wavebuf[i].state == AudioDriverWaveBufState_Free || wavebuf[i].state == AudioDriverWaveBufState_Done) {
wavei = i; wavei = i;
break; break;
@ -206,7 +206,7 @@ int main(void)
} }
if (wavei >= 0) { if (wavei >= 0) {
curbuf = (opus_int16*)(mempool_ptr + wavebuf[wavei].start_sample_offset); curbuf = (opus_int16*)(mempool_ptr + wavebuf[wavei].start_sample_offset * sizeof(opus_int16));
opret = op_read(of, tmpdata_ptr, max_samples * num_channels, NULL);//The buffer used here has to be seperate from mempool_ptr. opret = op_read(of, tmpdata_ptr, max_samples * num_channels, NULL);//The buffer used here has to be seperate from mempool_ptr.
if (opret < 0) if (opret < 0)