diff --git a/client/decoder/android/android_decoder.cpp b/client/decoder/android/android_decoder.cpp index 94116ccf..6b988428 100644 --- a/client/decoder/android/android_decoder.cpp +++ b/client/decoder/android/android_decoder.cpp @@ -236,7 +236,7 @@ decoder::decoder( 5 /* maxImages */, &ir), "AImageReader_newWithUsage"); - image_reader.reset(ir); + image_reader.reset(ir, AImageReader_deleter{}); AImageReader_ImageListener listener{this, on_image_available}; check(AImageReader_setImageListener(ir, &listener), "AImageReader_setImageListener"); @@ -413,6 +413,7 @@ void decoder::on_image_available(AImageReader * reader) *vk_data->vimage, &vk_data->layout, vk_data, + image_reader, std::move(image)); if (auto scene = weak_scene.lock()) diff --git a/client/decoder/android/android_decoder.h b/client/decoder/android/android_decoder.h index 5553b59a..1af6f7e7 100644 --- a/client/decoder/android/android_decoder.h +++ b/client/decoder/android/android_decoder.h @@ -75,6 +75,7 @@ public: std::shared_ptr vk_data; + std::shared_ptr image_reader; AImage_ptr aimage; }; @@ -90,7 +91,7 @@ private: vk::Extent2D extent{}; std::mutex hbm_mutex; - AImageReader_ptr image_reader; + std::shared_ptr image_reader; AMediaCodec_ptr media_codec; std::weak_ptr weak_scene;