djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5165 from jepler/mp3-playing 

MP3Decoder: Fix playback stopping issue
This commit is contained in:
Kattni 2021-08-17 13:05:25 -04:00 committed by GitHub
parent 162954a1ad d67acb8a64
commit 18437cb283
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
shared-module/audiomp3/MP3Decoder.c
View File

@ -319,6 +319,7 @@ audioio_get_buffer_result_t audiomp3_mp3file_get_buffer(audiomp3_mp3file_obj_t *
uint8_t **bufptr,
uint32_t *buffer_length) {
if (!self->inbuf) {
*buffer_length = 0;
return GET_BUFFER_ERROR;
}
if (!single_channel_output) {
@ -342,6 +343,7 @@ audioio_get_buffer_result_t audiomp3_mp3file_get_buffer(audiomp3_mp3file_obj_t *
mp3file_skip_id3v2(self);
if (!mp3file_find_sync_word(self)) {
*buffer_length = 0;
return self->eof ? GET_BUFFER_DONE : GET_BUFFER_ERROR;
}
int bytes_left = BYTES_LEFT(self);
@ -349,6 +351,11 @@ audioio_get_buffer_result_t audiomp3_mp3file_get_buffer(audiomp3_mp3file_obj_t *
int err = MP3Decode(self->decoder, &inbuf, &bytes_left, buffer, 0);
CONSUME(self, BYTES_LEFT(self) - bytes_left);
if (err) {
*buffer_length = 0;
return GET_BUFFER_DONE;
}
if (self->inbuf_offset >= 512) {
background_callback_add(
&self->inbuf_fill_cb,
@ -356,10 +363,6 @@ audioio_get_buffer_result_t audiomp3_mp3file_get_buffer(audiomp3_mp3file_obj_t *
self);
}
if (err) {
return GET_BUFFER_DONE;
}
return GET_BUFFER_MORE_DATA;
}