summaryrefslogtreecommitdiffstats
path: root/src/plugins/android/src
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/android/src')
-rw-r--r--src/plugins/android/src/common/qandroidvideooutput.cpp4
-rw-r--r--src/plugins/android/src/wrappers/jni/androidcamera.cpp1
2 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/android/src/common/qandroidvideooutput.cpp b/src/plugins/android/src/common/qandroidvideooutput.cpp
index 4e96377d8..5c804ccc4 100644
--- a/src/plugins/android/src/common/qandroidvideooutput.cpp
+++ b/src/plugins/android/src/common/qandroidvideooutput.cpp
@@ -290,6 +290,10 @@ void QAndroidTextureVideoOutput::stop()
void QAndroidTextureVideoOutput::reset()
{
+ // flush pending frame
+ if (m_surface)
+ m_surface->present(QVideoFrame());
+
clearSurfaceTexture();
}
diff --git a/src/plugins/android/src/wrappers/jni/androidcamera.cpp b/src/plugins/android/src/wrappers/jni/androidcamera.cpp
index fd5522e10..3295e4d33 100644
--- a/src/plugins/android/src/wrappers/jni/androidcamera.cpp
+++ b/src/plugins/android/src/wrappers/jni/androidcamera.cpp
@@ -315,7 +315,6 @@ AndroidCamera *AndroidCamera::open(int cameraId)
if (!ok) {
worker->quit();
worker->wait(5000);
- delete d;
delete worker;
return 0;
}