csamuelson
diff --git a/‎shared-module/audiomp3/MP3Decoder.c‎
Lines changed: 6 additions & 2 deletions b/‎shared-module/audiomp3/MP3Decoder.c‎
Lines changed: 6 additions & 2 deletions
@@ -356,15 +356,19 @@ audioio_get_buffer_result_t audiomp3_mp3file_get_buffer(audiomp3_mp3file_obj_t *
         return GET_BUFFER_DONE;
     }
 
+    self->samples_decoded += *buffer_length / sizeof(int16_t);
+
+    mp3file_skip_id3v2(self);
+    int result = mp3file_find_sync_word(self) ? GET_BUFFER_MORE_DATA : GET_BUFFER_DONE;
+
     if (self->inbuf_offset >= 512) {
         background_callback_add(
             &self->inbuf_fill_cb,
             mp3file_update_inbuf_cb,
             self);
     }
 
-    self->samples_decoded += *buffer_length / sizeof(int16_t);
-    return mp3file_find_sync_word(self) ? GET_BUFFER_MORE_DATA : GET_BUFFER_DONE;
+    return result;
 }
 
 void audiomp3_mp3file_get_buffer_structure(audiomp3_mp3file_obj_t *self, bool single_channel_output,
Original file line number	Diff line number	Diff line change
`@@ -356,15 +356,19 @@ audioio_get_buffer_result_t audiomp3_mp3file_get_buffer(audiomp3_mp3file_obj_t *`
`356`	`356`	`return GET_BUFFER_DONE;`
`357`	`357`	`}`
`358`	`358`
	`359`	`+ self->samples_decoded += *buffer_length / sizeof(int16_t);`
	`360`	`+`
	`361`	`+ mp3file_skip_id3v2(self);`
	`362`	`+ int result = mp3file_find_sync_word(self) ? GET_BUFFER_MORE_DATA : GET_BUFFER_DONE;`
	`363`	`+`
`359`	`364`	`if (self->inbuf_offset >= 512) {`
`360`	`365`	`background_callback_add(`
`361`	`366`	`&self->inbuf_fill_cb,`
`362`	`367`	`mp3file_update_inbuf_cb,`
`363`	`368`	`self);`
`364`	`369`	`}`
`365`	`370`
`366`		`- self->samples_decoded += *buffer_length / sizeof(int16_t);`
`367`		`- return mp3file_find_sync_word(self) ? GET_BUFFER_MORE_DATA : GET_BUFFER_DONE;`
	`371`	`+ return result;`
`368`	`372`	`}`
`369`	`373`
`370`	`374`	`void audiomp3_mp3file_get_buffer_structure(audiomp3_mp3file_obj_t *self, bool single_channel_output,`