History log of /packages/apps/Camera2/src/com/android/camera/one/v2/OneCameraZslImpl.java
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
37036186326fb68c27063f97305405d3667a5eb3 25-Mar-2015 Sascha Haeberling <haeberling@google.com> Change CaptureSession.saveAndFinish to return a future for the URI.

Bug: 19665531

Most callers of saveAndFinish never provided the callback. In addition
it's unclear on what thread the callback is called. This cleans this up
a bit and moves the responsibility to the caller to decide on which
thread the URI should be received. Callers that don't care don't have to
do anything.

Also fixes a bug where we wouldn't even supply a URI for when there was
no placeholder.

Change-Id: I1a186b470d2cca8f34a674e9eb5c533fc01a4409
/packages/apps/Camera2/src/com/android/camera/one/v2/OneCameraZslImpl.java
5ca7d2642881f3cf06adb2532e0d5950524a34f4 07-Mar-2015 Puneet Lall <puneetl@google.com> Optimize ZSL for auto-flash mode

Cache the most recent converged AE state to enable more
auto-flash pictures to be taken with zero shutter lag.

Bug: 19151363
Change-Id: I7d4bd5a67d4cddb7a1f733844e1a080acfacf7f4
/packages/apps/Camera2/src/com/android/camera/one/v2/OneCameraZslImpl.java
dfef32425e6184d5721bb7af9db823ec46bc2b4f 11-Mar-2015 Sascha Haeberling <haeberling@google.com> Add Location to EXIF

Bug: 16961102

Change-Id: I9f2335c0f02bea1286698330483cd30fdb875f45
/packages/apps/Camera2/src/com/android/camera/one/v2/OneCameraZslImpl.java
f6031c016d916db9789026dc0a6c559d8163a088 19-Feb-2015 Spike Sprague <spikuru@google.com> Add EXIF data to images processed via software JPEG encoder.
bug: 16961102

Change-Id: I3df48a74fedbba6ca5540bf095f5e5eaf93db3ab
/packages/apps/Camera2/src/com/android/camera/one/v2/OneCameraZslImpl.java
6ba8eeea4758e29318c615e978c63599c30438b4 18-Feb-2015 Paul Rohde <codelogic@google.com> Add a PreviewSizeSelector interface.

This removes the required context object for the utility objects
in both CameraUtil and CaptureModuleUtil. Adding an interface
for PreviewSizeSelection clears the way for future work to move
the preview size selection code into a dedicated class and to have
api specific versions of preview selection code for startup
speed improvements.

Change-Id: I92e58dad23b08057eb10984c31d04947a376ac6d
/packages/apps/Camera2/src/com/android/camera/one/v2/OneCameraZslImpl.java
401990916915791be14c65694ce3507eac3ec82d 17-Feb-2015 Paul Rohde <codelogic@google.com> Merge "Read focus range from CameraCharacteristics." into ub-camera-haleakala
aca904e29aea542b6e6a4fcc837759a57a270a49 12-Feb-2015 Paul Rohde <codelogic@google.com> Read focus range from CameraCharacteristics.

- Remove hardcoded focus range values.
- Explicitly provide a lens range and range checks.

Bug: 19356651

Change-Id: Ied2513b5a654a00af07e76a66e72aac50ffc9c42
/packages/apps/Camera2/src/com/android/camera/one/v2/OneCameraZslImpl.java
b4b27f2c7738cd5e3f31a281d66a33f4698810b3 16-Jan-2015 Shashi Shekhar <shashishekhar@google.com> Port burst to use FrameServer.

Port burst to frameserver
- simplifies burst interfaces
- removes burst methods from OneCamera.
- locks orientation when burst is running.
- Deletes most old code for burst integration.
- Removes frame distributor preview forwarding, instead frames are
streamed using a surface texture the Surface for which is passed
as a output target to the create capture session.
- Deletes FrameDistributor, now the low-res frames are streamed to a new
surface specifically setup for burst.

Change-Id: I50f2955bb48610a7e284f9609cd70b8e4e1f1059
/packages/apps/Camera2/src/com/android/camera/one/v2/OneCameraZslImpl.java
abf1e994d236a65180eecfcb6997003ab12795df 21-Jan-2015 Sascha Haeberling <haeberling@google.com> CaptureSession can now be started with an empty placeholder.

Bug: 19014774
Bug: 18853119
Bug: 18979823

Being able to start with an empty placeholder and then updating that
placeholder allows us to add a visual entry to the filmstrip early on.

This avoid jarring effects where after taking many apid fire shots and
going to filmstrip, the entries are appearing one after the other.
This was caused by sessions only getting started when the thumbnail was
produced, which can take a while when multiple shots are in the
encoding pipeline.

Also contains changes that make CaptureSession testable.

Change-Id: I3d44704099be81524f8e165f3f09de6eebfc147b
/packages/apps/Camera2/src/com/android/camera/one/v2/OneCameraZslImpl.java
386c5b885b99f67f9c0a7380f4be153f28333089 09-Jan-2015 Puneet Lall <puneetl@google.com> Apply flash setting changes to the AE mode

Bug: 17216526

Change-Id: If6c03102f04ad2ba54e1a045a3ab7445aaa5b595
/packages/apps/Camera2/src/com/android/camera/one/v2/OneCameraZslImpl.java
d8463954727c9f8b688e69476439830cadb7b45a 30-Dec-2014 Puneet Lall <puneetl@google.com> Refactor camera factories to reduce code duplication

Change-Id: I5f5c899f595dbbaa9fa181c5caa092d4bad69f07
/packages/apps/Camera2/src/com/android/camera/one/v2/OneCameraZslImpl.java
c7251753978f80dc40131e7676f69f7e86208fd1 29-Dec-2014 Puneet Lall <puneetl@google.com> Remove unused parameter to OneCamera.close

Change-Id: Iea5dcb41eb5c387a7f19db280ea9c681e2aabc7e
/packages/apps/Camera2/src/com/android/camera/one/v2/OneCameraZslImpl.java
30ccdac56450e5b1927e14a6eede2b86a30c42eb 19-Dec-2014 I-Jong Lin <ijonglin@google.com> Full end-to-end integration for ZSL

Full end-to-end functionality using the ZSL integrated with
the ImageBackend. Still some outstanding issues regarding image
orientation, but the full pipeline is plumbed for ZSL.

Change-Id: I636944fbd57e7d1bf6b1ef24e1e2c1317afdd28d
/packages/apps/Camera2/src/com/android/camera/one/v2/OneCameraZslImpl.java
01d56038a53487a9b7989bd17c732b8919da64f1 18-Dec-2014 Paul Rohde <codelogic@google.com> Delete unused code.

Change-Id: I55e6da712199cb106781bea8a51cf98fd5ed7e31
/packages/apps/Camera2/src/com/android/camera/one/v2/OneCameraZslImpl.java
987ee64612e2510004fdf08536746c87234d01c1 05-Dec-2014 Paul Rohde <codelogic@google.com> Drop new focus indicator into Camera2.

* Create a new custom focus view that interacts with physical lens diopter changes.
* Replace all occurances of the old focus indicator with the new one.

Change-Id: Ia02646ce4d1eb059ecb8a1dfccc15dfc9c167e1b
/packages/apps/Camera2/src/com/android/camera/one/v2/OneCameraZslImpl.java
1321823277e30b0be46f4911418b7b64cfc7d1c0 08-Dec-2014 Radford Juang <radford@google.com> Setting AF mode for SmartBurst to CONTINUOUS_VIDEO to prevent focus
issues when capturing action with SmartBurst.

(Note: b/16984793 prevents this from working properly on Nexus 5)

Change-Id: I3b046030ccf1264a339fa1e8dc15ae92d7157e7f
/packages/apps/Camera2/src/com/android/camera/one/v2/OneCameraZslImpl.java
9ceed0d5535e8453f8b5f77959134760dac01ec5 25-Nov-2014 Puneet Lall <puneetl@google.com> Refactor OneCamera

* Removed CaptureParameter "sanityCheck"
* Removed unused OneCamera interface methods

Change-Id: I2464cedf4ad9122e6ca72055e1cc8c0ba633a164
/packages/apps/Camera2/src/com/android/camera/one/v2/OneCameraZslImpl.java
82d592f64966766ac4e4181e08b0d2989d4ed9c3 12-Nov-2014 Shashi Shekhar <shashishekhar@google.com> Hook burst controller to the shutter button long press.

Hooks up the shutter button long press to start the burst.
Introduces a BurstManager to interact with burst.
Provides an implementation of BurstManager that listens to burst and
saves results when burst is complete.

The burst eviction handler is now installed on the ring buffer
on shutter button press and uninstalled on shutter button release.
The ring buffer is cleared before starting and after completion of the
burst.

Also provides a stub implementation of the BurstController that has a
static method which controls if burst is enabled or not.

Bug: 18332704

Change-Id: I1098937bf348af7acbf55da1a5eeb423c30fb901
/packages/apps/Camera2/src/com/android/camera/one/v2/OneCameraZslImpl.java
0bdc4b54a18c18d7094b2e4cea1e238005c5c4a2 18-Nov-2014 Senpo Hu <senpo@google.com> Unify orientation calculation logic.

Camera API takes clockwise degrees for JPEG rotation and
OrientationEventListener reports clockwise device orientation.
The easiest formula of calculating output image rotation degree is:
"camera sensor orientation" + "device orientation"

Since front cameras face in opposite direction. The result needs to be mirrored
for front camera.

Detailed changes:
* Refactor OrientationManager to remove unnecessary complexity.
* Add OrientationManager.DeviceOrientation enum and
OrientationManager.getDeviceOrientation
* Remove CameraUtil.roundOrientation.
* Fix the weird calculation which is hard to understand in
CameraUtil.getJpegRotation and add CameraUtil.getImageRotation
* Clean up image rotation logic in all modules:
* Always look up the current device orientation via OrientationManager.getDeviceOrientation
* Fix the doc for copyImagePlaneToBitmap() which actually rotates image
counterclockwise.
* Clean up CameraActivity:
* Remove CameraActivity.onOrientationChanged and
ModuleController.onOrientationChanged. Any individual module which
wants to listen orientation change should register itself to
OrientationManager. Now only VideoModule needs to do that.

Bug: 17443789
Change-Id: I6d54cac5bde950acae0c3226448c27a816266df0
/packages/apps/Camera2/src/com/android/camera/one/v2/OneCameraZslImpl.java
c6da1a12fe8b78e2fbebe1af5efee514bc8e25ee 06-Nov-2014 Sascha Haeberling <haeberling@google.com> Add experimental RAW(DNG) support.

Bug: 18272977

This adds RAW writing behind a new debug property:
adb shell setprop persist.camera.capture_dng 1

This will switch to the non-ZSL implementation of one Camera.

The resulting files are stored in a "DNG" folder under DCIM/Camera.

Caveats:
- Preview aspect ratio will not match.
- No item in filmstrip

Change-Id: I9d990de119f22a12d37b22d36d84dc15aeee9340
/packages/apps/Camera2/src/com/android/camera/one/v2/OneCameraZslImpl.java
c2387dc7fa82fafb2dd2eac0e7280ff71dece0f4 16-Oct-2014 Puneet Lall <puneetl@google.com> Rename ListenerCombiner

Change-Id: Id293c9cd3a04229524a4fc5047d69e6b37837e62
/packages/apps/Camera2/src/com/android/camera/one/v2/OneCameraZslImpl.java
9cd94d77bcafad38f15b318ea5c9dbc0849c1ecd 14-Oct-2014 Puneet Lall <puneetl@google.com> Enable CaptureModule/ZSL

* Close the image reader in ZSL impl
* Enable CaptureModule for API2
* Set ZSL ring-buffer to 10 images

Change-Id: I19eb6bf9102ba8397fa073c98b1a3b5f84b74601
/packages/apps/Camera2/src/com/android/camera/one/v2/OneCameraZslImpl.java
df93cdd91f8f47794f26a066be3630e178b9ce36 13-Oct-2014 Alan Newberger <alann@google.com> am 7839867c: Merge "Update to use real L codename." into ub-camera-glacier

* commit '7839867c4c6eb837d5e7c1c5851741d4933f5fb1':
Update to use real L codename.
43d66a0cac75bbb0adb0933124002e1eb1f439b9 08-Oct-2014 Dianne Hackborn <hackbod@google.com> Update to use real L codename.

Change-Id: If6e5f02f693848f6cb0014084dccf910be4c958d
/packages/apps/Camera2/src/com/android/camera/one/v2/OneCameraZslImpl.java
ff35f85800f42e36c4c766e777b6251edaef33d3 20-Sep-2014 Jiawen Chen <jiawen@google.com> am 30ae8c64: Merge "Changed tap-to-meter rectangle and weights." into ub-camera-glacier

* commit '30ae8c64cec9313fc050daf94ae3fbddedf80b36':
Changed tap-to-meter rectangle and weights.
0971376b0ddf12c8aa886ad9109f6a8929095154 17-Sep-2014 Jiawen Chen <jiawen@google.com> Changed tap-to-meter rectangle and weights.

Bug: 17417649

- Clarified widths in Settings3A.
- For Gcam only, reduced AE box to 12.25% of the shorter edge of the crop
rectangle. This matches the setting on Nexus 5.
- For Gcam only, changed AE weight to 22 after consultations with Ryan.
- Tested with Gcam and it final shots look great in HDR scenes.
- Does not fully address b/17417649: ISP AE ignores the weight completely and
overcompensates for the tap region.
- Changed AutoFocusHelper to take touch points in normalized portrait
coordinates along with a sensor orientation. The output is a MeteringRectangle
in sensor pixels.
- Fixed a bug where a digital-zoomed tap doesn't work when the rect intersects
edges. It should have been clamp, not check for intersection and return the
full crop rectangle if it doesn't intersect.

- Submit simultaneously with ag/549706.

Change-Id: If084e64ecbfc4a08ece96a7cebfcaf835d92b9d1
/packages/apps/Camera2/src/com/android/camera/one/v2/OneCameraZslImpl.java
07722e5a91e52ac26aec2503d11645922300fa39 11-Sep-2014 Jiawen Chen <jiawen@google.com> resolved conflicts for merge of 9cefdd49 to ub-camera-haleakala

Change-Id: I5aa115c3469cdff71c410e016155d0c83d6e51c1
9cefdd495332719d987ffb942742ec602793d8d4 09-Sep-2014 Jiawen Chen <jiawen@google.com> Changed double to float. viewFinder -> viewfinder.

Change-Id: I5f10a5e8dae40f56457b863d5e8c703e7bf68e49
/packages/apps/Camera2/src/com/android/camera/one/v2/OneCameraZslImpl.java
4a748623618f2bae149c8cf385046666c717a7a9 08-Sep-2014 Andy Huibers <andyhuibers@google.com> [try 2] resolved conflicts for merge of 6281a794 to ub-camera-haleakala

Change-Id: Ie98a22f57af23c80e08e47c841e22fef02036799
/packages/apps/Camera2/src/com/android/camera/one/v2/OneCameraZslImpl.java
e89b2c119e5167d1f03d207e3e6c62876b57895a 08-Sep-2014 Andy Huibers <andyhuibers@google.com> resolved conflicts for merge of 6281a794 to ub-camera-haleakala

Change-Id: Ie488ba4103bc69f5a03bff8ef9be23a93aec51f6
6281a7942de9e55386c20c6f41bfb656b126a364 08-Sep-2014 Andy Huibers <andyhuibers@google.com> Merge "In debug_ui mode, show CAF result state, length of AF scan, fps, for camera2 API." into ub-camera-glacier
ca3c564536f154b83e380e37382bc7b9f6049302 07-Sep-2014 Andy Huibers <andyhuibers@google.com> In debug_ui mode, show CAF result state, length of AF scan, fps, for camera2 API.

