From 271ab2e661c71dbb9d438cd554676e544c312a11 Mon Sep 17 00:00:00 2001 From: Zhang Rui Date: Tue, 22 Dec 2015 17:20:04 +0800 Subject: [PATCH] android/MediaCodec: lock acodec for SDL_AMediaCodec_stop --- .../android/pipeline/ffpipenode_android_mediacodec_vdec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ijkmedia/ijkplayer/android/pipeline/ffpipenode_android_mediacodec_vdec.c b/ijkmedia/ijkplayer/android/pipeline/ffpipenode_android_mediacodec_vdec.c index bec6edd3..f775f5b6 100644 --- a/ijkmedia/ijkplayer/android/pipeline/ffpipenode_android_mediacodec_vdec.c +++ b/ijkmedia/ijkplayer/android/pipeline/ffpipenode_android_mediacodec_vdec.c @@ -888,7 +888,9 @@ fail: } if (opaque->acodec) { SDL_VoutAndroid_invalidateAllBuffers(opaque->weak_vout); + SDL_LockMutex(opaque->acodec_mutex); SDL_AMediaCodec_stop(opaque->acodec); + SDL_UnlockMutex(opaque->acodec_mutex); } SDL_WaitThread(opaque->enqueue_thread, NULL); SDL_AMediaCodec_decreaseReferenceP(&opaque->acodec); -- GitLab