summaryrefslogtreecommitdiffstats
path: root/camera/inc/ANativeWindowDisplayAdapter.h
Commit message (Collapse)AuthorAgeFilesLines
* CameraHAL: Make graphic buffer locking conditionalAndriy Chepurnyy2012-11-261-0/+7
| | | | | | | | | | This mechanism is added to support components where locking mechanism is handled on DOMX layer. As example is using ducati decoder with buffers allocated via ANativeWindowDisplayAdapter. Change-Id: I33ae0f0766473a6d8e85699c31dcad9345b4df70 Signed-off-by: Andriy Chepurnyy <x0155536@ti.com>
* CameraHAL: Moved Camera HAL sources out of namespace androidDaniel Levin2012-07-251-12/+13
| | | | | | | | | | | | | | | | | | | | | | | | C++ namespace android:: is reserved for base Google Android types to avoid current and further conflicts with 3rd party code. Having TI Camera HAL under namespace android:: violates this rule, adding potential conflicts. This patch moves libtiutils and Camera HAL code out of namespace android:: to custom local namespaces. Putting camera code under namespace android and 'using namespace android' is not allowed anymore. All C++ Android types should have android:: namespace prefix explicitly. Next namespaces added: - Ti:: - placeholder for all custom code - Ti::Utils:: - common utility helper library - Ti::Camera:: - Camera HAL code Also added Ti::status_t as typedef for android::status_t. Change-Id: Ie8cc00d6d6bd4e8a8ddf089421010c370ee40ebe Signed-off-by: Daniel Levin <dendy@ti.com>
* CameraHAL: Portability changesDaniel Levin2012-07-251-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | 1. Moved common definitions to Global.h header: - CAMHAL_LOG* macros (also added CAMHAL_LOGI and CAMHAL_LOGW) - CAMHAL_ASSERT* macros - CAMHAL_UNUSED macro 2. Renamed NV12_resize.c to NV12_resize.cpp 3. Added common math functions into UtilsGlobal.h header: - min(a, b) - returns min of a and b - max(a, b) - returns max of a and b - bound(min, a, max) - return nearest value to a in scope [min..max] - floor(a) - round a to lower integer - round(a) - round a to nearest integer 4. Portability: - Fixed LOG* macros to use appropriate CAMHAL_LOG* wrappers. - Reworked the Android.mk to include proper directories depending on current pastry. Change-Id: I6fbd1ee02d8af2195b91cc357ddcf554fe77f495 Signed-off-by: Daniel Levin <dendy@ti.com>
* CameraHal: Handles preview and snapshot buffers separatelyEmilian Peev2012-07-251-0/+1
| | | | | | | | | | - Hal should differentiate between preview and snapshot frames. The camera client can expect postview callbacks even if the preview frame notifications are internally disabled during image capture. Change-Id: I5ab7ecf51860989bf983e4dc116f6816ee57e8f7 Signed-off-by: Emilian Peev <epeev@mm-sol.com>
* Merge branch 'cpcam/DEV_DB43' into cpcam/latestTyler Luu2012-07-251-2/+2
|\ | | | | | | | | | | | | | | | | Conflicts: camera/ANativeWindowDisplayAdapter.cpp camera/inc/ANativeWindowDisplayAdapter.h camera/inc/CameraHal.h Change-Id: I772e1a1ea4cf716c815b878029532fe4b86cff88
| * CameraHal: Fixes SurfaceTexture error status checksEmilian Peev2012-07-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes done inside ANativeWindowDisplayAdapter: - All Posix-style error codes are replaced with their Android counterparts. - Some of the associated error messages are corrected. - Minor refactoring of 'maxQueueableBuffers()' prototype. - Fixes nonnegative return values. - Fixes for constants used during comparisons. - Minor code indentation fixes. Change-Id: Ia4c7986471643ea84e61bc0ad737b435cbe7b2f1 Signed-off-by: Emilian Peev <epeev@mm-sol.com>
* | camera: initial implementation for BufferSourceTyler Luu2012-07-251-4/+2
| | | | | | | | | | | | | | | | | | | | Initial implementation to accept and use a BufferSource (SurfaceTexture) object for buffer management and datacallbacks. Change-Id: I0c1b8854f162eb3ea00c568a56c485d67f41ebca Signed-off-by: Tyler Luu <tluu@ti.com> Signed-off-by: Vladimir Petrov <vppetrov@mm-sol.com>
* | hwc: Add HAL_PIXEL_FORMAT_TI_NV12_1DDavid Schleef2012-07-251-0/+1
| | | | | | | | | | Change-Id: I7a8a18038e93c67e7d2f4090195a8ac68c435298 Signed-off-by: Daniel Levin <dendy.ua@gmail.com>
* | CameraHal: Add CameraBuffer (major refactoring)Tyler Luu2012-07-251-8/+8
|/ | | | | | | | | | | | | | | | | | | | | | Add a CameraBuffer type, which contains information corresponding to an internal CameraHal buffer - how it was allocated, relevant handles, and any internal data to be associated with the buffer, such as metadata, OMX indexes, current state. The simplest possible refactoring was done to convert the void * used for exchanging buffer information into the 'opaque' field in the CameraBuffer structure. A few hacks were added to minimize the size of the refactoring, these will be cleaned up in upcoming commits. Adding a private structure for buffers eliminates the need for a lot of KeyedVectors that are currently in use. Most of these were left in place, and will be refactored into the CameraBuffer structure later. The pAppPrivate field of OMX_BUFFERHEADERTYPE was used to eliminate another KeyedVector. Change-Id: I147ad971e4cdc03b2c445b5fba81d0ba83bc5fb3 Signed-off-by: David Schleef <ds@ti.com> Signed-off-by: Vladimir Petrov <vppetrov@mm-sol.com> Signed-off-by: Tyler Luu <tluu@ti.com>
* CameraHAL: Old S3D display handling removedPavel Nedev2012-07-251-1/+1
| | | | | | | Commented old (prior ICS) display S3D content handling removed from CameraHAL display adapter. Change-Id: I16eb817679034d194fccfd22a31784b37de93501 Signed-off-by: Pavel Nedev <pnedev@mm-sol.com>
* CameraHAL: Fixed line endingsDaniel Levin2012-07-251-189/+189
| | | | | | | | | | | | | Replaced line endings to UNIX in CameraHAL related sources. Also removed executable flag from random sources. No code changes. Signed-off-by: Daniel Levin <x0155538@ti.com> Signed-off-by: Jean Johnson <a0271255@ti.com> Change-Id: Id32c429fe7527342cfa2a7b9b1724e5f088dbd3f
* CameraHAL: Improved error handling inside the adaptersSundar Raman2011-09-271-0/+1
| | | | | | | | | | | | | 1. unlock and cancel buffers to ANativeWindow when freeBuffers is called 2. Free the omx handle and deinitialize DOMX when errors occur while calling critical OMXCamera apis 3. Retry OMX_GetHandle if it fails to take care of error recovery scenarios. "Fixes b/5379663" Change-Id: I4729fab40e6104dfa6660ba6f6b1a90f805c2f59 Signed-off-by: Sundar Raman <sunds@ti.com>
* Camera HAL: Do not call cancelBuffer when destroying the display adapterSundar Raman2011-08-261-1/+1
| | | | | | | | | | | | When a NULL window is passed in setPreviewDisplay, we try to do cancelBuffer to return the buffers to the ANativeWindow if there is a valid reference to DisplayAdapter. However, the CameraService already sets the ANativeWindow reference to NULL before calling setPreviewWindow method of the Camera HAL so the cancel_buffer crashes. So, we do not call cancel_buffer as the preview window is destroyed anyway by Camera Service. Change-Id: Ie07f5fd3ca5bb5a31cb25a174ee1acc2988628af Signed-off-by: Sundar Raman <sunds@ti.com>
* omap4xxx: camera: lock gralloc buffers read-rarely/write-neverIliyan Malchev2011-08-231-1/+1
| | | | | Change-Id: Iacf80f7485e78d20000df27bca9e57caafcea111 Signed-off-by: Iliyan Malchev <malchev@google.com>
* initial commitIliyan Malchev2011-08-081-0/+188
Change-Id: I8f7a7eeece0e516efa486b77e9d97805c0e65d3e Signed-off-by: Iliyan Malchev <malchev@google.com>