Commit Graph

287 Commits

Author SHA1 Message Date
Wu-cheng Li
53b30912d3 Improve camera javadoc and fix some errors.
bug:5169599
Change-Id: Ic2205770753ff462135f884fee0a888ca8ec832d
2011-10-13 12:04:05 +08:00
Eino-Ville Talvala
037abb8bb0 Add video stabilization control to Camera parameters.
Hardware video stabilization reduces camera shake in preview
and in recorded videos. It has no effect on still image capture.

Convenience accessor methods hidden for now.

Change-Id: Ie18450bff662b2ef98b85d19719beefc180975fc
2011-10-12 10:34:10 -07:00
Wu-cheng Li
3c02c12c73 Merge "Allow Camera.setDisplayOrientation to be called when preview is active." 2011-10-07 03:08:23 -07:00
Wu-cheng Li
d303362ac2 Allow Camera.setDisplayOrientation to be called when preview is active.
bug:5422679

Change-Id: I4c936ab00428fc158b5947fe8f10b1028869bbdb
2011-10-07 18:01:09 +08:00
Joe Fernandez
464cb21e2a docs: Camera class JavaDoc FixIts for ICS
Change-Id: I03d96247d149baf82c53b33aa7737fca11906ce6
2011-10-04 16:56:47 -07:00
Wei Huang
3d9a9e55df Merge "Update camera javadoc about AE and AWB lock." into ics-factoryrom 2011-09-23 10:04:02 -07:00
Chih-yu Huang
664d72e663 Clear callbacks in camera stopPreview.
Clear those callbacks to remove the references
so the memory can be recycled.

bug:5358774
Change-Id: I3b6034a1891126b3437a6744013f38a64f5bb03b
2011-09-23 20:28:28 +08:00
Wu-cheng Li
b4f95be03e Update camera javadoc about AE and AWB lock.
- Autofocus does not lock AE and AWB.
- stopPreview and takePicture do not clear AE and AWB locks.

bug:5356404

Change-Id: I55d9b35f4ff746ecd2bff112c2674f1aa2543aca
2011-09-22 18:19:02 +08:00
Mathias Agopian
5263767cda Tweak DELAY_UI for 16Hz to 15Hz
this allows us to hit the lower accel rate.

Change-Id: I21944ee82020cf4b80397b87803bc481ddf51931
2011-09-14 18:18:11 -07:00
Mathias Agopian
66bd5e98ec Merge "improve the gyroscope javadoc" 2011-09-07 15:58:39 -07:00
Mathias Agopian
ad7f33a29c improve the gyroscope javadoc
change the sample code to something more useful and more
correct.

Change-Id: Ia81f86a2f409edbb395405ababae307663824cb9
2011-09-07 15:56:03 -07:00
Wu-cheng Li
4c454d82b6 Unhide camera video snapshot supported API.
bug:5187868
Change-Id: Idefde8746012c8ef504f3e3020e3fe1256c60860
2011-09-08 02:32:20 +08:00
Wu-cheng Li
98bb251c8b Add video snapshot camera parameter.
The API is still hidden.

bug:5187868

Change-Id: I59e1b5774ca32be049723d1a0887faa90d8884bb
2011-09-01 13:37:14 +08:00
Scott Main
9a10bf0386 fix sample code typo
issue 5190961

Change-Id: I15f10bc97b46f0e5f5e31ff5b38d6c3a938ddedf
2011-08-24 19:09:48 -07:00
Wu-cheng Li
a46c372a75 Merge "Make camera FOCUS_MODE_CONTINUOUS_PICTURE public." 2011-08-23 00:05:00 -07:00
Wu-cheng Li
af4f65806e Make camera FOCUS_MODE_CONTINUOUS_PICTURE public.
bug:5086125
Change-Id: I140dd8357adabb167f2f2efee8f5db00ab86705c
2011-08-22 23:21:03 +08:00
Wei Hua
7526a6d923 Merge "Added additional Face attributes." 2011-08-19 17:20:54 -07:00
Wei Hua
d52b308916 Added additional Face attributes.
bug: 5186701
Change-Id: Id08df922b9a79192a81e6e8bd7c0dccad4664b3b
2011-08-19 13:01:51 -07:00
Eino-Ville Talvala
16b67137b8 Make changing white-balance mode always disable AWB lock.
Fixes previously unspecified behavior wrt changing white-balance mode
while AWB is locked.

Change-Id: Ib70597319010cc7e6c88b26cae534ceea4fb46ce
2011-08-18 13:57:49 -07:00
Wu-cheng Li
b9ac75d3df Add new camera focus mode FOCUS_MODE_CONTINUOUS_PICTURE.
The API is still hidden.

