generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #5385 from alalek:fix_android_camera_datarace

Browse Source
This commit is contained in:
Vadim Pisarevsky 2015-10-01 13:58:01 +00:00
commit d69b7c332a
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/java/generator/src/java/android+JavaCameraView.java
View File

@ -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
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]);
} }