History log of /hardware/ti/omap4xxx/camera/BaseCameraAdapter.cpp
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
2bfd180d5257d72f7c22c80741e6b03470f3aa60 23-Apr-2013 Alex Ray <aray@google.com> camera: Handle capture request in AF run

Bug: 8140969
Change-Id: I1e1889434d57714cdb0c10929609eade299c1ea9
/hardware/ti/omap4xxx/camera/BaseCameraAdapter.cpp
b6a9d10508e321ebc53193a117bf6c65d98ae888 10-Oct-2012 Emilian Peev <epeev@mm-sol.com> CameraHal: Avoid race condition during recording stop

- A race condition is possible when recording is stopped.
'BaseCameraAdapter::stopVideoCapture()' is clearing
'mVideoBuffersAvailable'. A delayed video frame from
'AppCallbackNotifier' can return afterwards though and
then try to query the already empty 'KeyedVector'. This
will result in a segfault. Solution is to move the vector
reset away from 'stopVideoCapture()' and in to
'startVideoCapture()' where it is needed.

Bug: 7021214

Change-Id: Ic234189b49e35c990b3af70bd713a12cb762362c
Signed-off-by: Emilian Peev <epeev@mm-sol.com>
/hardware/ti/omap4xxx/camera/BaseCameraAdapter.cpp
fe3dccf76b03fe7e226ecc7c128dbc9e53d835a9 17-Nov-2011 Tyler Luu <tluu@ti.com> camera: fix deadlock because of mStateSwitchLock

When OMXCameraAdapter::UseBuffersPreview() is failing
mStateSwitchLock must be unlocked.

b/6046798

Change-Id: Ie9ecccc2e23b0a31b2972beb0411faca279d5d0c
Signed-off-by: Daniel Levin <dendy@ti.com>
Signed-off-by: Tyler Luu <tluu@ti.com>
/hardware/ti/omap4xxx/camera/BaseCameraAdapter.cpp
609bc02b21c725825bd469391e9ecd4e2d462fe1 15-Mar-2012 Tyler Luu <tluu@ti.com> camera: prevent possible deadlock scenario

Hold scope of returnFrame lock for just the calculation
of refCount. Otherwise, we could have a scenario where
endImageCapture and stopRecording could cause a deadlock
competing for mReturnFrameLock and mLock. Issue arises
mainly because endImageCapture is signalled from
fillThisBuffer which stopRecording will need to get into.

Make sure mEventQ has a message before calling get() since
read on the pipe will block with notifyEvent holding mLock.

Change-Id: I3a125711632fa311fd794e300cd5008321a84c40
Signed-off-by: Tyler Luu <tluu@ti.com>
/hardware/ti/omap4xxx/camera/BaseCameraAdapter.cpp
41a31123a0fc59b8112460285d3f1ba73c5537c0 08-Feb-2012 Emilian Peev <epeev@mm-sol.com> CameraHal: Reduces Camera logcat prints

Change-Id: Id32ad1b882a76f091866583b15ae0ca2929bacef
Signed-off-by: Emilian Peev <epeev@mm-sol.com>
/hardware/ti/omap4xxx/camera/BaseCameraAdapter.cpp
057f4fd59ec05ded909e9eb9a3363d9ea345b0ca 31-Jan-2012 Tyler Luu <tluu@ti.com> CameraHal: Implementation for CAF status callbacks

1. Remove internal handling of CAMERA_MSG_FOCUS. Before we were
enabling CAMERA_MSG_FOCUS only when application calls autoFocus().
No longer needed since the CAMERA_MSG_FOCUS can come just during
preview now.

2. Add handling of unregistered focus callbacks. Since OMXCamera
will send callbacks even when we are not waiting for one, add some
handling.

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

Conflicts:

camera/OMXCameraAdapter/OMXFocus.cpp
/hardware/ti/omap4xxx/camera/BaseCameraAdapter.cpp
46de639b23db99d7b99ff1c676ac98b84b6336c6 08-Jan-2012 Steve Block <steveblock@google.com> Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

See https://android-git.corp.google.com/g/#/c/157220

Bug: 5449033
Change-Id: I7d131473964d92c62a495d082a1207867f435885
/hardware/ti/omap4xxx/camera/BaseCameraAdapter.cpp
e46394481e771dbdc8683645c3740a3d262a3d0f 17-Nov-2011 Iliyan Malchev <malchev@google.com> CameraHAL: clean up logs