bug:5086125
Change-Id: I69268a95ad6aae249771d3a8dfb423ffe2d87081
2011-08-18 00:15:40 +08:00
Wu-cheng Li
aba367eea4 Merge "Unhide camera face detection API." 2011-08-10 02:55:29 -07:00
Wu-cheng Li
c0c683b334 Unhide camera face detection API.
bug:4460717
Change-Id: I8d72b0ada370acd6267c47deb654bb4bf1cfb538
2011-08-10 08:45:26 +08:00
Wu-cheng Li
08a907149e Merge "Unhide camera recording hint API." 2011-08-09 02:54:07 -07:00
Wu-cheng Li
09f6d67f37 Merge "Add camera bayer image format." 2011-08-04 01:46:56 -07:00
Wu-cheng Li
70fb908504 Add camera bayer image format.
The API are hidden.

bug:5086073

Change-Id: Ic9a53e5d5007ad3f12a28406ee25098227f14cbc
2011-08-04 16:40:28 +08:00
Wu-cheng Li
9c53f1c33a Unhide camera recording hint API.
bug:4266229
Change-Id: Ic9014e521e22a3940b9c2068ce38783f52d2ac31
2011-08-03 23:39:07 +08:00
Mike Lockwood
e51099f110 UsbManager: add getDefaultFunction()
Bug: 5108883

Change-Id: I211f1ee39987da4a5456d86b49b954c564fa3bf4
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-08-02 12:54:49 -04:00
Wu-cheng Li
bb1e275c0e Pass camera frame metadata from camera service to Java.
bug:4460717
Change-Id: I2fae6e1dfca6b8f3a5ee5716fc7817f5417bf657
2011-08-02 15:48:41 +08:00
Wu-cheng Li
25d8fb51da Add camera recording hint parameter.
The API is still hidden.

bug:4266229
Change-Id: I5e4c24e9e2808582aecb55ac4f1d5be3ed7e36a2
2011-08-02 14:27:58 +08:00
Wu-cheng Li
f0d6a48c6a Add frame metadata parameter to camera data_callback.
bug:4460717
Change-Id: Ib47d7d7df20af8155a719f3dabefe030893bfebc
2011-07-29 07:14:38 +08:00
Wu-cheng Li
4c2292efbb Add camera face detection API.
API are still hidden.

bug:4460717
Change-Id: I1a515061f141a89bd61c875257712789fb15d2d4
2011-07-27 05:25:35 +08:00
Wu-cheng Li
f55df0e26a Merge "Add camera new picture and new video broadcast intents." 2011-07-19 11:16:20 -07:00
Wu-cheng Li
10e09c69d6 Add camera new picture and new video broadcast intents.
bug:4964321
Change-Id: I42b45cda2e6a30f3bdf6127e2594933f32ecbaeb
2011-07-19 06:19:26 +08:00
Mike Lockwood
875c24b897 UsbManager: document that passing null setCurrentFunction restores default function
Change-Id: I4340b336f3e91b3b8242f2a66c34a7a7f5c3021f
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-07-18 10:54:32 -07:00
Eino-Ville Talvala
83d3352cf7 NEW_API: Add auto-exposure and auto-white balance locking to the Camera.
Unhides the Camera API calls for using the auto-exposure and
auto-white balance locks. Adds documentation about the interaction
between auto-focus and the AE and AWB locks.

Change-Id: I5bf73b9dce1c93e11a17f9d3efb82db1261524c5
2011-07-14 10:05:04 -07:00
Wu-cheng Li
42419ce28a Add framework support for camcorder zoom.
The purpose of ICameraRecordingProxy and ICameraRecordingProxyListener is to
allow applications using the camera during recording.

Camera service allows only one client at a time. Since camcorder application
needs to own the camera to do things like zoom, the media recorder cannot
access the camera directly during recording. So ICameraRecordingProxy is a proxy
of ICamera, which allows the media recorder to start/stop the recording and
release recording frames. ICameraRecordingProxyListener is an interface that
allows the recorder to receive video frames during recording.

ICameraRecordingProxy
  startRecording()
  stopRecording()
  releaseRecordingFrame()

ICameraRecordingProxyListener
  dataCallbackTimestamp()

The camcorder app opens the camera and starts the preview. The app passes
ICamera and ICameraRecordingProxy to the media recorder by
MediaRecorder::setCamera(). The recorder uses ICamera to setup the camera in
MediaRecorder::start(). After setup, the recorder disconnects from camera
service. The recorder calls ICameraRecordingProxy::startRecording() and
passes a ICameraRecordingProxyListener to the app. The app connects back to
camera service and starts the recording. The app owns the camera and can do
things like zoom. The media recorder receives the video frames from the
listener and releases them by ICameraRecordingProxy::releaseRecordingFrame.
The recorder calls ICameraRecordingProxy::stopRecording() to stop the
recording.

