History log of /hardware/ti/omap4xxx/camera/OMXCameraAdapter/OMX3A.cpp
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
da310a303b2b48404f31645cf660063517da3e8a 15-Dec-2011 Emilian Peev <epeev@mm-sol.com> CameraHal: Omit 'apply3Adefaults()' during initialization

- This change should improve the standby to first shot
PPM

bug:6136966

Signed-off-by: Emilian Peev <epeev@mm-sol.com>
Change-Id: I20ffd1178a64b77d45b35bac1cf04be21d2d602b
/hardware/ti/omap4xxx/camera/OMXCameraAdapter/OMX3A.cpp
a6e9160507cd4c0d276fbe45a1efb1dae28c3998 09-Mar-2012 Emilian Peev <epeev@mm-sol.com> CameraHal: Cuts down execution time of 'get-/setParameters()'

- The change utilizes two approaches:
Wrap unused parameters in 'OMAP_ENHANCEMENT' macro.
Minimize usage of CameraParameters.

bug:6136966

Change-Id: Ie4a4d2f007e6571ee9a403ed68e977d6cbf6756b
Signed-off-by: Emilian Peev <epeev@mm-sol.com>
/hardware/ti/omap4xxx/camera/OMXCameraAdapter/OMX3A.cpp
a4e4aeab47b17a82524ac56f2d69daa3e47c1ce7 06-Jan-2012 Steve Block <steveblock@google.com> Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE

See https://android-git.corp.google.com/g/157065

Bug: 5449033
Change-Id: I71aea6795e3ed22beacb9a8f5774499e96c69a4d
/hardware/ti/omap4xxx/camera/OMXCameraAdapter/OMX3A.cpp
bedd4917f415925c438e73430484302f918896f5 12-Dec-2011 Tyler Luu <tluu@ti.com> CameraHal: Add missing null check in OMX3A

Check for null before strcmp

b/5639860

Change-Id: I552213c9894679eeb64cd06419f3f430276b273e
Signed-off-by: Tyler Luu <tluu@ti.com>
/hardware/ti/omap4xxx/camera/OMXCameraAdapter/OMX3A.cpp
0bb5454945320db77ff426baf9c0c34631c373ab 18-Nov-2011 James Dong <jdong@google.com> Ignore camera.flash_off system property for user build

This system property is meant for testing only and should be
ignored for user build.

Change-Id: I553b68d62f41012766d7d208451a178a733d151e
related-to-bug: 5617451
/hardware/ti/omap4xxx/camera/OMXCameraAdapter/OMX3A.cpp
6014a8f2648911e7e0f5ba9256afa1a7a9eaf526 16-Nov-2011 James Dong <jdong@google.com> When camera.flash_off is 1, disable camera flash.
This is for testing purpose only

Change-Id: Idf0a6d5d52daeb4b5ff7576d0119868bdeff40eb
related-to-bug: 5617451
/hardware/ti/omap4xxx/camera/OMXCameraAdapter/OMX3A.cpp
2136042f80a20aeeef3ece24bab027c401426334 24-Oct-2011 Milen Mitkov <mmitkov@mm-sol.com> CameraHAL: Setting focus mode shouldnt start focus scanning

Part of the fix for b/5591797.

Use the new index OMX_TI_IndexAutofocusEnable to control
the AF algorithm when it should start scanning.

Until now, setting the focus to almost any mode
caused (unwanted) scanning.

Also, "Infinity" focus should actually have the
ability to perform scanning.

Change-Id: Iaa0f46a17d63acdd8f43b4b2b011f68fc7506165
Signed-off-by: Milen Mitkov <mmitkov@mm-sol.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
/hardware/ti/omap4xxx/camera/OMXCameraAdapter/OMX3A.cpp
fd705eb8b757a4f3d1d80b736cf20cade04524d7 21-Oct-2011 Tyler Luu <tluu@ti.com> CameraHal: Fixes for #testFocusDistance

