Skip to content

O
opencv
Commit eb2e061e authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

fix Android camera datarace (mCameraFrameReady)

parent 12f01b77
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
modules/java/generator/src/java/android+JavaCameraView.java
View file @ eb2e061e
...@@ -328,6 +328,7 @@ public class JavaCameraView extends CameraBridgeViewBase implements PreviewCallb ...@@ -328,6 +328,7 @@ public class JavaCameraView extends CameraBridgeViewBase implements PreviewCallb
@Override @Override
public void run() { public void run() {
do { do {
boolean hasFrame = false;
synchronized (JavaCameraView.this) { synchronized (JavaCameraView.this) {
try { try {
while (!mCameraFrameReady && !mStopThread) { while (!mCameraFrameReady && !mStopThread) {
...@@ -337,11 +338,14 @@ public class JavaCameraView extends CameraBridgeViewBase implements PreviewCallb ...@@ -337,11 +338,14 @@ public class JavaCameraView extends CameraBridgeViewBase implements PreviewCallb
e.printStackTrace(); e.printStackTrace();
} }
if (mCameraFrameReady) if (mCameraFrameReady)
{
mChainIdx = 1 - mChainIdx; mChainIdx = 1 - mChainIdx;
mCameraFrameReady = false;
hasFrame = true;
}
} }
if (!mStopThread && mCameraFrameReady) { if (!mStopThread && hasFrame) {
mCameraFrameReady = false;
if (!mFrameChain[1 - mChainIdx].empty()) if (!mFrameChain[1 - mChainIdx].empty())
deliverAndDrawFrame(mCameraFrame[1 - mChainIdx]); deliverAndDrawFrame(mCameraFrame[1 - mChainIdx]);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment