diff options
| author | Angus Kong <shkong@google.com> | 2013-02-13 00:58:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-02-13 00:58:18 +0000 |
| commit | ec0610102caf5353c07c8b271763d2509db474ee (patch) | |
| tree | 0e026b9a0a6800297f62d039fb4669dfdcd96b0e /src | |
| parent | a52d6674e576a15d1c3f71f951fa3843957bfa8b (diff) | |
| parent | 31019e09eaaa460e68b3f90a881ea3278fbd6108 (diff) | |
| download | android_packages_apps_Snap-ec0610102caf5353c07c8b271763d2509db474ee.tar.gz android_packages_apps_Snap-ec0610102caf5353c07c8b271763d2509db474ee.tar.bz2 android_packages_apps_Snap-ec0610102caf5353c07c8b271763d2509db474ee.zip | |
Merge "Wait for the previous MosaicPreviewRenderer to end" into gb-ub-photos-bryce
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/MosaicFrameProcessor.java | 3 | ||||
| -rw-r--r-- | src/com/android/camera/MosaicPreviewRenderer.java | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/camera/MosaicFrameProcessor.java b/src/com/android/camera/MosaicFrameProcessor.java index c59e6b91b..efd4ad2ae 100644 --- a/src/com/android/camera/MosaicFrameProcessor.java +++ b/src/com/android/camera/MosaicFrameProcessor.java @@ -92,7 +92,8 @@ public class MosaicFrameProcessor { mPreviewBufferSize = bufSize; setupMosaicer(mPreviewWidth, mPreviewHeight, mPreviewBufferSize); setStripType(Mosaic.STRIPTYPE_WIDE); - reset(); + // no need to call reset() here. reset() should be called by the client + // after this initialization before calling other methods of this object. } public void clear() { diff --git a/src/com/android/camera/MosaicPreviewRenderer.java b/src/com/android/camera/MosaicPreviewRenderer.java index e12fe432e..26ce733aa 100644 --- a/src/com/android/camera/MosaicPreviewRenderer.java +++ b/src/com/android/camera/MosaicPreviewRenderer.java @@ -90,6 +90,7 @@ public class MosaicPreviewRenderer { break; case MSG_RELEASE: doRelease(); + mEglThreadBlockVar.open(); break; } } @@ -203,7 +204,7 @@ public class MosaicPreviewRenderer { } public void release() { - mEglHandler.sendEmptyMessage(EGLHandler.MSG_RELEASE); + mEglHandler.sendMessageSync(EGLHandler.MSG_RELEASE); } public void showPreviewFrameSync() { |