1. Seperate OMXCameraAdapter cancelAutoFocus with unsetting focus
lock. Adding new internal parameter to unlock focus from the
cancelAutoFocus in CameraHal. We need to cancel auto focus during
stop preview in case it is still running. If we do the unlock in
OMXCameraAdapter then, focus distance can change after stopPreview.

2. If autoFocus or takePicture comes after startPreview but before
the first preview frame comes, then sometimes the focus distance
queried after the calls won't be correct since OMX camera might
still be transitioning.

3. Update focus distances when focus is running.

b/5473673

Change-Id: I5a27d78aef437a1601a68e8c08fa860f04fc0c55
Signed-off-by: Tyler Luu <tluu@ti.com>
/hardware/ti/omap4xxx/camera/OMXCameraAdapter/OMX3A.cpp
2950afb136766da122c33491f17e781794b92aaf 20-Oct-2011 Tyler Luu <tluu@ti.com> CameraHAL: Allow WB, Exp, and Flash settings to change in scene

Configure AE and AWB locks correctly in scene modes that require CAF (e.g.,
party scene). This makes CAF work correctly in such scenes.

Change-Id: Ide4e32b73d10be8113af56735f7ee7e2398d240b
Signed-off-by: Milen Mitkov <mmitkov@mm-sol.com>
Signed-off-by: Tyler Luu <tluu@ti.com>
/hardware/ti/omap4xxx/camera/OMXCameraAdapter/OMX3A.cpp
759396a116bb2caf006405777a626fe9a8708114 20-Oct-2011 Tyler Luu <tluu@ti.com> CameraHAL: WA for #testSceneMode

testSceneMode requires parameters to be updated properly before
starting preview. OMX Camera doesn't currently support this so
we are just going to keep a hard-coded LUT for the scene modes
for now.

Change-Id: I40c4492834d43c9328c87fd7aa4ea06fb1f1d90b
Signed-off-by: Tyler Luu <tluu@ti.com>
/hardware/ti/omap4xxx/camera/OMXCameraAdapter/OMX3A.cpp
2facbeb345500d62f74eac01ebb49a069fe034c1 19-Oct-2011 Raji Reddy Kandi <rajireddy.k@samsung.com> CameraHAL: protect mParameters3A from simultaneous read/write.

Fix for Issue: Idle -> remove from the latest launched apps -> Launch Camera
-> Settings -> Restore defaults -> ok -> Flash mode On ->
White balance Cloudy -> Exposure -3 -> Scene mode Party ->
Shooting -> Camcoder mode -> Settings -> Restore defaults ->
ok

==> video preview is red even after we restored the settings.

Change-Id: If4b3672693a092f1956708742a6cc5f2c2c284fb
Signed-off-by: Raji Reddy Kandi <rajireddy.k@samsung.com>
/hardware/ti/omap4xxx/camera/OMXCameraAdapter/OMX3A.cpp
533be266db006d2c4e371a87be4d15fbf92abc17 19-Oct-2011 Milen Mitkov <mmitkov@mm-sol.com> CameraHAL: Apply 3A settings offset for default values

Contrast, Sharpness and Saturation were configured
with different values because of the required offsets.

Change-Id: Ib84ef078b4d7fe671df116b56d29ea1c51dcd24c
Signed-off-by: Milen Mitkov <mmitkov@mm-sol.com>
/hardware/ti/omap4xxx/camera/OMXCameraAdapter/OMX3A.cpp
40c372a287b4f797b90da3e2a460d3818da4e5d8 13-Oct-2011 Milen Mitkov <mmitkov@mm-sol.com> CameraHAL: Focus mode may override scene settings

This is required since CAF and Touch focus
are needed even in scenes different from manual.

Change-Id: I8f3ecfd7474e988757a0a4c85b37459e2d1a671b
Signed-off-by: Milen Mitkov <mmitkov@mm-sol.com>
/hardware/ti/omap4xxx/camera/OMXCameraAdapter/OMX3A.cpp
61db8718454958a21d5b31282027db01a5c0de63 12-Oct-2011 Milen Mitkov <mmitkov@mm-sol.com> CameraHAL: Set face prio when starting face detection

We don't need to set the exposure mode when starting
face detection, just enable face priority.

Previously, this caused the exposure mode for
a given scene to be overwritten.

Change-Id: I4bad4c9846b7d225f8f1bf346fdc3dac1b16ca1b
Signed-off-by: Milen Mitkov <mmitkov@mm-sol.com>
/hardware/ti/omap4xxx/camera/OMXCameraAdapter/OMX3A.cpp
3993b8c13a033e52e762325a880e72abe9145905 30-Aug-2011 Sundar Raman <sunds@ti.com> CameraHAL: Re-enable Face prioritized AE in startFaceDetection

Change-Id: Id3639656e4856019221a35d2fc308626e45cb405
Signed-off-by: Sundar Raman <sunds@ti.com>
/hardware/ti/omap4xxx/camera/OMXCameraAdapter/OMX3A.cpp
517107e1d948fe9268ed51b3baff64891d9b0c20 13-Oct-2011 Tyler Luu <tluu@ti.com> CameraHal: Allow EV compensation w/ preset scene

CameraHal was previously ignoring EV compensation when a scene mode
was set.

Change-Id: I15023a5c6019ca333a4ce40f178a8e4ef53be387
Signed-off-by: Tyler Luu <tluu@ti.com>
/hardware/ti/omap4xxx/camera/OMXCameraAdapter/OMX3A.cpp
e552120201f0e53a6e5c9f816e91739dc4ec1e0b 11-Oct-2011 Tyler Luu <tluu@ti.com> CameraHal: Enable 3A feedback for scene modes

When a scene mode is set by the application, some 3A parameters
will be updated by Ducati. Feed these parameters back to the
application.

Change-Id: I07afec0315d2807470037388572d0bc7ee8c3ad8
Signed-off-by: Tyler Luu <tluu@ti.com>
/hardware/ti/omap4xxx/camera/OMXCameraAdapter/OMX3A.cpp
4c0157e43ed1fad64fd0075549bbbe30f03ee608 06-Oct-2011 Akwasi Boateng <akwasi.boateng@ti.com> omap4xxx: camera: apply 3A settings after auto scene mode change

Apply pending 3A settings when user switches from any scene mode to auto scene
mode.

Change-Id: I8f53cbede51c175b88321c59418792dae801216d
Signed-off-by: Akwasi Boateng <akwasi.boateng@ti.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
/hardware/ti/omap4xxx/camera/OMXCameraAdapter/OMX3A.cpp
5458bdc45048501d1919b14d22456de91f7e8950 06-Oct-2011 Tyler Luu <tluu@ti.com> omap4xxx: camera: only set CameraAreas if changed

Partial fix for b/5371242

Add logic to compare areas for metering and focus before calling
SetConfig for the respective indices so we only set the areas if
the areas have changed

Change-Id: Id6b55e3d8e78557f45b92a5afefdb8298450da61
Signed-off-by: Tyler Luu <tluu@ti.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
/hardware/ti/omap4xxx/camera/OMXCameraAdapter/OMX3A.cpp
f2ac1cc4c58440d94972f0015f50bcbb13838611 03-Sep-2011 Atanas Stefov <astefov@mm-sol.com> omap4xxx: camera: update Focus areas in setParameters, not in setFocusMode

Fixes b/5429270

When you touch to focus, the camera app calls setParameters to pass the focus
areas to the Ducati, followed by a call to autoFocus to start AF. Because the
focus areas were not getting updated instantly in the camera HAL before AF
began, on the one hand, and because the Ducati locks the focus regions after AF
begins, the AF region settings were being ignored.

This patch allows focus areas to be set immediately. Region priority is set in
doAutoFocus() when non-zero area is set in FOCUS_REGION.

Change-Id: I90c86f9de0d090f24b8595b325dbf06f1f718630
Signed-off-by: Iliyan Malchev <malchev@google.com>
/hardware/ti/omap4xxx/camera/OMXCameraAdapter/OMX3A.cpp
d9c52eb4fa1e27ffd33f22d9987f60a8a714b7bf 22-Sep-2011 Tyler Luu <tluu@ti.com> CameraHal: Add metering area mutex

