diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2015-01-06 19:19:20 -0800 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-01-06 19:19:20 -0800 |
commit | cd63fc2f8771cc54fbee58ccbb188ef5e132c685 (patch) | |
tree | be5bbc1308b214d991947185d60e708852e9fdaa /src/com | |
parent | 8f1d0f709c987a3b49147b48f4c67ab0fd4757e5 (diff) | |
parent | 8c1e4ff06d80d69792170f0cab8dea2f490cb7fa (diff) | |
download | android_packages_apps_Snap-cd63fc2f8771cc54fbee58ccbb188ef5e132c685.tar.gz android_packages_apps_Snap-cd63fc2f8771cc54fbee58ccbb188ef5e132c685.tar.bz2 android_packages_apps_Snap-cd63fc2f8771cc54fbee58ccbb188ef5e132c685.zip |
Merge "SnapdragonCamera: Add FullScreen Preview when in Panoramic shoot"
Diffstat (limited to 'src/com')
-rw-r--r-- | src/com/android/camera/MosaicPreviewRenderer.java | 9 | ||||
-rw-r--r-- | src/com/android/camera/MosaicRenderer.java | 10 | ||||
-rw-r--r-- | src/com/android/camera/WideAnglePanoramaUI.java | 8 |
3 files changed, 16 insertions, 11 deletions
diff --git a/src/com/android/camera/MosaicPreviewRenderer.java b/src/com/android/camera/MosaicPreviewRenderer.java index 42da4d9e7..77c260eb5 100644 --- a/src/com/android/camera/MosaicPreviewRenderer.java +++ b/src/com/android/camera/MosaicPreviewRenderer.java @@ -83,10 +83,13 @@ public class MosaicPreviewRenderer { mInputSurfaceTexture.updateTexImage(); mInputSurfaceTexture.getTransformMatrix(mTransformMatrix); - MosaicRenderer.setWarping(true); - // Call preprocess to render it to low-res and high-res RGB textures. + // Call setPreviewBackground to render high-res RGB textures to full screen. + MosaicRenderer.setPreviewBackground(true); MosaicRenderer.preprocess(mTransformMatrix); - // Now, transfer the textures from GPU to CPU memory for processing + MosaicRenderer.step(); + MosaicRenderer.setPreviewBackground(false); + + MosaicRenderer.setWarping(true); MosaicRenderer.transferGPUtoCPU(); MosaicRenderer.updateMatrix(); MosaicRenderer.step(); diff --git a/src/com/android/camera/MosaicRenderer.java b/src/com/android/camera/MosaicRenderer.java index 92d9cb7b6..daf94abe6 100644 --- a/src/com/android/camera/MosaicRenderer.java +++ b/src/com/android/camera/MosaicRenderer.java @@ -86,4 +86,14 @@ public class MosaicRenderer * @param flag boolean flag to set the warping to true or false. */ public static native void setWarping(boolean flag); + /** + * This function allows toggling between drawing the background full + * screen preview image data to screen and drawing the warped smaller + * preview on top of it. To render the full screen background preview, + * we set the falsg to true and to render the warped image on top of this + * we set the flag to false and flag in setWarping to true. + * + * @param flag boolean flag to set the warping to true or false. + */ + public static native void setPreviewBackground(boolean flag); } diff --git a/src/com/android/camera/WideAnglePanoramaUI.java b/src/com/android/camera/WideAnglePanoramaUI.java index 8f9643971..952a31909 100644 --- a/src/com/android/camera/WideAnglePanoramaUI.java +++ b/src/com/android/camera/WideAnglePanoramaUI.java @@ -434,14 +434,6 @@ public class WideAnglePanoramaUI implements private void setViews(Resources appRes) { int weight = appRes.getInteger(R.integer.SRI_pano_layout_weight); - LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams) mPreviewLayout.getLayoutParams(); - lp.weight = weight; - mPreviewLayout.setLayoutParams(lp); - - lp = (LinearLayout.LayoutParams) mReview.getLayoutParams(); - lp.weight = weight; - mPreviewLayout.setLayoutParams(lp); - mSavingProgressBar = (PanoProgressBar) mRootView.findViewById(R.id.pano_saving_progress_bar); mSavingProgressBar.setIndicatorWidth(0); mSavingProgressBar.setMaxProgress(100); |