summaryrefslogtreecommitdiffstats
path: root/services/camera
Commit message (Expand)AuthorAgeFilesLines
* Merge "CameraService: fix race condition and wrong last frame number."Jianing Wei2014-04-172-156/+71
|\
| * CameraService: fix race condition and wrong last frame number.Jianing Wei2014-04-172-156/+71
* | Camera: don't dereference timestamp if it is missingZhijun He2014-04-141-6/+9
|/
* Merge "camera3: Remove register_stream_buffers for HAL 3.2+"Vineeta Srivastava2014-04-103-2/+78
|\
| * camera3: Remove register_stream_buffers for HAL 3.2+Igor Murashkin2014-04-093-2/+78
* | CameraService: trigger appropriate callbacks for burst capture.Jianing Wei2014-04-1023-309/+389
|/
* Camera3: fix HAL3.x version check issueZhijun He2014-03-275-5/+17
* Revert "camera: Fix setParameters for Preview FPS single/range values"Eino-Ville Talvala2014-03-261-116/+41
* am a1aaaf86: am 4f53fe74: Merge "CameraService: deadlock fix"Eino-Ville Talvala2014-03-251-0/+1
|\
| * am 4f53fe74: Merge "CameraService: deadlock fix"Eino-Ville Talvala2014-03-251-0/+1
| |\
| | * CameraService: deadlock fixKalle Lampila2014-03-251-0/+1
* | | Merge "Camera3: Fix flush call deadlock"Zhijun He2014-03-252-1/+12
|\ \ \
| * | | Camera3: Fix flush call deadlockZhijun He2014-03-232-1/+12
* | | | am 5c679d41: resolved conflicts for merge of 3d7c5002 to klp-modular-dev-plus...Colin Cross2014-03-2420-70/+80
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | resolved conflicts for merge of 3d7c5002 to klp-modular-dev-plus-aospColin Cross2014-03-2120-70/+80
| |\ \ | | |/
| | * libcameraservice: build 64-bitColin Cross2014-03-211-1/+0
| | * libcameraservice: fix 64-bit print format warningsColin Cross2014-03-2119-69/+80
* | | 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
* | | | camera: Fix setParameters for Preview FPS single/range valuesIgor Murashkin2014-03-201-41/+116
* | | | Merge "Remove deprecated BufferQueue constructor"Dan Stoza2014-03-186-18/+30
|\ \ \ \
| * | | | Remove deprecated BufferQueue constructorDan Stoza2014-03-126-18/+30
| |/ / /
* | | | am 557847ee: am a6ca0acf: am bd3e2e03: camera2: Fix segfault when using null ...Igor Murashkin2014-03-181-0/+10
|\ \ \ \ | | |/ / | |/| |
| * | | am a6ca0acf: am bd3e2e03: camera2: Fix segfault when using null availability ...Igor Murashkin2014-03-181-0/+10
| |\ \ \
| | * \ \ am bd3e2e03: camera2: Fix segfault when using null availability listenerIgor Murashkin2014-03-171-0/+10
| | |\ \ \
| | | * | | camera2: Fix segfault when using null availability listenerIgor Murashkin2014-03-171-0/+10
* | | | | | camera3: Remove old vendor tag ops dependencies.Ruben Brunk2014-03-172-15/+0
* | | | | | camera2: Don't log vendor tag errors when camera HAL too oldIgor Murashkin2014-03-171-1/+1
* | | | | | resolved conflicts for merge of 3c780188 to masterGlenn Kasten2014-03-141-0/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 089affb6: Merge "mediaserver and associated services are 32-bit only"Glenn Kasten2014-03-141-0/+1
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | mediaserver and associated services are 32-bit onlyGlenn Kasten2014-03-121-0/+1
| * | | | | am f0fb921c: am bc69c8ba: DO NOT MERGE: Camera: delete preview callback when ...Zhijun He2014-03-111-0/+16
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | am bc69c8ba: DO NOT MERGE: Camera: delete preview callback when preview size ...Zhijun He2014-03-111-0/+16
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | DO NOT MERGE: Camera: delete preview callback when preview size is changedZhijun He2014-03-101-0/+16
| * | | | | am 47ef192f: am a11111f9: Merge changes Id28b35fd,Ie4e64977,I2950f31e into kl...Eino-Ville Talvala2014-03-073-55/+66
| |\ \ \ \ \ | | |/ / / / | | | | / / | | |_|/ / | |/| | |
| | * | | am a11111f9: Merge changes Id28b35fd,Ie4e64977,I2950f31e into klp-devEino-Ville Talvala2014-03-073-55/+66
| | |\ \ \ | | | |/ /
| | | * | DO NOT MERGE: Camera: fix focusArea wrong indexing issueZhijun He2014-03-051-14/+14
| | | * | DO NOT MERGE: camera2: Fix race with stream deletion during disconnect.Ruben Brunk2014-03-051-6/+8
| | | * | DO NOT MERGE: camera2/3: Add protection for still capture pathZhijun He2014-03-051-35/+44
* | | | | 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
* | | | | 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
* | | | | resolved conflicts for merge of 566be7c3 to masterNarayan Kamath2014-02-118-13/+15
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Make frameworks/av 64-bit compatibleKévin PETIT2014-02-118-13/+15
| | |/ / | |/| |
* | | | Merge "FINAL ATTEMPT: HTTP services are now provided from JAVA and made avail...Andreas Huber2014-02-051-1/+2
|\ \ \ \
| * | | | FINAL ATTEMPT: HTTP services are now provided from JAVA and made available to...Andreas Huber2014-02-041-1/+2
* | | | | camera3: Update maxRegions tag.Ruben Brunk2014-02-042-9/+38
|/ / / /
* | | | Camera: fix focusArea wrong indexing issueZhijun He2014-01-291-14/+14
* | | | camera3: Delete output stream of bi-directional streamZhijun He2014-01-271-3/+7