mMeteringAreas needs to be protected by a mutex so
it's not cleared or modified while setting it
Ducati.

Change-Id: I0ca8f5e3b57b88b518a8e1ab22c442c21131e39c
Signed-off-by: Tyler Luu <tluu@ti.com>
/hardware/ti/omap4xxx/camera/OMXCameraAdapter/OMX3A.cpp
2f15c6a9f1d24904705ddab6a6c005126e8846dd 21-Sep-2011 Sundar Raman <sunds@ti.com> CameraHAL: CTS fixes related to #testMeteringAreas

- The status of "parseAreas()" should always be checked
in order to return proper error code in case of invalid
input arguments.
- If the input metering areas are more than the supported
ones, then always return an error.
- 'parseAreas()' expects the buffer size, not the string
length.
- Refactors "parseFocusAreas()' to the more general
'parseAreas()'.

Change-Id: I4c70bcaa3c676f525b721916cc39c66db5e0fc17

Signed-off-by: Emilian Peev <epeev@mm-sol.com>

Signed-off-by: Sundar Raman <sunds@ti.com>
/hardware/ti/omap4xxx/camera/OMXCameraAdapter/OMX3A.cpp
9dc08c5fb736308cfca6659f66b14165b265baeb 19-Sep-2011 Tyler Luu <tluu@ti.com> CameraHal: Lock focus after AF completion

1) Add API to use OMX_IndexConfigImageFocusLock to lock autofocus
2) Remove FIXME to always return true status when CAF is set

Change-Id: Ie195206243bc1f750954def5f4f9f4466295bc7c

b/5338488
/hardware/ti/omap4xxx/camera/OMXCameraAdapter/OMX3A.cpp
8a2076796e301670c8d14da7c089fb00fd59f2e0 16-Sep-2011 Tyler Luu <tluu@ti.com> CameraHal: Return error and exit upon failure in set3ALock

Fixes b/5316293

Change-Id: Ib48ce6d9ceee3e1eed2e4af958d36682da9b6a5c
Signed-off-by: Tyler Luu <tluu@ti.com>
/hardware/ti/omap4xxx/camera/OMXCameraAdapter/OMX3A.cpp
021992a8a7b312d520237a7ea4011d29aed3961e 14-Sep-2011 Vladislav Hristov <vhristov@mm-sol.com> CameraHal: Set AF Assist depending on flash mode

Enable setting AF Assist enable/disable based on the flash mode.
When Flash is "on" or "auto" enable AF Assist.
When Flash is "off" disable AF Assist.

Change-Id: I963694c5e46ccbe0e1dea5acfd5eca4ea89c163e
Signed-off-by: Vladislav Hristov <vhristov@mm-sol.com>
/hardware/ti/omap4xxx/camera/OMXCameraAdapter/OMX3A.cpp
5e02dd977e79ee977ee063496033bbc363a70780 14-Sep-2011 Akwasi Boateng <akwasi.boateng@ti.com> Update frame ref counting

1. Make only one sendframe call from OMXCameraAdapter
2. Add frame type mask to frame structure
3. Frame type mask used to indicate type of frame
e.g video, preview, image or preview and video
4. Set frame ref count before sending frames to
subscribers.
5. Hold frame subscriber lock for setting the
refcount and sending the frames to the
subscribers to allow for the number of
subscribers not to change until frames
are sent.

Change-Id: Ic00a195847f2dc962e931ee8a9f36e3933e67c2d
Signed-off-by: Akwasi Boateng <akwasi.boateng@ti.com>
/hardware/ti/omap4xxx/camera/OMXCameraAdapter/OMX3A.cpp
36e9bdd56757ff8048e08f6e52f234480c44f122 08-Sep-2011 Tyler Luu <tluu@ti.com> CameraHal: Add Exif support to video snapshot

Use jhead library to insert Exif to jpeg stream
returned from libjpeg.

