diff options
author | Eino-Ville Talvala <etalvala@google.com> | 2015-05-14 17:26:24 -0700 |
---|---|---|
committer | Eino-Ville Talvala <etalvala@google.com> | 2015-06-08 13:21:50 -0700 |
commit | d46a6b9fd8b2a4f9098757384711e2cd03a91651 (patch) | |
tree | 6a292d7d4948ad40719925c82ee95945a6ccb99d /services/camera/libcameraservice/device2 | |
parent | b4b4cd11c9b95af613f5c0f14f93e3c9590fda7c (diff) | |
download | frameworks_av-d46a6b9fd8b2a4f9098757384711e2cd03a91651.zip frameworks_av-d46a6b9fd8b2a4f9098757384711e2cd03a91651.tar.gz frameworks_av-d46a6b9fd8b2a4f9098757384711e2cd03a91651.tar.bz2 |
Camera1 API: Support SW encoders for new camera HALs
- Support new set video format/dataspace command in camera service
- HALv3: Select gralloc usage flags based on format
- HALv1: Pass format command directly to HAL layer
- Use format/dataspace command in CameraSource
- Switch all API1 recording to use metadata mode
- Switch all >= HALv2 API1 recording to use kMetadataBufferTypeANWBuffer
Bug: 13222807
Change-Id: I2e609b92c65792611bb1dab09e0c41c363ebbc42
Diffstat (limited to 'services/camera/libcameraservice/device2')
-rw-r--r-- | services/camera/libcameraservice/device2/Camera2Device.cpp | 4 | ||||
-rw-r--r-- | services/camera/libcameraservice/device2/Camera2Device.h | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/services/camera/libcameraservice/device2/Camera2Device.cpp b/services/camera/libcameraservice/device2/Camera2Device.cpp index 7aba0ee..88f555b 100644 --- a/services/camera/libcameraservice/device2/Camera2Device.cpp +++ b/services/camera/libcameraservice/device2/Camera2Device.cpp @@ -315,7 +315,8 @@ status_t Camera2Device::createReprocessStreamFromStream(int outputId, int *id) { status_t Camera2Device::getStreamInfo(int id, - uint32_t *width, uint32_t *height, uint32_t *format) { + uint32_t *width, uint32_t *height, + uint32_t *format, android_dataspace *dataSpace) { ATRACE_CALL(); ALOGV("%s: E", __FUNCTION__); bool found = false; @@ -336,6 +337,7 @@ status_t Camera2Device::getStreamInfo(int id, if (width) *width = (*streamI)->getWidth(); if (height) *height = (*streamI)->getHeight(); if (format) *format = (*streamI)->getFormat(); + if (dataSpace) *dataSpace = HAL_DATASPACE_UNKNOWN; return OK; } diff --git a/services/camera/libcameraservice/device2/Camera2Device.h b/services/camera/libcameraservice/device2/Camera2Device.h index a9affa2..a001a91 100644 --- a/services/camera/libcameraservice/device2/Camera2Device.h +++ b/services/camera/libcameraservice/device2/Camera2Device.h @@ -63,7 +63,8 @@ class Camera2Device: public CameraDeviceBase { uint32_t width, uint32_t height, int format, int *id); virtual status_t createReprocessStreamFromStream(int outputId, int *id); virtual status_t getStreamInfo(int id, - uint32_t *width, uint32_t *height, uint32_t *format); + uint32_t *width, uint32_t *height, + uint32_t *format, android_dataspace *dataSpace); virtual status_t setStreamTransform(int id, int transform); virtual status_t deleteStream(int id); virtual status_t deleteReprocessStream(int id); |