Bug: 17397777
Bug: 17028594
Bug: 17391241
Change-Id: Id5a7fe748f988755cb2d786a2103e375eb97b08f
/packages/apps/Camera2/src/com/android/camera/one/v2/OneCameraZslImpl.java
f5c62537715e8ab5e586491b75e8ddff9a3d9f6a 08-Sep-2014 Alan Newberger <alann@google.com> DO NOT MERGE Update Camera2 to use latest APIs

Bug: 17423266
Change-Id: I1f1d79619d89971b387a78756b8f3b4d4b45d76e
(cherry picked from commit 76215c98a9a11d87b5ce9d2b4198654c2b8bbddf)
/packages/apps/Camera2/src/com/android/camera/one/v2/OneCameraZslImpl.java
76215c98a9a11d87b5ce9d2b4198654c2b8bbddf 08-Sep-2014 Alan Newberger <alann@google.com> DO NOT MERGE Update Camera2 to use latest APIs

Bug: 17423266
Change-Id: I1f1d79619d89971b387a78756b8f3b4d4b45d76e
/packages/apps/Camera2/src/com/android/camera/one/v2/OneCameraZslImpl.java
863a5abf144db5c50c459d1c2f66543598aa26fc 06-Sep-2014 Puneet Lall <puneetl@google.com> Enable more rapid zsl capture

Change-Id: I0f036a60f2f5f53092e544e8ec4890bbfeb9e659
/packages/apps/Camera2/src/com/android/camera/one/v2/OneCameraZslImpl.java
f78afae19d95443cfddf4c1d2df860ad7a4af900 06-Sep-2014 Puneet Lall <puneetl@google.com> Merge "Zsl, handle null CaptureResults, increase ring buffer size" into ub-camera-haleakala
4fc7b8182f0f9b67d77539ff2bffa7ae2cac619f 06-Sep-2014 Alan Newberger <alann@google.com> DO NOT MERGE Revert "Update camera2 API usage"

This temporarily reverts commit for unbundled branch 9c84812bba91831e1759c23e8c92082a8a5f44fd.

Change-Id: Ic4767cd27373c36dd77df4469f5006ced8746f9f
(cherry picked from commit 21fdb9db957973fa00777b65787db7e887fc070d)
/packages/apps/Camera2/src/com/android/camera/one/v2/OneCameraZslImpl.java
21fdb9db957973fa00777b65787db7e887fc070d 06-Sep-2014 Alan Newberger <alann@google.com> DO NOT MERGE Revert "Update camera2 API usage"

This temporarily reverts commit for unbundled branch 9c84812bba91831e1759c23e8c92082a8a5f44fd.

Change-Id: Ic4767cd27373c36dd77df4469f5006ced8746f9f
/packages/apps/Camera2/src/com/android/camera/one/v2/OneCameraZslImpl.java
d686e6d6fd331d617ff7ec8a09572797b1cc8081 06-Sep-2014 Puneet Lall <puneetl@google.com> Merge "Implemented rotation of zsl images" into ub-camera-haleakala
0ad7ab0b0a0d17a96438a503d0c918979b5d6480 05-Sep-2014 Puneet Lall <puneetl@google.com> Implemented rotation of zsl images

Bug: 17370310
Change-Id: Ida437d817482d19224d7afd2f06b00960480bd1c
/packages/apps/Camera2/src/com/android/camera/one/v2/OneCameraZslImpl.java
bbd6516a5aedf3173954ee0ece85a45ebb9d73aa 06-Sep-2014 Puneet Lall <puneetl@google.com> Zsl, handle null CaptureResults, increase ring buffer size

Change-Id: I288b85eab04666718af61a07d0db8382ac4f72e2
/packages/apps/Camera2/src/com/android/camera/one/v2/OneCameraZslImpl.java
9c84812bba91831e1759c23e8c92082a8a5f44fd 05-Sep-2014 Eino-Ville Talvala <etalvala@google.com> Update camera2 API usage

Rename listeners to callbacks

Bug: 17389922
Change-Id: I33affcaeec331eca2d084ded4eb199f86fa58765
/packages/apps/Camera2/src/com/android/camera/one/v2/OneCameraZslImpl.java
17d9084e38e64f06a9d411d64fe3c2739d299cda 29-Aug-2014 Andy Huibers <andyhuibers@google.com> Add short flash animation and shutter sound to ZSL camera.

