Skip to content

Commit 720374b

Browse files
committed
when the player is being destroyed, aout_close_audio is called twice, which leads to the triggering of an assertion
1 parent 452b511 commit 720374b

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

ijkmedia/ijksdl/android/ijksdl_aout_android_audiotrack.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,9 @@ static void aout_set_volume(SDL_Aout *aout, float left_volume, float right_volum
250250
static void aout_close_audio(SDL_Aout *aout)
251251
{
252252
SDL_Aout_Opaque *opaque = aout->opaque;
253-
253+
if (NULL == opaque->audio_tid) {
254+
return;
255+
}
254256
SDL_LockMutex(opaque->wakeup_mutex);
255257
opaque->abort_request = true;
256258
SDL_CondSignal(opaque->wakeup_cond);

ijkmedia/ijksdl/android/ijksdl_aout_android_opensles.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,9 @@ static void aout_close_audio(SDL_Aout *aout)
240240
SDL_Aout_Opaque *opaque = aout->opaque;
241241
if (!opaque)
242242
return;
243-
243+
if (NULL == opaque->audio_tid) {
244+
return;
245+
}
244246
SDL_LockMutex(opaque->wakeup_mutex);
245247
opaque->abort_request = true;
246248
SDL_CondSignal(opaque->wakeup_cond);

0 commit comments

Comments
 (0)