diff options
| author | mbansal <mayank.bansal@sri.com> | 2011-08-08 20:23:02 -0400 |
|---|---|---|
| committer | Wei-Ta Chen <weita@google.com> | 2011-08-12 15:05:43 -0700 |
| commit | 41a2e9735136f372de95652d0828600282c8e967 (patch) | |
| tree | 25e946121b6940cd3dfa19746a393e5c05179ef4 /jni/Android.mk | |
| parent | 7058a9318dd5d6d5a1e79a84080cdc02975f68c1 (diff) | |
| download | LegacyCamera-41a2e9735136f372de95652d0828600282c8e967.zip LegacyCamera-41a2e9735136f372de95652d0828600282c8e967.tar.gz LegacyCamera-41a2e9735136f372de95652d0828600282c8e967.tar.bz2 | |
Updates to allow using SurfaceTexture for reading the preview frames directly from GPU memory.
1) SurfaceTexture is now used to obtain the data processed by the mosaicing library.
2) SurfaceTexture in GPU memory is directly rendered using the transformation from the mosaicing library to generate the preview mosaic.
3) GPU is also used to generate the Low-Res frames from the High-res frames (was being done in CPU before).
4) SurfaceTexture is also used to render the viewfinder as soon as the mosaicing application starts (eliminating the need for a separate SurfaceHolder to render the camera).
5) Modified the XML layout during the preview state to be the same size as during the capture stage to accommodate the SurfaceTexture based viewfinder [this needs to be reviewed and adjusted].
6) Fixed the viewfinder and back button issues identified by Wei-Ta.
7) Round-1 of removing trailing spaces and tabs.
8) Added documentation to new Java side interfaces and cleaned up code in general.
9) Cleaned up redundant and commented out code from the native side.
10) Merged with latest updates from the main trunk.
11) Fixed issues identified in code review and also cleaned up and refactored some code.
12) Added layout-w1024dp/pano_capture.xml for tablet layout.
Change-Id: If8fb0116de6c7fc6652cc67ac453553726961c32
Diffstat (limited to 'jni/Android.mk')
| -rwxr-xr-x | jni/Android.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/jni/Android.mk b/jni/Android.mk index d653573..0802754 100755 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -22,6 +22,7 @@ LOCAL_SRC_FILES := \ feature_mos/src/mosaic/Mosaic.cpp \ feature_mos/src/mosaic/Pyramid.cpp \ feature_mos/src/mosaic_renderer/WarpRenderer.cpp \ + feature_mos/src/mosaic_renderer/SurfaceTextureRenderer.cpp \ feature_mos/src/mosaic_renderer/FrameBuffer.cpp \ feature_stab/db_vlvm/db_feature_detection.cpp \ feature_stab/db_vlvm/db_feature_matching.cpp \ |