Bug: 17217567
Change-Id: I9a75fdd15e03f47029ef4a631287899718794c5c
/packages/apps/Camera2/src/com/android/camera/one/v2/OneCameraZslImpl.java
142b5bf5e10db858c2d2e69fd93d6565ba51363b 03-Sep-2014 Puneet Lall <puneetl@google.com> Re-enable shutter-button when switching between front and back cameras.

Bug: 16961251
Change-Id: Ie3075bf711ab44dfe5e6cdd6b3645dd6583708b5
/packages/apps/Camera2/src/com/android/camera/one/v2/OneCameraZslImpl.java
4d6d676c368b70e8c0fcf462e51de1d59fe34028 03-Sep-2014 Puneet Lall <puneetl@google.com> Refactor default picture size selection in zsl cam.

Bug: 17322843
Change-Id: Ib34584937db639f984689042bd8371443a33bb64
/packages/apps/Camera2/src/com/android/camera/one/v2/OneCameraZslImpl.java
686c7b55a6b0c9c7202383e0589b190e5439ce69 03-Sep-2014 Puneet Lall <puneetl@google.com> Merge "[ZSL Cam] Use largest supported size if no picture size is already set." into ub-camera-glacier
80f44448e13b5d6d33f4aad63448d7b39b6dda0f 03-Sep-2014 Puneet Lall <puneetl@google.com> [ZSL Cam] Use largest supported size if no picture size is already set.

Fixes crash due to null size when zsl is started for the first time on a
fresh device.

Bug: 17322843
Change-Id: I31ef4202c13cee1270af59231f93842fa0e86009
/packages/apps/Camera2/src/com/android/camera/one/v2/OneCameraZslImpl.java
527706e2957fe26f301d991d86d4359ab433408d 02-Sep-2014 Andy Huibers <andyhuibers@google.com> Remove android.hardware.camera2 import from Settings3A.

Bug: 17358060
Change-Id: I7e4442a4257acf9e4b58981be697949aba62a31f
/packages/apps/Camera2/src/com/android/camera/one/v2/OneCameraZslImpl.java
b868274c9dc8d9c772ec89fb5955215cc7911087 28-Aug-2014 Andy Huibers <andyhuibers@google.com> Simplify AF in CaptureModule and OneCameraImpl and share code in AutoFocusHelper.

Bug: 17202848
Change-Id: I08e92c9701d5b92938612137c87ca37c4305411f
/packages/apps/Camera2/src/com/android/camera/one/v2/OneCameraZslImpl.java
68c25ac5373126670cb6c2324e40537bb47e72d9 29-Aug-2014 Puneet Lall <puneetl@google.com> ZSL refactoring

Bug: 16961251

Change-Id: I19642f5de088135db6650df98a62dd8dd462e0da
/packages/apps/Camera2/src/com/android/camera/one/v2/OneCameraZslImpl.java
182ba6f13e9dab9a9c0341efe4c907ff7853352d 29-Aug-2014 Puneet Lall <puneetl@google.com> [ZSL Cam] Fixed shutter button, compress on threadpool.

Change-Id: I4c2167163ee35ba841f459ae76779f44647bcb28
/packages/apps/Camera2/src/com/android/camera/one/v2/OneCameraZslImpl.java
580f451fc85cc752e71eb730006b90d09aaafb55 28-Aug-2014 Puneet Lall <puneetl@google.com> Zsl flash, auto focus, and other minor fixes

Bug: 17216526
Bug: 17221258
Change-Id: I5129c57674874d3a29789e0c9029eadeaa138788
/packages/apps/Camera2/src/com/android/camera/one/v2/OneCameraZslImpl.java
512001df0211fa8999593717a0f186457a5a9cef 14-Aug-2014 Puneet Lall <puneetl@google.com> Initial ZSL implementation

Bug: 16961251
Change-Id: I03c7c1813f99d460495472addc7f733e1bfa6a97
/packages/apps/Camera2/src/com/android/camera/one/v2/OneCameraZslImpl.java