| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If an application gets backgrounded (HOME key) without stopping
preview and releasing camera, preview would previously not restart
when application is resumed. ANativeWindowDisplayAdapter would
detect that the preview surface was abandoned and stop sending
buffers to CameraAdapter.
We were previously not doing anything when CameraService called
setPreviewWindow when a display adapter was already created. To
fix this issue, we need to send the preview window and restart
preview.
Change-Id: I36089b0046f9861897d32c50b52128a41e2de2a5
Signed-off-by: Tyler Luu <tluu@ti.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
There is a small chance that a stopPreview call can come from
CameraService right around the same time Encoder thread will
send a data callback for the video snapshot. Currently, we
are waiting for the encoder thread to join in AppCallbackNofier::
stop(), so we could deadlock if CameraService locks in
lockIfMessageWanted for the video snapshot.
Instead of waiting for Encoder thread to join, we can make
cancel() block until Encoder thread is done canceling the
encode. After cancel() returns, we can free up the cookies
that we passed to it, so Encoder thread does not need to call
the callback function to AppCallbackNotifier.
Change-Id: Ib453d49d91077925b143c812d43a7d1b782c181c
Signed-off-by: Iliyan Malchev <malchev@google.com>
|
|
|
|
|
|
|
|
|
| |
Allow appcallback thread to exit immediately when exit command is processed.
Signed-off-by: Akwasi Boateng <akwasi.boateng@ti.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
Change-Id: I83db309cf973e1ce9494c855430897a0c41704d8
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- On some occasions during monkey tests, both the AF callback
and the shutter callback can be delayed just enough to
encounter the OMX component in loaded state. Usually this happens
when the camera is getting closed and this scenario should be
properly handled by exiting immediately without trying to trigger
any callbacks to the client.
Signed-off-by: Emilian Peev <epeev@mm-sol.com>
Signed-off-by: Akwasi Boateng <akwasi.boateng@ti.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
Change-Id: Ia18faf471a8e10579b09973178d73e69e782c63c
Signed-off-by: Iliyan Malchev <malchev@google.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Additional mOmxInitialized flag has been added to
track whether OMX has been succesfully initialized
to prevent duplicate OMX_DeInit() in OMXCameraAdapter
destructor.
Signed-off-by: Daniel Levin <x0155538@ti.com>
Signed-off-by: Akwasi Boateng <akwasi.boateng@ti.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
Change-Id: I269c5ac9d5de3f3e9088a11a3bea7127c1bd79de
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- 'disableMsgType()' was querying CameraHal for enabled message
types through 'msgTypeEnabled()'. This method will lock 'mLock'
in CameraHal. On the other hand 'takePicture()' inside CameraHal
will also lock 'mLock' before execution. If preview callbacks are
enabled before image capture, then 'takePicture()' will call
AppCallbackNotifier's 'disableMsgType()', which will try to
lock 'mLock' again. Solution, a query to CameraHal for enabled
message types is not needed inside 'disableMsgType()' because the
passed argument 'msgType' already contains all the needed
information.
Signed-off-by: Emilian Peev <epeev@mm-sol.com>
Signed-off-by: Akwasi Boateng <akwasi.boateng@ti.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
Change-Id: Ia4b7634ce21b8243f08d9124823c77e6bde84a8d
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- 'detectFaces()' should return immediately if
there is a mismatch in the 'platformPrivate'
size.
Signed-off-by: Emilian Peev <epeev@mm-sol.com>
Signed-off-by: Vicky Martinez-DeFrain <a0869710@ti.com>
Signed-off-by: Akwasi Boateng <akwasi.boateng@ti.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
Change-Id: Ib4237acdec7fa08dd4b06529e358003783dccf0a
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- The offset variables 'mXOff' and 'mYOff' in
ANativeDisplayAdapter are always initialized to
zero. If the offset of the incoming preview buffer
is zero and the viewable preview resolution is
smaller than the actual preview buffer resolution,
then the crop will not get configured properly.
Signed-off-by: Emilian Peev <epeev@mm-sol.com>
Signed-off-by: Vicky Martinez-DeFrain <a0869710@ti.com>
Signed-off-by: Akwasi Boateng <akwasi.boateng@ti.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
Change-Id: Ib321f17566d253dd65dc4c6d20bf748a9a4c614b
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- 'mIonFd' doesn't get properly closed in each error case
involving buffer allocation
Signed-off-by: Emilian Peev <epeev@mm-sol.com>
Signed-off-by: Daniel Levin <x0155538@ti.com>
Signed-off-by: Jean Johnson <a0271255@ti.com>
Signed-off-by: Akwasi Boateng <akwasi.boateng@ti.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
Change-Id: Ib893e832712e3ea4a3711153453f7a2aa873d0ee
|
|
|
|
|
|
|
|
|
|
|
|
| |
Replaced line endings to UNIX in CameraHAL-related sources.
No code changes.
Signed-off-by: Daniel Levin <x0155538@ti.com>
Signed-off-by: Jean Johnson <a0271255@ti.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
Change-Id: Id32c429fe7527342cfa2a7b9b1724e5f088dbd3f
|
|\
| |
| |
| |
| |
| | |
* commit '67496a60c60076166f6856431f68024a9412c067':
CameraHAL: Perform focus even if CAF has failed
CameraHAL: Enable LDCNSF for Video snapshot
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Fixes b/5534973
Used to force focus if CAF has failed (before capture). CAF's state is
'failed' even if a scene change is detected only.
Change-Id: I0878a9f862b7800b566e578efdfa62baec7e5889
Signed-off-by: Milen Mitkov <mmitkov@mm-sol.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Enables LDCNSF for Video snapshot, also adds start_offset and right_crop fields
to the JPEG encoder wrapper, because the image with LDCNSF has artifacts on top
and right.
Change-Id: I1011252e3f8068083f9d057b7763b7f79c59a75d
Signed-off-by: Milen Mitkov <mmitkov@mm-sol.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Fixes b/5582076. Requires changes to Ducati and external/jhead.
1. Add API to get and set ancillary data metadata so
we can use the values to fill in Exif data.
2. Add support for additional tags.
Change-Id: I537e683839c59e92a4a20ff62653b6d46e303f53
Signed-off-by: Tyler Luu <tluu@ti.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
|
|\ \
| |/
| |
| |
| |
| |
| | |
property for user build
* commit '089c480c4e657653673854f0e3d92faa0fec75a5':
Ignore camera.flash_off system property for user build
|
| |\
| | |
| | |
| | |
| | | |
* commit '0bb5454945320db77ff426baf9c0c34631c373ab':
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
|
|\ \ \
| |/ /
| | |
| | |
| | | |
* commit '8d18af6dfd68f047c2bcf82fe88eeeb623eafa0c':
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>
|
|\ \ \
| |/ /
| | |
| | |
| | | |
* commit '205f5527e88ea9b108e3d84050a43e310632b0e3':
CameraHAL: Do not return error if AF fails
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Fixes b/5612881
Some third-party apps do not handle errors thrown by the camera HAL when they
try to invoke autoFocus while AF is in progress.
The Barcode Scanner, in particular, will quit in this case without releasing
the Camera handle, wreaking all sorts of power-management havoc.
Even though CTS does not mandate it, previous versions of Android and other
camera HAL implementations simply return success in this case. This patch
makes this HAL conform to this behavior.
Change-Id: I758e2de7f84b61043267f052169068b64d75d0d1
Signed-off-by: Sundar Raman <sunds@ti.com>
|
|\ \ \
| |/ /
| | |
| | |
| | | |
* commit 'b5375cf2e7f917556b377be4ec0974f7c62dbe0d':
CameraHal: Use Different Timeout for Video Mode
|
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Select AF timeout based on whether or not we are in
video mode.
b/5492725
Change-Id: I2fa722e6a3a7c149488ddb29ce44262914d19e38
Signed-off-by: Tyler Luu <tluu@ti.com>
|
|\ \
| |/
| |
| |
| |
| |
| | |
camera flash. This is for testing purpose only
* commit '499aad98956ba1ab16c6bc6540cd19ee1bad189e':
When camera.flash_off is 1, disable camera flash. This is for testing purpose only
|
| |
| |
| |
| |
| |
| |
| | |
This is for testing purpose only
Change-Id: Idf0a6d5d52daeb4b5ff7576d0119868bdeff40eb
related-to-bug: 5617451
|
|\ \
| |/
| |
| |
| | |
* commit 'bf97da4dfacdb7d8a5555d6aef166d782f6d0e05':
videosnapshot memory corruption fixes.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
1. Fixes memory corruption of dst buffer in
nv21_to_yuv() convertion
2. Free malloced row_tmp buffer
3. Free params string in Appcallback
Change-Id: I2179f1158f6e72cca0f7e5c815b1cb576bfa925e
Signed-off-by: Akwasi Boateng <akwasi.boateng@ti.com>
related-to-bug: 5601247
|
| |
| |
| |
| |
| |
| |
| | |
This reverts commit cbaa66464ff86bddf40e3c8de8db44473ff27de9.
we need to revert this change since this leads to a stop ship problem where
we can only take a single picture.
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | | |
surface is abdandoned"
* commit 'c24cc17f3b7483bd0ff31546eae223943bdaf595':
Revert "CameraHAL: Fix preview not starting after surface is abdandoned"
|
| |/
| |
| |
| |
| |
| |
| | |
This reverts commit cbaa66464ff86bddf40e3c8de8db44473ff27de9.
we need to revert this change since this leads to a stop ship problem where
we can only take a single picture.
|
|\ \
| |/
| |
| |
| |
| |
| | |
video snapshot
* commit '8a2c7a2d44408aea33beef1775c7b925211d1aae':
CameraHal: WA for green thumbnail for video snapshot
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
WA for regression introduced with:
'cf0a61f135: CameraHAL: Use Ancillary data to check for snapshot"
Video snapshot postview frames are not currently being tagged
with the ancillary data. Let this check pass through when in
video mode.
Change-Id: I9b3aacb902d15f1cd7f993f6664976299fcb0427
Signed-off-by: Tyler Luu <tluu@ti.com>
|
|\ \
| |/
| |
| |
| |
| |
| | |
after surface is abdandoned
* commit '334dd8a961fcfe53c083b2b8a0e7041065704a7d':
CameraHAL: Fix preview not starting after surface is abdandoned
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Fix 3/3 for b/5593964.
(I'm bundling this fix with b/5573610 because it is preview-related, though
strictly speaking not part of b/b/5573610. It has been with us since the
beginning.)
If an application gets backgrounded (HOME key) without stopping
preview and releasing camera, preview would previously not restart
when application is resumed. ANativeWindowDisplayAdapter would
detect that the preview surface was abandoned and stop sending
buffers to CameraAdapter.
We were previously not doing anything when CameraService called
setPreviewWindow when a display adapter was already created. To
fix this issue, we need to send the preview window and restart
preview.
Change-Id: I36089b0046f9861897d32c50b52128a41e2de2a5
Signed-off-by: Tyler Luu <tluu@ti.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
|
|\ \
| |/
| |
| |
| |
| |
| | |
clear command queue on exit
* commit 'fef083876a27ebab9451c0151ce6fbaae0f66ccf':
CameraHAL: Clear events queue fix, clear command queue on exit
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Fix 2/3 for b/5593964.
1. The events queue wasn't being cleared correctly inside
OMXCameraAdapter as some items were being removed while the
index was being formulated based on the original size
2. The command queue should be cleared before posting the EXIT
message for the OMX adapter threads so as not to process those
messages since we are exiting
Change-Id: I0a5eaceb3d1504fee05b064ebb5fe888e129ad44
Signed-off-by: Sundar Raman <sunds@ti.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
|
|\ \
| |/
| |
| |
| |
| |
| | |
setParameter issue
* commit 'd3278ddd57085e8d7f261defbdfaed4d5bbea167':
CameraHAL: Fixes for ANR and a setParameter issue
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Fix 1/3 for b/5593964.
1. Ensure we don't race with stopImageCapture when stopPreview is called
2. Signal the shutter callback correctly
3. Do not crash the media server if focus APIs and image capture returns error
Still go ahead and perform de-init
4. Replace setParameter from CameraHAl to AppCallbackNotifier with getParameter
when needed.
Change-Id: I2b2745827d227a8d7927ce1611a84c29129e8891
Signed-off-by: Sundar Raman <sunds@ti.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
|
|\ \
| |/
| |
| |
| |
| |
| | |
shouldnt start focus scanning
* commit 'c087cd70cfa6dcbcdbafaa5f85a48a585263068c':
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>
|
|\ \
| |/
| |
| |
| |
| |
| | |
preview
* commit 'a7c06115a023e4160d2ef922fc0930098642293c':
CameraHal: Apply3aSettings at start preview
|
| |
| |
| |
| |
| |
| |
| |
| | |
Fixes b/5515136.
Change-Id: I3b462b337f42be7ebe07642f5298f45bb1431daa
Signed-off-by: Vladislav Hristov <vhristov@mm-sol.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
|
|\ \
| |/
| |
| |
| | |
* commit '3c86a5424fa4a0099d66172ff8b0a00eda9fd528':
CameraHal: Wait for frame before stopping preview
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Fix 3/3 for b/5472396.
We should wait for the first frame to come before trying to
stopPreview. If not, we might put OMXCamera in a bad state
i.e (IDLE->LOADED timeout). Seeing this a lot after a capture
Change-Id: I4ac6cc4f12bdc0d4d73e065b7c53caf8a440a43c
Signed-off-by: Tyler Luu <tluu@ti.com>
|
|\ \
| |/
| |
| |
| | |
* commit '2a7d690c1acd0f61fbd95a532c9703a4cd0af83a':
CameraHal: Clean-up if mCaptureSem times out
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Fix 2/3 for b/5472396.
In stopImageCapture, continue cleaning up even if mCaptureSem
times out.
Change-Id: Idf65a488b2ce55a9d451a899df0bc76f6480647b
Signed-off-by: Tyler Luu <tluu@ti.com>
|
|\ \
| |/
| |
| |
| | |
* commit '5184e1e128919716e8090d02a7abffa97cb74af0':
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>
|
|\ \
| |/
| |
| |
| |
| |
| | |
capture resolutions
* commit 'dfffc83746802d0c582772976103403ec5c58059':
CameraHal: Add 2592x1728 and 2592x1458 image capture resolutions
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Part of the fix for b/5546023
Adding new resolution to support 16:9 and 3:2 aspect ratio.
Note: This allows to keep same aspect ratio between video preview
and video snapshot.
This change requires a matching Ducati update. For the power savings to take
effect, the new resolution must actually be used by the application.
Change-Id: I87d5f3155856b0c2c83763349843628eeadfacfc
Signed-off-by: Gilles-Arnaud Bleu-Laine <gilles@ti.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
|