summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/panorama
Commit message (Collapse)AuthorAgeFilesLines
...
* Fix NPE bug in onPause() when mSurface is null.Angus Kong2011-08-191-4/+6
| | | | | bug: 5166296 Change-Id: I48855b2b5309e9d0f91c8c2ac5cde08095bac408
* Refactor to decouple SurfaceTexture and renderer.Angus Kong2011-08-193-70/+63
| | | | Change-Id: Icae3183f597fc64ab2f3ffc0868a12b878aabdf2
* Show "Too Fast" when panning speed is too fast.Angus Kong2011-08-192-10/+7
| | | | | bug:5141497 Change-Id: Iaff5b7bd05c9b232091f0133a756a5513e5956b3
* Make the speed indicator visible.Wei-Ta Chen2011-08-172-17/+7
| | | | | | | The speed inidicator has to be drawn on top of the viewfinder/panorama preview. Its visibility state should be same to the STOP button. Change-Id: I5631dd77a98e96b2467f146f0b437e2043504fa1
* Fix issue: returned width/height <= 0.Angus Kong2011-08-171-0/+7
| | | | | | | Width/height returned by Mosaic JNI is <= 0. generateFinalMosaic() now returns null in such cases. bug:5133740 Change-Id: I49b69cab1d40fd878d7cd4988fbc1a9f4dba9343
* Fix NPE at PanoramaActivity.stopCapture()Angus Kong2011-08-163-113/+75
| | | | | bug: 5166705 Change-Id: Idbeeaef6981775303ebc324a0f004b6db45bcbf8
* Remove preview layout and adjust widget size.Angus Kong2011-08-161-8/+6
| | | | | | | | Since we now use GL to render the realtime preview, the original preview frame can be removed then. Also some widgets' size is adjusted. bug:5142002 Change-Id: I8da708bab63b107b39e9e87a4893506dec171910
* Fix an issue with hitting frame number limit.Wei-Ta Chen2011-08-152-3/+4
| | | | | | | | | | | | | In the native side, the library always returns the transformation of the 100th frame after hitting the frame number limit - 100. The application codes need to avoid adding more frames once the limit reaches. Otherwise, we see the UI repeating the 100th on the panorama preview. Ultimately, we want this termination condition to be solely determined in the native side. Also updates a comment on MosaicRenderer. Change-Id: I6883b25f14103527de8454a2568f4768669e0aff
* Merge "Remove the flag - mUseSurfaceTexture."Wei-Ta Chen2011-08-152-61/+14
|\
| * Remove the flag - mUseSurfaceTexture.Wei-Ta Chen2011-08-122-61/+14
| | | | | | | | | | | | | | The flag was used for debugging. We completed the transition of using SurfaceTexture to get preview frame data. Change-Id: I4af16456845c741342bbbf65e912a67c094ab006
* | Use "Start" button instead for Panorama.Angus Kong2011-08-151-16/+9
| | | | | | | | | | | | | | The shutter button in panorama is replaced by a start button. bug:5141569 Change-Id: Idb3f6cc621be5b83fae70bce7ef35636079e31f3
* | Generate High-res panorama.Angus Kong2011-08-151-53/+45
|/ | | | | bug:5105037 Change-Id: I06a5527b9b614ff3aedf7e1b5d1efd38938dbd3d
* Updates to allow using SurfaceTexture for reading the preview frames ↵mbansal2011-08-126-98/+309
| | | | | | | | | | | | | | | | | | | 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
* "Retake" and "Ok" buttons can function correctly.Angus Kong2011-08-113-55/+168
| | | | | | | | | | | 1. "Retake" button brings user back to preview stage without saving the final result. 2. "Ok" button brings user back to preview stage after saving the final result. bug:5031609 bug:5142100 bug:5134202 bug:5133871 Change-Id: I234e242182765cc5624b2fc8444bc38e5a9edf9f
* Merge "Remove the unnecessary low-res alpha bitmap."Wei-Ta Chen2011-08-092-53/+13
|\
| * Remove the unnecessary low-res alpha bitmap.Wei-Ta Chen2011-08-082-53/+13
| | | | | | | | | | | | | | | | | | Since we now use OpenGL to render panorama preview in the native layer, there is no need to maintaine a low resolution alpha bitmap in the application layer for panorama preview rendering. The change improves the rendering performance. Change-Id: I3e7fa36e895d600de06808a2a67f72ae757205e2
* | Use recording hint API.Wu-cheng Li2011-08-091-2/+1
|/ | | | | bug:4266229 Change-Id: Iafd4b6cb4bf20a1bff3ed639f9e48ca71f026969
* Fix the issue that panorama preview occludes viewfinder.Wei-Ta Chen2011-08-051-0/+3
| | | | Change-Id: Ide8fdde9c95fb9d4ed1b03a750e0ce78fde93236
* Updates for mosaic preview rendering to happen using native GLES2.0 code.mbansal2011-08-055-67/+458
| | | | | | | | | | | | | 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
* Stop button added on panorama UI.Angus Kong2011-08-052-25/+38
| | | | | | | | | 1. Individual layout XML file added for preview, capture and review stages. 2. Stop button added for capture stage. 3. Layout changed to comply UI spec more. bug:5031609 Change-Id: I152daafe8a1a9fcc12b3803f3f7a36875b425628
* Set preview invisible after mosaic is captured.Wu-cheng Li2011-08-051-11/+11
| | | | | | bug:5118463 Change-Id: Icd90cdb9cc9d26e28ff16292ccf20eb8bad617cc
* Merge "Make Panorama run on phone."Wei-Ta Chen2011-08-042-71/+85
|\
| * Make Panorama run on phone.Wei-Ta Chen2011-08-032-71/+85
| | | | | | | | Change-Id: I41ff1c35918794e81d4f397ed72f438dadccde4a
* | Add face detection UI.Wu-cheng Li2011-08-041-2/+3
|/ | | | | bug:4460717 Change-Id: Id09cc012efffcee0f5af3a070b5dcb775a7048a0
* Set recording hint to true in camcorder mode.Wu-cheng Li2011-08-021-0/+3
| | | | | bug:4266229 Change-Id: Ic8cf3ea9e16adb62dbe30df7baf9528807c9ea56
* Insert final mosaic image into MediaStore.Angus Kong2011-07-311-113/+44
| | | | | bug:5031609 Change-Id: I234868bafd1f4437f39ee719ca7946052aec71db
* Fix memory leaks both in the native and Java side.Wei-Ta Chen2011-07-284-53/+123
| | | | Change-Id: I80dabe069047fb2327ddbb4f78477723870e1c2a
* Add a freeMosaicMemory function in JNI to address the leaks.mbansal2011-07-281-1/+7
| | | | | | | | | 1) Fix coding style issues. 2) Added native and java functions to freeMosaicMemory. 3) Added optimized YUV420to444 conversion routine to native side. 4) Fixed more style issues based on code review comments. Change-Id: Ic824584f6b3a02e4d0d7b472bed57637873ca622
* Refactoring Panorama UI codes.Angus Kong2011-07-293-424/+390
| | | | | | | | Mosaic native interface is moved out from Preview.java. Program logics and UI are now decoupled. bug:5031609 Change-Id: If46a21a6be05deba7fd1f94f37d14c4afa460d78
* Add mode picker for camera/camcorder/panaramorepo sync2011-07-291-1/+24
| | | | | | | | +remove camera switcher +add menu item for panorama bug:5039225 Change-Id: Ib065074026760f7dc1bd1dfe694935f46bb8c407
* Fix preview orientation bug on some devices.Angus Kong2011-07-271-0/+4
| | | | | bug:5031609 Change-Id: If70a5a4125315caf4d53534d1e884bde6bc80cbd
* Check in the Mosaic Stitching codes.Wei-Ta Chen2011-07-274-0/+949
| | | | | | | | | | 1. Camera setup moved to activity level. 2. Fixed releasing and acquiring camera process. 3. Unused .xml files removed. 4. Style issues fixed. Bug: 5031489 Change-Id: Ifd271588ca2168398e17f204f065681ead2d8f2f
* Check in Mosaic.java - the Java interface to JNI.Wei-Ta Chen2011-07-081-0/+139
Change-Id: Id3a84177aa6978499c5a8b1cff78b44759989119