-- introduce CAMHAL_LOGI so that we don't have to dump informational messages
as LOGE
-- convert some verbose messages to CAMHAL_LOGDB
-- convert most frequent non-error log messages to CAMHAL_LOGI

Change-Id: I8afc24aa17da2c157b7b37300a79b4cde81f87e5
Signed-off-by: Iliyan Malchev <malchev@google.com>
/hardware/ti/omap4xxx/camera/BaseCameraAdapter.cpp
a58c483de2c8188e41fd9635042c31820d13b845 26-Oct-2011 Tyler Luu <tluu@ti.com> CameraHal: Add function to rollback state machine

Fix 1/3 for b/5472396.

Adding a function to rollback the state machine to INTITIALIZED_STATE
from any given current state. With this function, we can better
manage the different states that CameraAdapter could be in when
stopPreview is called.

Change-Id: I0a456738e8575873b5ac6fb2a31395dab54ef6f7
Signed-off-by: Tyler Luu <tluu@ti.com>
/hardware/ti/omap4xxx/camera/BaseCameraAdapter.cpp
4f29332694e8222b3f1fae39d40edcdec1dec1bd 14-Oct-2011 Tyler Luu <tluu@ti.com> CameraHAL: Recorded video has jerks with video snapshot

Avoid video frame drops during video snapshot. We were previously not
sending the video frame to AppCallbackNotifier because the first
frame after video snapshot was considered a snapshot (postview) frame.
This patch sets the video frame mask regardless of preview or snapshot
frame during recording

b/5449158

Change-Id: Idaecbaa53686b81428a3d63ea95481f5b6eff23d
Signed-off-by: Raji Reddy Kandi <rajireddy.k@samsung.com>
Signed-off-by: Tyler Luu <tluu@ti.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
/hardware/ti/omap4xxx/camera/BaseCameraAdapter.cpp
c11c07d676f130e6e28ab1611f4862a01a160389 13-Oct-2011 Tyler Luu <tluu@ti.com> CameraHal: Fixes for #testVideoSnapshot

1. Add raw notify callback for video snapshot
2. Add new state for video capture + AF
3. We were not populating focal length correctly for jhead. Need to send
focal length as a rational in this format "xx/yy"
4. Need to send GPSProcessingMethod as an UNDEFINED ASCII to jhead

b/5448171

Change-Id: Ie6be9ad821d1fa106d9c857681f2fa6427d4f283
Signed-off-by: Tyler Luu <tluu@ti.com>
/hardware/ti/omap4xxx/camera/BaseCameraAdapter.cpp
88006b1ebee79cb0f1a2c682258b313eb801049d 30-Sep-2011 Sundar Raman <sunds@ti.com> omap4xxx: camera: various fixes

clean up resources properly on exit:

- Frees all resources in case of error during
preview buffer allocation in ANativeDisplayAdadapter.
- Fixes a couple of typos in BaseCameraAdapter.
- Removes a possible memory leak during temporal
bracketing. 'stopBracketing()' will never get
properly executed when 'startImageCapture()'
disables 'mBracketingEnabled'.
- Stops temporal bracketing properly inside
'signalEndImageCapture()'.

Change-Id: Ic122058c835e30f12f335a288164475b8f6d1c6d
Signed-off-by: Emilian Peev <epeev@mm-sol.com>
Signed-off-by: Sundar Raman <sunds@ti.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
/hardware/ti/omap4xxx/camera/BaseCameraAdapter.cpp
8a01f97380aad5b6a30a2d248aa07af4d92373d0 26-Sep-2011 Tyler Luu <tluu@ti.com> omap4xxx: camera: re-enable postview callback

Fixes b/5370657... again

Change-Id: I998d2292d25b76b67b1fbd2ff6bd65e854c176c8
Signed-off-by: Tyler Luu <tluu@ti.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
/hardware/ti/omap4xxx/camera/BaseCameraAdapter.cpp
7016577b173fc73f5b43e76cbc122bb0a9346613 30-Sep-2011 Akwasi Boateng <akwasi.boateng@ti.com> omap4xxx: camera: switch to executing state when surface is null

Partial fix for b/5422679

To enhance standby to first shot performance

Change-Id: Ib32e8120a7908419c76e8cf2f1830f0667b258c0
Signed-off-by: Akwasi Boateng <akwasi.boateng@ti.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
/hardware/ti/omap4xxx/camera/BaseCameraAdapter.cpp
2010763a13490313d773d8bbabec46414649b3ab 21-Sep-2011 Sundar Raman <sunds@ti.com> CameraHAL: Allow cancelAutoFocus during zoom