Change-Id: Ia6398180b7ef3c1b3ddcb35e489527289565fef5
Signed-off-by: Tyler Luu <tluu@ti.com>
/hardware/ti/omap4xxx/camera/OMXCameraAdapter/OMX3A.cpp
ba027fc89ec3950e1ac2f95fcc3f1002442ddabb 12-Sep-2011 Sundar Raman <sunds@ti.com> CameraHAL CTS: Fix for #testAutoExposureLock, #testAutoWhiteBalanceLock

Locks were not retained if the user forces the lock to true
before calling autoFocus. This patch addresses this scenario.

Change-Id: I2b5161806f8123b3042d46bc856773f0d4701458
Signed-off-by: Sundar Raman <sunds@ti.com>
/hardware/ti/omap4xxx/camera/OMXCameraAdapter/OMX3A.cpp
708ed7306c85286aa50d05ba15e0c33106e52ed0 08-Sep-2011 Iliyan Malchev <malchev@google.com> Revert "Revert "CameraHAL : Multiple focus and exposure areas support""

This reverts commit 72bac2af47f73167bd288bc7278e5496ccabe6f4.
/hardware/ti/omap4xxx/camera/OMXCameraAdapter/OMX3A.cpp
72bac2af47f73167bd288bc7278e5496ccabe6f4 07-Sep-2011 Iliyan Malchev <malchev@google.com> Revert "CameraHAL : Multiple focus and exposure areas support"

This reverts commit bd9754a1b2c8d5e0a8788d0e42d018857bfef7a7.

Conflicts:

camera/inc/OMXCameraAdapter/OMXCameraAdapter.h

Change-Id: Iad51c457b05de9b5492061b8402e508a6c5b42bf
/hardware/ti/omap4xxx/camera/OMXCameraAdapter/OMX3A.cpp
183fa757c75d9270b1ee2f25da195499ae6d6946 01-Sep-2011 Akwasi Boateng <akwasi.boateng@ti.com> Don't set AF modes when AF is active

Prevents multiply calls to focus Setconfig()

Change-Id: I3b3df7ffbef11690d3cde4cdaa6fa59e59146388
Signed-off-by: Akwasi Boateng <akwasi.boateng@ti.com>
/hardware/ti/omap4xxx/camera/OMXCameraAdapter/OMX3A.cpp
626cc15ef5e2a1c8c2df8982f4cb9859d6f91eec 01-Sep-2011 Akwasi Boateng <akwasi.boateng@ti.com> CameraHAL: Removes deprecated AF code

- Previously if CAF was running and the camera
client changed the focus mode to something else,
then OMXCameraAdapter would immediately stop CAF
as well. This behavior is not required any more
and leads to some incorrect AF configuration
calls.

Change-Id: I72b0b8f64eeeb0d6e41994329ade9f462a0743ac
Signed-off-by: Emilian Peev <epeev@mm-sol.com>
Signed-off-by: Akwasi Boateng <akwasi.boateng@ti.com>
/hardware/ti/omap4xxx/camera/OMXCameraAdapter/OMX3A.cpp
bd9754a1b2c8d5e0a8788d0e42d018857bfef7a7 26-Aug-2011 Milen Mitkov <mmitkov@mm-sol.com> CameraHAL : Multiple focus and exposure areas support

Adds support for multiple focus and exposure areas and
also correctly returning the number of maximum supported
focus and exposure areas.

- Patch set 4: converting the coordinates,
which are sent to 3A in the range 0 - 255. Both Focus
and Exposure algorithms use this range

- Patch set 5: Handling special area (0, 0, 0, 0, 0),
rebasing and also memory allocation alignment to 4K chunks.

- Patch set 6: Freeing the alloc'd buffer in case of error.

Change-Id: I45bdd4309b75ac4d50deb05e97120362cdb1937b
Signed-off-by: Milen Mitkov <mmitkov@mm-sol.com>
/hardware/ti/omap4xxx/camera/OMXCameraAdapter/OMX3A.cpp
024e97a1213041f9d266ee09f7148a0c9b007260 31-Aug-2011 Tyler Luu <tluu@ti.com> CameraHAL: Fixes some uninitialized variables in OMXCameraAdapter

