summaryrefslogtreecommitdiffstats
path: root/camera/Android.mk
Commit message (Collapse)AuthorAgeFilesLines
* Wrap include directories and loggingDaniel Levin2012-07-251-0/+8
| | | | | | | | Use global ANDROID_API_<pastry>_OR_LATER to wrap proper include directories and logging code for JB. Change-Id: Ibfb85d7208751fec83bf71c829d0e279e9e9efac Signed-off-by: Daniel Levin <dendy@ti.com>
* CameraHAL: Portability changesDaniel Levin2012-07-251-94/+65
| | | | | | | | | | | | | | | | | | | | | | | | 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: Include ion from <ion/ion.h>Daniel Levin2012-07-251-3/+0
| | | | | | | | | libion headers should be included from <ion/ion.h>. This patch adds ion header reference to omap4xxx/include directory for Camera HAL, keeping other projects untouched. Change-Id: I7163cfab6910f89bfe321f693733d8112b380533 Signed-off-by: Daniel Levin <dendy@ti.com>
* Reconcile with p-ics-mr1-release branch.Daniel Levin2012-07-251-1/+1
| | | | | | | | Only minor cosmetic changes and line ending fixes that was present in p-ics-mr1-release branch but absent in p-ics-mr1. Change-Id: I79f860007f202a3bdbb6d173b6a3f5ac53640417 Signed-off-by: Daniel Levin <dendy@ti.com>
* Revert "[TEMP] CameraHAL:OMAP5: WA for sensor detection."Saravanan Solaiyappan2012-07-251-4/+0
| | | | | | | This reverts commit 2cd10f50ec3e470362a828b80d756e9983f7cd68. Signed-off-by: Solaiyappan Saravanan <saravanan.s@ti.com> Change-Id: I8c41a03efabf9c06e16c62007e673d9728fde3d3
* [TEMP] CameraHAL:OMAP5: WA for sensor detection.Saravanan Solaiyappan2012-07-251-0/+4
| | | | | | | | | | | This patch limits the MAX_CAMERAS_SUPPORTED to 2 to avoid querying S3D capabilities. This is done due to some issues in ducati while querying S3D capabilities. This is noticed with kernel3.4. Change-Id: I319c42992e674fcbe954d89a77346f19da3feb5d Signed-off-by: Solaiyappan Saravanan <saravanan.s@ti.com>
* Merge branch 'DEV_DB34' into cpcam/latestTyler Luu2012-07-251-39/+44
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: camera/Android.mk camera/CameraHal.cpp camera/OMXCameraAdapter/OMXCameraAdapter.cpp camera/OMXCameraAdapter/OMXCapabilities.cpp camera/OMXCameraAdapter/OMXCapture.cpp camera/TICameraParameters.cpp camera/inc/OMXCameraAdapter/OMXCameraAdapter.h camera/inc/TICameraParameters.h Change-Id: I1db68ca97a851ae9c839eb35c3f732657759533c
| * CameraHAL: Fixed indentationDaniel Levin2012-07-251-36/+36
| | | | | | | | | | | | | | | | Replaced tabs with spaces in all sources except NV12_resize. Signed-off-by: Daniel Levin <dendy@ti.com> Change-Id: I4dc2cdd2b986bb61f6f553b493b0c379828f27ab
| * CameraHal: Profile log dumpAkwasi Boateng2012-07-251-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Usage: - CameraHal should be compiled with the 'TI_CAMERAHAL_PROFILING' build variable enabled. - Following directory needs to be created on the Android filesystem: '/data/dbg/' 'adb shell mkdir /data/dbg/' - 'adb shell setprop debug.camera.profile 1' should be executed before starting camera. - After work is complete profile logs will be stored inside '/data/dbg/profile_data.bin' Change-Id: I874f58f323bd317dec578cd7ed6a5049740dd5e3 Signed-off-by: Vladislav Hristov <vhristov@mm-sol.com> Signed-off-by: Akwasi Boateng <akwasi.boateng@ti.com> Signed-off-by: Emilian Peev <epeev@mm-sol.com>
* | CameraHAL: Initial Camera Metadata changeTyler Luu2012-07-251-0/+1
| | | | | | | | | | | | | | | | | | | | Parse through extra data from omx camera and fill in CameraMetadata class. Send the metadata to BufferSource. Change-Id: I5eb9b4b59404c9e1aac9052b2301d03bffe8dc4e Signed-off-by: Vladimir Petrov <vppetrov@mm-sol.com>
* | camera: add reprocess() functionalityTyler Luu2012-07-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | implementation for reprocess state change sequence should look like this: preview->loaded_reprocess->loaded_reprocess_capture-> reprocess Reprocess uses takePicture call to send output buffers to camera adapter and to signal start reprocess. Change-Id: I98a7ccd32778760603e9c367ab3cd4ef30fab8dc Signed-off-by: Tyler Luu <tluu@ti.com>
* | camera: initial implementation for BufferSourceTyler Luu2012-07-251-0/+1
|/ | | | | | | | | | 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>
* CameraHAL: Option to switch Camera HAL implementationDaniel Levin2012-07-251-0/+2
| | | | | | | | | | | | | Added global Makefile variable TI_OMAP4_CAMERAHAL_VARIANT to select which Camera HAL implementation to build. If this option is not set, default Camera HAL will be built from hardware/ti/omap4xxx/camera. Signed-off-by: Daniel Levin <dendy@ti.com> Change-Id: I251d6c11967cd06554a90b056d0060efd177830e
* CameraHAL: V4LCameraAdapter: adding capabilitiesSaravanan Solaiyappan2012-07-251-1/+2
| | | | | | | | | | | | | [Comment] Detects the v4l video devices exists or not while camera service querying capabilities at bootup. Also adds capabilities scanning of v4l camera devices. [DR] - Signed-off-by: Solaiyappan Saravanan <saravanan.s@ti.com> Change-Id: I861ec5d99d3b85c31cad6d89aecfb27114e95894
* CameraHAL: V4LCameraAdapter co-exists with OMXCameraAdapterSaravanan Solaiyappan2012-07-251-4/+60
| | | | | | | | | | | | | | | | | | | | | [Comment] Build flag is enabled to build both V4L and OMX adapters. Individual adapters can also be choosen for build by setting the appropriate build flag OMAP4_CAMERA_HAL_USES. The camera index will be in the following order while querying the capabilities during bootup: 0 - Primary camera 1 - Secondary camera 2 - USB camera If only USBcamera is connected, the camera index will be 0. [DR] - Change-Id: Ie7165f97b860c13aaa3ad71c8cc12d34baba4cbf Signed-off-by: Solaiyappan Saravanan <saravanan.s@ti.com>
* CameraHAL: V4LCameraAdapter: Enables USB camera basic preview.Saravanan Solaiyappan2012-07-251-1/+9
| | | | | | | | | | | | | | [Comment] This pach enables the usb camera preview via V4L camera adapter in ICS. The following change needs to be done in camera/Android.mk file to build the V4L camera adapter. OMAP4_CAMERA_HAL_USES:= USB [DR] - Change-Id: I314649e0bbe52978a28296e1f9da20f176171d7d Signed-off-by: Solaiyappan Saravanan <saravanan.s@ti.com>
* CameraHAL: Updated "RAW + JPEG"Georgi Georgiev2012-07-251-0/+5
| | | | | | | | | | | | | This patch removes the check for all formats contains PIXEL_FORMAT_RAW_JPEG, for doing the RAW. The only ones dependencies are HQ mode and to create directo- ry "/data/misc/camera/RaW_PiCtUrEs". So, if we are on HQ mode and folder exists we'll get the RAW automaticly saved there.The name of RAWs is in format raw_HH_MM_SS_uSS. *Requirement: After creating raw directory a restart of CameraOMAP4 is needed. Signed-off-by: Daniel Levin <dendy@ti.com> Change-Id: I2667f5cacb4b426cd84b6e3e038d86917bfda0ee
* Camera Hal: Add DCC file data saveIvan Evlogiev2012-07-251-0/+1
| | | | | | | | | | Adds functionality for overwriting data in DCC files. This data is transferred from M3 to A9 via extra data. Currently only SMALC data is overwriten. Change-Id: I67294c367e2bd8d6fafb360c6a056850e4453b30 Signed-off-by: Dejan Ivanovski <x0162121@ti.com> Signed-off-by: Ivan Evlogiev <x0099089@ti.com>
* CameraHAL: Improved debug loggingDaniel Levin2012-07-251-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0. Renamed DEBUG_LOG macro to CAMERAHAL_DEBUG and moved it from CameraHal.h into Android.mk. To enable debug logging next variable should be put into $AFS/buildspec.mk: TI_CAMERAHAL_DEBUG_ENABLED := 1 To enable verbose debug logging next variable should be put into $AFS/buildspec.mk: TI_CAMERAHAL_VERBOSE_DEBUG_ENABLED := 1 1. CAMHAL_LOG*A and CAMHAL_LOG*B macros have been united into single CAMHAL_LOG* macro that accepts both variants. 2. Rewritten LOG_FUNCTION_NAME/LOG_FUNCTION_NAME_EXIT macros. Now they do operate on internal FunctionLogger class instance that does function enter/exit logging in constructor/destructor. If LOG_FUNCTION_NAME is used then LOG_FUNCTION_NAME_EXIT can be skipped in source code, in this case destructor will correctly print function exit entry. 3. Added optional printing message timestamps. To enable timestamp printing next variable should be put into $AFS/buildspec.mk: TI_CAMERAHAL_DEBUG_TIMESTAMPS := 1 4. Moved LOG_TAG macro definition from all CameraHAL sources to Android.mk. 5. Added printing message thread ids. 6. Added printing per thread call stack indentation to visualize call hierarchy. 7. Added CAMHAL_ASSERT(condition) and CAMHAL_ASSERT_X(condition,description) macros to assert conditions at runtime and abort process on failure. 8. Added CAMHAL_UNUSED(x) to mark unused variables which are not mistakes. 9. Added next variables to enable debug logging for MessageQueue, that should be put into $AFS/buildspec.mk: TI_UTILS_MESSAGE_QUEUE_DEBUG_ENABLED := 1 TI_UTILS_MESSAGE_QUEUE_DEBUG_FUNCTION_NAMES := 1 Signed-off-by: Daniel Levin <dendy@ti.com> Change-Id: I8ebea607199de621860ada6dfcab9164ba85674a
* OMAP4xxx: Switch DOMX include paths to new repoEmilian Peev2012-07-251-4/+4
| | | | | | | | | Signed-off-by: Emilian Peev <epeev@mm-sol.com> Signed-off-by: Daniel Levin <x0155538@ti.com> Patch Set 3: Simple cherry-pick; no changes made. Signed-off-by: Jean Johnson <a0271255@ti.com> Change-Id: I11c6b7afe767e1b98648967509ea509f881dc55d
* omap4xxx: camera: send different preview and video buffers for MMS modeAkwasi Boateng2011-10-071-1/+2
| | | | | | | | | | | | | | | | | | Fixes b/5265389 b/5156090 1. Add support to send different preview and video buffers to framework in MMS mode. 2. For resolutions less than or equal to QVGA, preview resolution will be changed to a bigger resolution matching the aspect ratio of the preview resolution. 3. During record the changed resolution will be resized to the original resolution and sent to the encoder. 4. Modified NV12 resizer routine to account for frame offset and stride to avoid double memcpy of the buffers Change-Id: If66aa1fd861078d0a63b4a77a1bdc20d4c6bccda Signed-off-by: Akwasi Boateng <akwasi.boateng@ti.com> Signed-off-by: Iliyan Malchev <malchev@google.com>
* CameraHal: Add Exif support to video snapshotTyler Luu2011-09-121-2/+4
| | | | | | | | Use jhead library to insert Exif to jpeg stream returned from libjpeg. Change-Id: Ia6398180b7ef3c1b3ddcb35e489527289565fef5 Signed-off-by: Tyler Luu <tluu@ti.com>
* omap4xxx: hasta la vista, libtimemmgrIliyan Malchev2011-09-091-2/+0
| | | | | Change-Id: Ib2e253090258299ec21f9f17e1763be8bf3cc1dc Signed-off-by: Iliyan Malchev <malchev@google.com>
* CameraHal: Initial support for video snapshotTyler Luu2011-09-021-1/+4
| | | | | | | | | | Adds support for capturing an image while recording in video mode. Sets up Ducati to return a YUV422I buffer and encode is performed in AppCallbackNotifier with Encoder_libjpeg class. Change-Id: Ia351fc99dab63a12add8c6c960b186bbe5be275a Signed-off-by: Tyler Luu <tluu@ti.com>
* CameraHAL: Adds ION support to MemoryManagerSundar Raman2011-08-301-2/+6
| | | | | | | | | | | | | MemoryManager has been updated to allocate from ION carveout instead of 1D TILER via MemMgr. Note: 2D TILER allocation is not supported as it is not needed currently. We may have to add support for it in the future. Change-Id: I3507da9a26ef4cadfda26ee21c8e12bbce515656 Signed-off-by: Sundar Raman <sunds@ti.com>
* initial commitIliyan Malchev2011-08-081-0/+131
Change-Id: I8f7a7eeece0e516efa486b77e9d97805c0e65d3e Signed-off-by: Iliyan Malchev <malchev@google.com>
generated by cgit v1.1 at 2025-02-13 13:13:35 +0000