summaryrefslogtreecommitdiffstats
path: root/services/camera
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | libcameraservice: fix 64-bit print format warningsColin Cross2014-03-2119-69/+80
| | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use PRId64 from inttypes.h to print nsecs_t (int64_t) Use %zu to print size_t Change-Id: I135620e0388db33587a8a7da393b48a45cb7275a
* | | | | | | | Merge "CameraService: Add support for burst capture and repeating burst."Jianing Wei2014-03-227-3/+259
|\ \ \ \ \ \ \ \
| * | | | | | | | CameraService: Add support for burst capture and repeating burst.Jianing Wei2014-03-217-3/+259
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10749500 Change-Id: I292a485b222e5cf97388d76bf0d956a6ac54bb2f
* | | | | | | | | camera: Fix setParameters for Preview FPS single/range valuesIgor Murashkin2014-03-201-41/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 12609188 Change-Id: I82ea6f5de2183dd046d4bf5683600c97f37ab4db
* | | | | | | | | Merge "Remove deprecated BufferQueue constructor"Dan Stoza2014-03-186-18/+30
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove deprecated BufferQueue constructorDan Stoza2014-03-126-18/+30
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13415624 Change-Id: Ifc8f778b70102a38a9f7a086632e6884714e6b58
* | | | | | | | | am 557847ee: am a6ca0acf: am bd3e2e03: camera2: Fix segfault when using null ↵Igor Murashkin2014-03-181-0/+10
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | availability listener * commit '557847ee511dd5e75d584ff04449322f0f098241': camera2: Fix segfault when using null availability listener
| * | | | | | | | am a6ca0acf: am bd3e2e03: camera2: Fix segfault when using null availability ↵Igor Murashkin2014-03-181-0/+10
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | listener * commit 'a6ca0acf0d009acf45b05561273aaad44ab22533': camera2: Fix segfault when using null availability listener
| | * | | | | | | am bd3e2e03: camera2: Fix segfault when using null availability listenerIgor Murashkin2014-03-171-0/+10
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | * commit 'bd3e2e03f3ab686c52982a9e50cae853128172cf': camera2: Fix segfault when using null availability listener
| | | * | | | | | camera2: Fix segfault when using null availability listenerIgor Murashkin2014-03-171-0/+10
| | | | |_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ICameraService::addListener / removeListener will now return BAD_VALUE if a null listener is used. Bug: 12891434 Change-Id: I9764110094d8fd42e22fcc8df3ef0e73c1b070e7
* | | | | | | | camera3: Remove old vendor tag ops dependencies.Ruben Brunk2014-03-172-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 12134423 Change-Id: I7acdf76d4c0674bdb1cc939592d4620687c785c3
* | | | | | | | camera2: Don't log vendor tag errors when camera HAL too oldIgor Murashkin2014-03-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iac3d23284230c95c85ee404abbf9b22df1ae721c
* | | | | | | | resolved conflicts for merge of 3c780188 to masterGlenn Kasten2014-03-141-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | Change-Id: Ic579d346c27ff05ea6444faaa60fa6caaec86fbf
| * | | | | | | am 089affb6: Merge "mediaserver and associated services are 32-bit only"Glenn Kasten2014-03-141-0/+1
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | * commit '089affb6c2d9ed1e2d49df4be02d30dc490506f9': mediaserver and associated services are 32-bit only
| | * | | | | | mediaserver and associated services are 32-bit onlyGlenn Kasten2014-03-121-0/+1
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also 32-bit only command-line apps Change-Id: I9ac557a8d02bbf6986a9b5c3cdce23d400b306a3
| * | | | | | am f0fb921c: am bc69c8ba: DO NOT MERGE: Camera: delete preview callback when ↵Zhijun He2014-03-111-0/+16
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | preview size is changed * commit 'f0fb921c0170fe3b8ebce8fbe3c133a99c6def9f': DO NOT MERGE: Camera: delete preview callback when preview size is changed
| | * | | | | am bc69c8ba: DO NOT MERGE: Camera: delete preview callback when preview size ↵Zhijun He2014-03-111-0/+16
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is changed * commit 'bc69c8ba9a8fc881603669205a56d0ca1b572a95': DO NOT MERGE: Camera: delete preview callback when preview size is changed
| | | * | | | DO NOT MERGE: Camera: delete preview callback when preview size is changedZhijun He2014-03-101-0/+16
| | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preview callback stream is left configured even the preview size is changed. This makes the callback stream unnecessarily configured even in recording mode, which could cause distorted preview for some devices. Bug: 12210027 Bug: 12591410 Change-Id: If50cddfe5562e91aec1feb1760eccb82ddb21730
| * | | | | am 47ef192f: am a11111f9: Merge changes Id28b35fd,Ie4e64977,I2950f31e into ↵Eino-Ville Talvala2014-03-073-55/+66
| |\ \ \ \ \ | | |/ / / / | | | | / / | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | klp-dev * commit '47ef192f0296642b901e82d0c72c5a1a0d08f4df': DO NOT MERGE: Camera: fix focusArea wrong indexing issue DO NOT MERGE: camera2: Fix race with stream deletion during disconnect. DO NOT MERGE: camera2/3: Add protection for still capture path
| | * | | am a11111f9: Merge changes Id28b35fd,Ie4e64977,I2950f31e into klp-devEino-Ville Talvala2014-03-073-55/+66
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a11111f9135c98cf4247bbd1a61d7df3053e549e': DO NOT MERGE: Camera: fix focusArea wrong indexing issue DO NOT MERGE: camera2: Fix race with stream deletion during disconnect. DO NOT MERGE: camera2/3: Add protection for still capture path
| | | * | DO NOT MERGE: Camera: fix focusArea wrong indexing issueZhijun He2014-03-051-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 12304559 Change-Id: Id28b35fdd9697c1ec3365f617996801965de8bd0
| | | * | DO NOT MERGE: camera2: Fix race with stream deletion during disconnect.Ruben Brunk2014-03-051-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11856804 - Shutdown order in Camera2Client allows a stream to be deleted before the corresponding processing thread has quit. This can result in updates being called on the processor thread without a valid stream. Change-Id: Ie4e649771f4321498659211f2a37ed89a6d956c4
| | | * | DO NOT MERGE: camera2/3: Add protection for still capture pathZhijun He2014-03-051-35/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Jpeg stream in JpegProcessor could be deleted while process new capture is ongoing, which unsafe to access a dead consumer endpoint. Bug: 9316454 Change-Id: I2950f31ea28d0ba01f08502e2e3ba452bf8bb818
* | | | | Merge "camera3: Pass vendor tags through binder."Ruben Brunk2014-03-135-49/+111
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | camera3: Pass vendor tags through binder.Ruben Brunk2014-03-135-49/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 12134423 - Adds a class for parceling vendor tag definitions. - Passes vendor tag definitions to clients of the camera service. - Switches over to new vendor tag mechanism when reading from HAL. Change-Id: Icef3fe9e67160767bdb8244ac49c85b68b497123
* | | | | Merge "camera2: Fix race with stream deletion during disconnect."Ruben Brunk2014-02-241-6/+8
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | camera2: Fix race with stream deletion during disconnect.Ruben Brunk2013-12-051-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11856804 - Shutdown order in Camera2Client allows a stream to be deleted before the corresponding processing thread has quit. This can result in updates being called on the processor thread without a valid stream.
* | | | | resolved conflicts for merge of 566be7c3 to masterNarayan Kamath2014-02-118-13/+15
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | Change-Id: I7b1cc71057b2bd4f771e7bcf508a8c3abd6017ce
| * | | | Make frameworks/av 64-bit compatibleKévin PETIT2014-02-118-13/+15
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Contains the necessary changes to make frameworks/av build and work on a 64-bit machine. Signed-off-by: Craig Barber <craig.barber@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com> Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Change-Id: I725feaae50ed8eee25ca2c947cf15aee1f395c43
* | | | Merge "FINAL ATTEMPT: HTTP services are now provided from JAVA and made ↵Andreas Huber2014-02-051-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | available to media code"
| * | | | FINAL ATTEMPT: HTTP services are now provided from JAVA and made available ↵Andreas Huber2014-02-041-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to media code Change-Id: I9f74a86e70422187c9cf0ca1318a29019700192d
* | | | | camera3: Update maxRegions tag.Ruben Brunk2014-02-042-9/+38
|/ / / / | | | | | | | | | | | | Change-Id: I22501cbf7f941d9626b88182e2dda8a13a620d01
* | | | Camera: fix focusArea wrong indexing issueZhijun He2014-01-291-14/+14
| | | | | | | | | | | | | | | | | | | | Bug: 12304559 Change-Id: Id28b35fdd9697c1ec3365f617996801965de8bd0
* | | | camera3: Delete output stream of bi-directional streamZhijun He2014-01-271-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bi-directional stream (like Zsl stream) is both input and output streams. When deleted, both streams need to be deleted. Change-Id: I8b6bb9054fec264cc03754003797de0bae10cb20
* | | | Merge "Camera: delete preview callback when preview size is changed"Zhijun He2014-01-271-0/+16
|\ \ \ \
| * | | | Camera: delete preview callback when preview size is changedZhijun He2014-01-241-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preview callback stream is left configured even the preview size is changed. This makes the callback stream unnecessarily configured even in recording mode, which could cause distorted preview for some devices. Bug: 12210027 Bug: 12591410 Change-Id: If50cddfe5562e91aec1feb1760eccb82ddb21730
* | | | | Merge "Camera3: Flush device before ZSL reprocess"Zhijun He2014-01-272-1/+17
|\ \ \ \ \ | |/ / / /
| * | | | Camera3: Flush device before ZSL reprocessZhijun He2014-01-232-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call flush before sending ZSL reprocess request. This not only ensures no in-flight requests pending in the HAL before ZSL reprocess request, but also makes reprocess request to be processed by the HAL sooner. Bug: 12230973 Change-Id: I4c9e5a0fb75ccdc1e8861262c08d599d04170b7f
* | | | | Merge "Camera: delete zsl stream for video mode"Zhijun He2014-01-241-0/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Camera: delete zsl stream for video modeZhijun He2013-11-011-0/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I9ebfe0cb7376092c6ecd71e5c1c5058947282a5f
* | | | | camera3: Update sceneMode tag spec.Ruben Brunk2014-01-172-10/+10
| | | | | | | | | | | | | | | | | | | | Change-Id: I495435397086a295280c556d94fe8efd442a12c3
* | | | | am a2949165: am 3eccdde9: am c7614eb7: Merge "libcameraservice: Fix build in ↵Eino-Ville Talvala2014-01-151-5/+5
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | ISO C++11 mode" * commit 'a2949165680158db31dc1fce32f62bbe70c31820': libcameraservice: Fix build in ISO C++11 mode
| * | | | Merge "libcameraservice: Fix build in ISO C++11 mode"Eino-Ville Talvala2014-01-151-5/+5
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | libcameraservice: Fix build in ISO C++11 modeBernhard Rosenkraenzer2013-07-301-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change log macro define so it can't be confused for a C++11 string literal Change-Id: Idcc8085735177aa3313fdea66dc0736cca749f9b Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
* | | | | Camera2 API: fix front facing camera flip issueZhijun He2013-12-261-17/+47
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Camera stream transform calculation should take camera facing into account. For example, front facing camera preview stream should be horizontally or vertically flipped. Bug: 12300670 Change-Id: Ib497f0b8c3e65974de05d4f0aca3c51e99717c3d
* | | | camera2/3: Add protection for still capture pathZhijun He2013-11-261-35/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Jpeg stream in JpegProcessor could be deleted while process new capture is ongoing, which unsafe to access a dead consumer endpoint. Bug: 9316454 Change-Id: I2950f31ea28d0ba01f08502e2e3ba452bf8bb818
* | | | Merge "Camera3: Remove request from InFlightMap for error case"Zhijun He2013-11-211-2/+4
|\ \ \ \
| * | | | Camera3: Remove request from InFlightMap for error caseZhijun He2013-11-211-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't expect HAL send back valid result metadata if error occurs for a request, such as during flush call. The request needs to be removed from in flight request map accordingly. Bug: 9758581 Change-Id: I51fe327337325ce72f11ce592778a2af02e98479
* | | | | Merge "Camera3: add systraces for hal open/close"Zhijun He2013-11-191-0/+4
|\ \ \ \ \ | |/ / / /
| * | | | Camera3: add systraces for hal open/closeZhijun He2013-11-191-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10901465 Change-Id: I32fb96aa0f9efd423bdb9a3d92c142a096a7a47f