diff options
| author | mbansal <mayank.bansal@sri.com> | 2011-08-02 11:31:28 -0400 |
|---|---|---|
| committer | Wei-Ta Chen <weita@google.com> | 2011-08-05 17:20:40 -0700 |
| commit | eeb94d4de94bfd4e01f3a716803f77a530f5b92c (patch) | |
| tree | 4a458d58afaccb39aa26a23ae1cd4f403c5f0bc7 /res/layout | |
| parent | 178f4d6d1f20bb5fe7f714448cac9910c2c18c1f (diff) | |
| download | LegacyCamera-eeb94d4de94bfd4e01f3a716803f77a530f5b92c.zip LegacyCamera-eeb94d4de94bfd4e01f3a716803f77a530f5b92c.tar.gz LegacyCamera-eeb94d4de94bfd4e01f3a716803f77a530f5b92c.tar.bz2 | |
Updates for mosaic preview rendering to happen using native GLES2.0 code.
1) Added new subfolder mosaic_renderer in feature_mos/src with FrameBuffer and WarpRenderer classes.
2) Added mosaic_renderer_jni.h|cpp files to the jni folder to perform GL calls for rendering on the GL thread.
3) Updated code in feature_mos_jni.cpp to connect with mosaic_renderer_jni.cpp.
4) Added new java files in com.android.camera.panorama to encapsulate the GL JNI interface, a GLSurfaceView for display and a GLSurfaceView.Renderer for rendering.
5) Modified APP code to enable the new GL-based rendering and made relevant changes to the UI (in pano_views.xml).
6) Fixed a GL bug which was preventing the rendering from working properly after hitting the back button once.
7) Preview rendering now displays in the current frame coordinate system.
8) Fixed the ghost preview rendering bug.
Change-Id: Ieb64ee3fd4a9a2c6563a311a4930ddc85ce2247c
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/pano_capture.xml | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/res/layout/pano_capture.xml b/res/layout/pano_capture.xml index 8b353fd..a12e6e6 100644 --- a/res/layout/pano_capture.xml +++ b/res/layout/pano_capture.xml @@ -15,19 +15,22 @@ --> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/pano_capture_layout" - android:visibility="invisible" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <com.android.camera.panorama.CaptureView android:id="@+id/pano_capture_view" - android:layout_width="match_parent" + android:id="@+id/pano_capture_layout" android:visibility="invisible" + android:orientation="vertical" android:layout_width="match_parent" + android:layout_height="match_parent"> + + <FrameLayout android:layout_weight="1" android:gravity="center" + android:layout_width="match_parent" android:layout_height="match_parent"> + <com.android.camera.panorama.CaptureView + android:id="@+id/pano_capture_view" android:layout_width="match_parent" android:layout_height="match_parent" /> + <com.android.camera.panorama.MosaicRendererSurfaceView + android:id="@+id/pano_renderer" android:layout_gravity="center" + android:layout_width="960dp" android:layout_height="360dp" /> + </FrameLayout> <ImageView style="@style/PanoViewHorizontalGrayBar" - android:layout_alignParentTop="true" - android:layout_width="match_parent" /> + android:layout_alignParentTop="true" android:layout_width="match_parent" /> <LinearLayout android:id="@+id/pano_capture_control" style="@style/PanoViewHorizontalGrayBar" |