diff options
author | Jay Wang <jaywang@codeaurora.org> | 2014-12-26 18:10:22 -0800 |
---|---|---|
committer | Jay Wang <jaywang@codeaurora.org> | 2015-01-05 17:13:36 -0800 |
commit | 8c1e4ff06d80d69792170f0cab8dea2f490cb7fa (patch) | |
tree | be5bbc1308b214d991947185d60e708852e9fdaa /jni/feature_mos/src/mosaic_renderer/Renderer.cpp | |
parent | 90301e97f4575e5e2f7eae5f7b2bd7f724620f79 (diff) | |
download | android_packages_apps_Snap-8c1e4ff06d80d69792170f0cab8dea2f490cb7fa.tar.gz android_packages_apps_Snap-8c1e4ff06d80d69792170f0cab8dea2f490cb7fa.tar.bz2 android_packages_apps_Snap-8c1e4ff06d80d69792170f0cab8dea2f490cb7fa.zip |
SnapdragonCamera: Add FullScreen Preview when in Panoramic shoot
Changed the Panoramic preview to full screen
Resized the warped preview image to smaller Size
and render on top of the full screen preview image
Change-Id: I98735dbed2ff4dada8708bf5a4a0f9da6ba030c7
Conflicts:
res/layout-land/pano_preview_progress.xml
res/layout-port/pano_preview_progress.xml
Diffstat (limited to 'jni/feature_mos/src/mosaic_renderer/Renderer.cpp')
-rw-r--r--[-rwxr-xr-x] | jni/feature_mos/src/mosaic_renderer/Renderer.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/jni/feature_mos/src/mosaic_renderer/Renderer.cpp b/jni/feature_mos/src/mosaic_renderer/Renderer.cpp index b9938eb6b..8d0632402 100755..100644 --- a/jni/feature_mos/src/mosaic_renderer/Renderer.cpp +++ b/jni/feature_mos/src/mosaic_renderer/Renderer.cpp @@ -111,8 +111,8 @@ GLuint Renderer::createProgram(const char* pVertexSource, const char* pFragmentS } // Set this renderer to use the default frame-buffer (screen) and -// set the viewport size to be the given width and height (pixels). -bool Renderer::SetupGraphics(int width, int height) +// set the viewport size to be the given x, y, width and height (pixels). +bool Renderer::SetupGraphics(int x, int y, int width, int height) { bool succeeded = false; do { @@ -131,8 +131,10 @@ bool Renderer::SetupGraphics(int width, int height) mFrameBuffer = NULL; mSurfaceWidth = width; mSurfaceHeight = height; + mSurfaceXOffset = x; + mSurfaceYOffset = y; - glViewport(0, 0, mSurfaceWidth, mSurfaceHeight); + glViewport(mSurfaceXOffset, mSurfaceYOffset, mSurfaceWidth, mSurfaceHeight); if (!checkGlError("glViewport")) break; succeeded = true; } while (false); @@ -176,7 +178,7 @@ bool Renderer::Clear(float r, float g, float b, float a) bool succeeded = false; do { bool rt = (mFrameBuffer == NULL)? - SetupGraphics(mSurfaceWidth, mSurfaceHeight) : + SetupGraphics(mSurfaceXOffset, mSurfaceYOffset, mSurfaceWidth, mSurfaceHeight) : SetupGraphics(mFrameBuffer); if(!rt) |