summaryrefslogtreecommitdiffstats
path: root/camera
Commit message (Collapse)AuthorAgeFilesLines
* DO NOT MERGE: Remove experimental parameters for burst modeJames Painter2012-09-281-5/+0
| | | | | Bug: 7248756 Change-Id: I3aaf2da4791b2a13e1e788b2914e4c51c529a75d
* Camera: Add HDR scene mode constants.Eino-Ville Talvala2012-09-101-0/+1
| | | | Change-Id: I78b1f8ca3c1a03222ed363db26d9a09cf0b13528
* Camera2: Add a burst mode skeleton.James Painter2012-09-071-0/+5
| | | | | Bug: 6243944 Change-Id: I7f496ca1051571c68fdd99a6f85bf6a908a4e29a
* Camera: Add OPAQUE pixel format to CameraParametersEino-Ville Talvala2012-07-181-0/+1
| | | | | | | | This is only used to support recording with HAL 2 in the KEY_VIDEO_FRAME_FORMAT parameter, and is not exposed to applications. Bug: 6243944 Change-Id: I5976a748d199ae98189bd03af5bbd9e18cbd6bf0
* Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/av/James Dong2012-06-132-0/+190
| | | | | Change-Id: I0a3af3e2abdedebd5934f3d941d01c32cfc75e26 related-to-bug: 6647465
* Remove new camera connect API.Wu-cheng Li2012-04-192-10/+4
| | | | | | | | Applications are not resumed under the lock screen now. This API is not needed anymore. bug:5584464 Change-Id: I115daf6b647348617ec0fc05b626878c945b9b29
* Add a new camera open API that allows taking the ownership.Wu-cheng Li2012-03-152-5/+10
| | | | | | | | | | | | | | The purpose is to let face unlock always get the camera successfully. What happened was the camera applications may have opened the camera in onResume under the lock screen. This API lets face unlock take the camera from the camera application. A new permission will be added, so other applicatoins won't be able to take the camera from the face unlock. bug:5584464 Change-Id: Ib3d9dcbc2161815b68db42327dc01148453704c6
* fix libgui header locationMathias Agopian2012-02-272-1/+4
| | | | Change-Id: Iec71706cdd4f29c6904993648ce873e83ef9cafe
* Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-082-6/+6
| | | | | | | See https://android-git.corp.google.com/g/#/c/157220 Bug: 5449033 Change-Id: Ic9c19d30693bd56755f55906127cd6bd7126096c
* Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGESteve Block2012-01-061-4/+4
| | | | | | | See https://android-git.corp.google.com/g/157065 Bug: 5449033 Change-Id: I00a4b904f9449e6f93b7fd35eac28640d7929e69
* Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGESteve Block2012-01-032-4/+4
| | | | | | | See https://android-git.corp.google.com/g/156016 Bug: 5449033 Change-Id: I4c4e33bb9df3e39e11cd985e193e6fbab4635298
* Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGESteve Block2011-10-265-76/+76
| | | | | | | See https://android-git.corp.google.com/g/#/c/143865 Bug: 5449033 Change-Id: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a
* Add video stabilization control to Camera parameters.Eino-Ville Talvala2011-10-121-0/+2
| | | | | | | | | 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
* Add video snapshot camera parameter.Wu-cheng Li2011-09-011-0/+1
| | | | | | | | The API is still hidden. bug:5187868 Change-Id: I59e1b5774ca32be049723d1a0887faa90d8884bb
* Add new camera focus mode FOCUS_MODE_CONTINUOUS_PICTURE.Wu-cheng Li2011-08-181-0/+1
| | | | | | | The API is still hidden. bug:5086125 Change-Id: I69268a95ad6aae249771d3a8dfb423ffe2d87081
* Add camera bayer image format.Wu-cheng Li2011-08-041-0/+1
| | | | | | | | The API are hidden. bug:5086073 Change-Id: Ic9a53e5d5007ad3f12a28406ee25098227f14cbc
* Pass camera frame metadata from camera service to Java.Wu-cheng Li2011-08-022-4/+18
| | | | | bug:4460717 Change-Id: I2fae6e1dfca6b8f3a5ee5716fc7817f5417bf657
* Add camera recording hint parameter.Wu-cheng Li2011-08-021-0/+1
| | | | | | | The API is still hidden. bug:4266229 Change-Id: I5e4c24e9e2808582aecb55ac4f1d5be3ed7e36a2
* Add camera face detection API.Wu-cheng Li2011-07-271-0/+2
| | | | | | | API are still hidden. bug:4460717 Change-Id: I1a515061f141a89bd61c875257712789fb15d2d4
* Remove the simulator target from all makefiles.Jeff Brown2011-07-111-4/+0
| | | | | | Bug: 5010576 Change-Id: I04d722f258951a3078fe07899f5bbe8aac02a8e8
* Add framework support for camcorder zoom.Wu-cheng Li2011-06-274-2/+242
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* CameraParameters: add PIXEL_FORMAT_RGBA8888Iliyan Malchev2011-06-061-0/+1
| | | | | Change-Id: I2780e936f5b4628d506ac4e6947b78ef831fbde8 Signed-off-by: Iliyan Malchev <malchev@google.com>
* Add auto-white balance locking to the Camera API.Eino-Ville Talvala2011-05-171-0/+2
| | | | | | | | | | | Adds a new camera parameter for locking auto-white balance to its current value. Also adds a function for checking if auto-white balance lock is supported by the current platform. Lock semantics match that of the auto-exposure lock. Hidden for now. Change-Id: Id59339a4be84d55c1b0b8473d765b6aa765999b2
* Add an auto-exposure lock feature to the Camera API.Eino-Ville Talvala2011-05-021-0/+3
| | | | | | | | | | Adds a new camera parameter for locking auto-exposure to its current value. Also adds a function for checking if auto-exposure lock is supported by the current platform. Hidden for now. Change-Id: Id452371191ab220318ce2cb98b8ee91bdde9aab6
* Add camera metering area API.Wu-cheng Li2011-04-131-0/+2
| | | | | | | The API are still hidden. bug:3475893 Change-Id: Id4147528def5e0fe067e1a3ed315fa34c14a0640
* Add camera focus area API.Wu-cheng Li2011-04-081-0/+2
| | | | | | | | The API are still hidden. bug:3475893 Change-Id: I92405c9e332b7fb141788cda7ebc9705dd666c67
* frameworks/base: some camera-interface cleanupIliyan Malchev2011-03-282-52/+0
| | | | | | | | | Methods getNumberOfVideoBuffers() and getVideoBuffer() as well as struct image_rect_struct are no longer used (instead, the necessary information is passed through ANativeWindow.) Change-Id: If4b11446fc9ccbde1f6b45bc70c0d0b8e54376eb Signed-off-by: Iliyan Malchev <malchev@google.com>
* merge libsurfaceflinger_client into libguiMathias Agopian2011-03-251-1/+0
| | | | | | | | | | | | this is the first step in unifying surfacetexture and surface. for this reason the header files were not moved, as most of them will eventually go away. NOTE: currently we keep libsurfaceflinger_client.so as an empty library to workaround prebuilt binaries wrongly linking against it. Change-Id: I130f0de2428e8579033dc41394d093f4e1431a00
* Merge "Add YV12 preview format to camera parameter constants."Wu-cheng Li2011-02-241-1/+1
|\
| * Add YV12 preview format to camera parameter constants.Wu-cheng Li2011-02-241-1/+1
| | | | | | | | | | bug:3463624 Change-Id: I8f2992dadfd3fb9e3c9d67743e52da7f3212827e
* | Application-managed callback buffer support for raw imageJames Dong2011-02-222-6/+8
|/ | | | | | bug - 3292153 Change-Id: I9789f7c5cde3a3889d7375e881181e9152d95fc2
* Add camera service support for SurfaceTexture.Jamie Gennis2011-01-063-1/+36
| | | | | | | This change enables the use of a SurfaceTexture in place of a Surface as the destination of camera preview frames. Change-Id: Ic70d404c8fe261e9d5da6f1de93d6babb5b191cb
* Camera::create should fail when it fails to connect the camera.Wu-cheng Li2011-01-051-1/+2
| | | | | | bug:3197565 Change-Id: I3439a25c06b00615e8257e6b3db85df081643643
* Add preferred preview size support in the camera frameworkJames Dong2010-11-301-0/+9
| | | | | | bug - 3237021 Change-Id: Ica8a3ae5cfbee462b74de98770e33277186c9a2b
* Fixed a race condition where some recording frames may not be released.James Dong2010-11-151-0/+3
| | | | | | | | | | When startRecording() is called before setListener(), recording frames are sent right after startRecording(), but there is no listener to release the recording frames. This causes the hang in media server. bug - 3166356 Change-Id: I19366ca682ef9f6b847590c190c30a15ed32b8e4
* Camera framework change required for 0-memcpy recordingJames Dong2010-10-192-0/+79
| | | | | | bug - 3042125 Change-Id: I46eb7a10b5394086b353fd73e4503beceeed76f1
* Video size retrieval/configuration support in camera halJames Dong2010-10-031-0/+23
| | | | | | | | | This is the first part of the camera hal change required for 0-memcpy of input video frames for video recording. o removed check in setVideoSize()/getVideoSize() for impl consistency Change-Id: I01274a62b9f9eaf32154d98f8d0bfedacf645698
* am 2ad1ebca: am d45cb72a: Rename FOCUS_MODE_CONTINUOUS to ↵Wu-cheng Li2010-09-211-1/+1
|\ | | | | | | | | | | | | | | | | FOCUS_MODE_CONTINUOUS_VIDEO. Merge commit '2ad1ebcaabb632c8fe714f0c3fd88bdfa14697bd' * commit '2ad1ebcaabb632c8fe714f0c3fd88bdfa14697bd': Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO.
| * Rename FOCUS_MODE_CONTINUOUS to FOCUS_MODE_CONTINUOUS_VIDEO.Wu-cheng Li2010-09-211-1/+1
| | | | | | | | | | | | | | | | | | | | This constant is not public yet. Continuous autofocus should behave differently in still camera and camcorder. In camcorder, lens movement may be more smooth. And the triggers to start a new focus search may be different. If there is a need, FOCUS_MODE_CONTINUOUS_PHOTO can be added in the future. Change-Id: I05df9e491aca37829be3df92a73b952f26c86a4a
* | Add YUV420P color format support for video output from camera halJames Dong2010-09-161-1/+1
| | | | | | | | Change-Id: I5c8266348d0840361c8095ce351ac85c44d4068f
* | am 6e46e6f7: am 7ec7b997: Remove camera metering mode API.Wu-cheng Li2010-08-301-7/+0
|\ \ | |/ | | | | | | | | | | Merge commit '6e46e6f7488ad1f4e6ab762d141790798fe3f2d5' * commit '6e46e6f7488ad1f4e6ab762d141790798fe3f2d5': Remove camera metering mode API.
| * Remove camera metering mode API.Wu-cheng Li2010-08-301-7/+0
| | | | | | | | | | | | Metering mode is not supported yet. Change-Id: Id6906d6ab0cd1a9dcbc5c303d8d5081b2cda699e
* | am 346b6126: am 97a56269: Merge "Add camera fps range API." into gingerbreadWu-cheng Li2010-08-241-30/+29
|\ \ | |/ | | | | | | | | | | Merge commit '346b6126d54bda4ddc705b27f49004b5cf3a2b3e' * commit '346b6126d54bda4ddc705b27f49004b5cf3a2b3e': Add camera fps range API.
| * Add camera fps range API.Wu-cheng Li2010-08-201-30/+29
| | | | | | | | | | | | | | Original preview frame rate API assumes the frame rate is fixed. It does not not work with auto frame rate camera. Change-Id: I38f7122ac8ec844ffd63558dc0763ffa17b0926a
| * Adding getSupportedPreviewSizes to CameraParameters.DO NOT MERGENipun Kwatra2010-08-191-25/+36
| | | | | | | | | | | | | | | | Moved functionality to parse string of sizes from getSupportedPictureSizes to parseSizesList. Added getSupportedPreviewSizes which returns a list of supported preview sizes. Change-Id: I41d4f62f9f1641e9e9258aa2ebaeda13ba846c02
| * Adding getSupportedPictureSizes to CameraParameters.DO NOT MERGENipun Kwatra2010-08-191-2/+31
| | | | | | | | | | | | | | | | Also added a struct 'Size' containing a width and a height field. Modified parse_size to optionally set an end pointer pointing to the character after the found size. Change-Id: I0c95ebf1ad4684721b32165f363db7d4d15a1b19
| * resolved conflicts for merge of 27eecb70 to gingerbreadJean-Baptiste Queru2010-07-301-1/+0
| |\ | | | | | | | | | Change-Id: If064f2f4950fc1a4ff38e6927fe2120af76b26f1
| | * fix inaccurate copyrightsJean-Baptiste Queru2010-07-291-1/+0
| | | | | | | | | | | | Change-Id: I33b0f68f2da34ca4728211d83159cf32a127f6dd
* | | Change the framework to use the new camera preview path.Jamie Gennis2010-08-232-21/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes the camera HAL interface take an ANativeWindow interface from which all the camera preview buffers will be allocated. The framework code running in application processes now passes a Surface object rather than an ISurface to the camera server via Binder when setting the preview surface. The camera server then forwards that Surface object (which implements the ANativeWindow interface) to the camera HAL, which uses it to communicate with SurfaceFlinger to allocate the camera preview buffers. Change-Id: Ie438f721559cd7de5e4f848a26d96360dda07b5f
* | | Adding parseSizesList, getSupportedPreviewSizes to CameraParameters.Nipun Kwatra2010-08-041-25/+36
| | | | | | | | | | | | | | | | | | | | | | | | Moved functionality to parse string of sizes from getSupportedPictureSizes to parseSizesList. Added getSupportedPreviewSizes which returns a list of supported preview sizes. Change-Id: I435317427c1ee9623caef435f93e95d4476b7285