The call sequences are as follows:
1. The app: Camera.unlock().
2. The app: MediaRecorder.setCamera().
3. Start recording
   (1) The app: MediaRecorder.start().
   (2) The recorder: ICamera.unlock() and ICamera.disconnect().
   (3) The recorder: ICameraRecordingProxy.startRecording().
   (4) The app: ICamera.reconnect().
   (5) The app: ICamera.startRecording().
4. During recording
   (1) The recorder: receive frames from ICameraRecordingProxyListener.dataCallbackTimestamp()
   (2) The recorder: release frames by ICameraRecordingProxy.releaseRecordingFrame().
5. Stop recording
   (1) The app: MediaRecorder.stop()
   (2) The recorder: ICameraRecordingProxy.stopRecording().
   (3) The app: ICamera.stopRecording().

bug:2644213

Change-Id: I15269397defc25cbbcae16abc071c8349c123122
2011-06-27 15:44:57 +08:00
Mike Lockwood
f59717ddb5 Combine UsbManager.setPrimaryFunction and setDefaultFunction
Due to the property trigger on persist.sys.usb.config,
setting the default function also sets the current function.
Now we combine both of these methods into setCurrentFunction, which has
a "makeDefault" option to make the new function the default.

This change should eliminate some problems with setting properties due to
multiple property triggers happening at the same time.

Change-Id: I9851299e9c2ee20475eada1a8104c0d50bf5a9e1
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-06-22 15:19:33 -04:00
Wu-cheng Li
d8aab93f96 Fix camera getMeteringAreas does not return areas correctly.
bug:4494242
Change-Id: Ide5a44fc302ecda22557fc9eba5e7fcd8679712b
2011-06-21 12:15:50 +08:00
Mike Lockwood
02e4569b5f USB: Support for new USB gadget drivers
Change-Id: Id08df50acb873a94f4765a991ee6a6f5b898ddf5
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-06-17 19:49:05 -04:00
Wu-cheng Li
facc8ce116 Mention device policay manager in Camera.open javadoc.
bug:4185309
Change-Id: I733654a0be1953851dac7686c9c38e7af8f1d73a
2011-06-17 13:11:03 +08:00
Mike Lockwood
523510e9b7 Merge "UsbManager: Clean up extras for ACTION_USB_STATE broadcast" 2011-06-08 09:42:54 -07:00
Mike Lockwood
9eb014aeb0 UsbManager: Clean up extras for ACTION_USB_STATE broadcast
Also added name for new PTP USB function

Change-Id: Ia2775ba2b23ef6a6108ca7e060239eb51c2eecc8
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-06-08 09:17:45 -07:00
Eino-Ville Talvala
32a972c693 Updates to Camera API documentation.
Change-Id: I716a36becce436f57ea62fcfecd9021eb29b76ea
2011-06-07 10:34:56 -07:00
Wu-cheng Li
bde61a5731 Improve android.hardware.Camera.Area javadoc.
bug:4553469
Change-Id: Iae88af354fee4925cb7978572c27f6dd5595ca59
2011-06-07 19:00:03 +08:00
Mike Lockwood
90f902afde resolved conflicts for merge of c1730dcf to master
Change-Id: I9e0f9740930c7d3acb51235dd4c67cf2ed54a486
2011-05-19 13:34:44 -04:00
Mike Lockwood
c1730dcf89 am ae448e2c: am a88b42d5: USB: Add method to access raw USB device descriptors
* commit 'ae448e2c90cae096efea53c1c93a70e7b5ca2db7':
  USB: Add method to access raw USB device descriptors
2011-05-19 10:06:44 -07:00
Mike Lockwood
a88b42d569 USB: Add method to access raw USB device descriptors
Change-Id: Id5b46ede14a838198a59bdc8ed4732942044cfa8
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-19 12:57:41 -04:00
Jean-Baptiste Queru
c6b7a0131e Merge 111d17ce
Change-Id: I2e0aa4328bc78eb5bcd987e7bf74b0889d2fae7f
2011-05-19 07:17:00 -07:00
Jean-Baptiste Queru
111d17ce51 Merge 4b999030
Change-Id: Ibb94ba77ec8588f5e7636cf6a038b143e3dcb2bd
2011-05-18 15:33:27 -07:00
Jean-Baptiste Queru
6c427617be Merge "support humidity sensor type" 2011-05-18 15:00:11 -07:00