Change-Id: I3603c8ea55cf8ffc1479ec2cc0df437bd2838ad1
Original-author: Emilian Peev <epeev@mm-sol.com>
Signed-off-by: Emilian Peev <epeev@mm-sol.com>
Signed-off-by: Tyler Luu <tluu@ti.com>
/hardware/ti/omap4xxx/camera/OMXCameraAdapter/OMX3A.cpp
d55379a7e975f992db1d10bba425f456447d14a8 30-Aug-2011 Tyler Luu <tluu@ti.com> CameraHAL: Adds locking when accessing 'mFocusAreas'

- This is due to the access pattern of 'mFocusAreas.
Currently both 'setFocusMode()' and
'setParametersFocus()' can in parallel try to
write/read from this Vector. A race condition is
possible, in which the former method can clear a
focus area, while the latter method is trying to
increment its strong pointer. This will inevitably
result in a segfault.

Change-Id: I0e94d18326b85c20f73296d31d980b9c39685c32
Original-author: Emilian Peev <epeev@mm-sol.com>
Signed-off-by: Emilian Peev <epeev@mm-sol.com>
Signed-off-by: Tyler Luu <tluu@ti.com>
/hardware/ti/omap4xxx/camera/OMXCameraAdapter/OMX3A.cpp
8cb48e582f4f3c93aa25159c1116a7c83bfa388a 25-Aug-2011 Sundar Raman <sunds@ti.com> Camera HAL: Fixes for Face prioritized 3A, cancelAF

1. Face prioritized 3A is enabled for AF, AE (for AE it is disabled)
2. White balance modes, exposure are allowed to be changed when face detection is ON
3. Focus metering area is ignored when face detection is ON
4. CancelAF is fixed to not retain the focus mode for CAF and infinity modes

Change-Id: I43650069d4de95815381974072f5b9afabf4fc46
Signed-off-by: Sundar Raman <sunds@ti.com>
/hardware/ti/omap4xxx/camera/OMXCameraAdapter/OMX3A.cpp
00479a8f1d791824870513b8b0b9edd67d2560ff 25-Aug-2011 Sundar Raman <sunds@ti.com> CameraHAL: OMX algo priority re-design

- Allows stacking of different algorithm priorities.
- Resolves an issue with AF not functioning after
one iteration.
- Contains a couple of fixes related to WB and
Exposure priority modes.

Signed-off-by: Emilian Peev <epeev@mm-sol.com>

Change-Id: I9c2848e776c727cd9cc3691221621f895dc5507b
Signed-off-by: Sundar Raman <sunds@ti.com>
/hardware/ti/omap4xxx/camera/OMXCameraAdapter/OMX3A.cpp
c0fc811b503ef0c0ccd024f77f9ac7d6972f77c8 25-Aug-2011 Sundar Raman <sunds@ti.com> CameraHal: Enable face priority 3A

Enable face priority 3A when starting face detection
and reset to 3A parameters from CameraParameters when
stopping face detection. Ignore 3A parameters set by
application if face detection is started.

Signed-off-by: Tyler Luu <tluu@ti.com>

Change-Id: I54ded2b3612f3191f6f4c3a6151ea6013b1d06a0
Signed-off-by: Sundar Raman <sunds@ti.com>
/hardware/ti/omap4xxx/camera/OMXCameraAdapter/OMX3A.cpp
80c50ac56bfa97be0cf04332ec1d314637c8770f 09-Aug-2011 Sundar Raman <sunds@ti.com> Lock AE and AWB after AF

Change-Id: I12f1037be3d890b50c5413925d3084a2cf5256aa
Signed-off-by: Sundar Raman <sunds@ti.com>
/hardware/ti/omap4xxx/camera/OMXCameraAdapter/OMX3A.cpp
c322989ae6ff6769490828de1b5eda12b749cce9 08-Aug-2011 Iliyan Malchev <malchev@google.com> initial commit

Change-Id: I8f7a7eeece0e516efa486b77e9d97805c0e65d3e
Signed-off-by: Iliyan Malchev <malchev@google.com>
/hardware/ti/omap4xxx/camera/OMXCameraAdapter/OMX3A.cpp