diff --git a/client/decoder/android/android_decoder.cpp b/client/decoder/android/android_decoder.cpp index 3d91df09..73c58026 100644 --- a/client/decoder/android/android_decoder.cpp +++ b/client/decoder/android/android_decoder.cpp @@ -253,6 +253,8 @@ decoder::decoder( try { auto index = output_buffers.pop(); + if (index == -1) + return; auto status = AMediaCodec_releaseOutputBuffer(media_codec.get(), index, true); // will trigger on_image_available through ImageReader if (status != AMEDIA_OK) @@ -273,6 +275,13 @@ decoder::decoder( decoder::~decoder() { + if (media_codec) + { + AMediaCodec_stop(media_codec.get()); + output_buffers.push(-1); + if (output_releaser.joinable()) + output_releaser.join(); + } input_buffers.close(); output_buffers.close();