When user does tap to metering followed by zoom, the
app calls cancelAF. So we need to allow this in the
state machine.

Change-Id: I0fd0faaa136768e8bae8504cf58b5e9f247f3dc1
Signed-off-by: Sundar Raman <sunds@ti.com>
/hardware/ti/omap4xxx/camera/BaseCameraAdapter.cpp
8e88af31129b8cc09675279ca2eac88256d8526b 16-Sep-2011 Akwasi Boateng <akwasi.boateng@ti.com> Grallock lock and unlock fixes

1. Get and store Y and UV pointers from
all gralloc handles to be used for
preview callback and video frames.
2. Ensure gralloc lock is successfull
before frame return to OMXCameraAdapter

Change-Id: Ibeea6d00f2c1a1c45bcd2eafb22b90a795516e5c
Signed-off-by: Akwasi Boateng <akwasi.boateng@ti.com>
/hardware/ti/omap4xxx/camera/BaseCameraAdapter.cpp
7b4990d47f1765a2264cdf925730e486791c2d1c 19-Sep-2011 Tyler Luu <tluu@ti.com> CameraHal: Debug prints from "CameraHal: Error handling before sending frames"

Fix debug macro mismatch and some levels from "CameraHal:
Error handling before sending frames"

Change-Id: Ib8b4a7b09b32246aa9d972b91a72f53a139e5773
Signed-off-by: Tyler Luu <tluu@ti.com>
/hardware/ti/omap4xxx/camera/BaseCameraAdapter.cpp
c493114006e0e136c8c88c2fc9865994054959bf 16-Sep-2011 Sundar Raman <sunds@ti.com> CameraHAL: Adds some useful debug logs on frame counts

Change-Id: Ifb1434f9fd1c85f040d67f3df6fb7c4a86e135db
Signed-off-by: Sundar Raman <sunds@ti.com>
/hardware/ti/omap4xxx/camera/BaseCameraAdapter.cpp
524cc0cda6ed8cb07e0469fc931657ac60335aa1 15-Sep-2011 Sundar Raman <sunds@ti.com> CameraHAL: Fixes for FPS range configuration

Change-Id: Idfc506812d6e0f1d88bdc5d7d62c159f9c9ad642
Signed-off-by: Sundar Raman <sunds@ti.com>
/hardware/ti/omap4xxx/camera/BaseCameraAdapter.cpp
348e4eaaf2f88810f2a3c55fd1b0df540a5104ed 17-Sep-2011 Tyler Luu <tluu@ti.com> CameraHal: Error handling before sending frames

Adding a few error checks before sending frames to make
sure we have the proper conditions to send a frame.

Fixes a bug where FillBufferDone gets preempted by the stop
path and by the time it returns the buffers and subscribers
are freed. Adding checks in send frame context since it is
protected by a Mutex.

Change-Id: I860bee796669606e1ec3e26e19916f386fc3e9aa
/hardware/ti/omap4xxx/camera/BaseCameraAdapter.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/BaseCameraAdapter.cpp
ee6bb64f60c228d711dc1d6875d8f4b0ed88b6cf 01-Sep-2011 Tyler Luu <tluu@ti.com> CameraHal: Initial support for video snapshot

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>
/hardware/ti/omap4xxx/camera/BaseCameraAdapter.cpp
85c859b69b3c003b8db810371e24fe41599fc7de 26-Aug-2011 Sundar Raman <sunds@ti.com> CameraHAL: Adds support for 'autoFocus()' calls during CAF

- Previously during CAF any calls for doing AF were
immediately returning status. The patch will check if
CAF has succeeded in locking and if this is not the case
it will temporarily switch to 'auto' triggering a full
AF sweep. CAF is again restored afterwards.
- Additionally this patch adds support for canceling AF
during 'PREVIEW_STATE' state, which is needed in order
to release the 3A lock after AF

Change-Id: Ie8c9b77fb134e63ed668a22453c1672b34488d94
Signed-off-by: Sundar Raman <sunds@ti.com>
/hardware/ti/omap4xxx/camera/BaseCameraAdapter.cpp
3f7a29d44c52729f037056a634423fda6db834e3 01-Aug-2011 Tyler Luu <tluu@ti.com> CameraHal: Adds support for switching to VIDEO_ZOOM state

- Should resolve an issue seen with CTS test
#testLockUnlock.

Change-Id: I99e7f36e3468162b0f4056c07c6f9307384354df
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/BaseCameraAdapter.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/BaseCameraAdapter.cpp