summaryrefslogtreecommitdiffstats
path: root/services/camera
Commit message (Collapse)AuthorAgeFilesLines
* Merge "camera3: Don't try to disconnect stream native windows more than ↵Igor Murashkin2013-05-284-2/+15
|\ | | | | | | once" into jb-mr2-dev
| * camera3: Don't try to disconnect stream native windows more than onceIgor Murashkin2013-05-284-2/+15
| | | | | | | | | | | | | | | | | | | | This fixes the multiple-disconnect-from-BufferQueue bug. (In logs) BufferQueue: [SurfaceView] disconnect: connected to another api (cur=0, req=4) Bug: 9114681 Change-Id: I21ae1c5bd993701eea13648aa9994979a24eb210
* | Merge "Camera3: Fix the deadlock during recording pinch zooming" into jb-mr2-devZhijun He2013-05-242-3/+15
|\ \
| * | Camera3: Fix the deadlock during recording pinch zoomingZhijun He2013-05-232-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | When zooming during recording, hal callback thread and request update thread run into deadlock due to lock circular dependency. This change release lock during queuebuffer in callback thread to break the dependency. Bug: 9091576 Change-Id: Ia7b3f0ec17573cb32a5696dcde419ca28f42cfb8
* | | Merge "camera3: Disable ZSL for limited mode camera HALs" into jb-mr2-devEd Heyl2013-05-241-5/+13
|\ \ \
| * | | camera3: Disable ZSL for limited mode camera HALsIgor Murashkin2013-05-231-5/+13
| | | | | | | | | | | | | | | | | | | | Bug: 9111852 Change-Id: Idad7e0d2f912341bd643d0ad1a0861fb2043aa90
* | | | Merge "camera3: Fix zsl buffers released-while-in-use race condition" into ↵Igor Murashkin2013-05-232-12/+20
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | jb-mr2-dev
| * | camera3: Fix zsl buffers released-while-in-use race conditionIgor Murashkin2013-05-222-12/+20
| |/ | | | | | | | | Bug: 9007356 Change-Id: I0ced31020410978c549d408b2815f925e9c9ffcf
* | Merge "Camera3: Make sure new metadata results signal other threads waiting" ↵Igor Murashkin2013-05-233-0/+39
|\ \ | |/ |/| | | into jb-mr2-dev
| * Camera3: Make sure new metadata results signal other threads waitingIgor Murashkin2013-05-223-0/+39
| | | | | | | | | | | | | | - Also adds a lot of logging around shuffling around metadata frames Bug: 9007356 Change-Id: I4285f4f55b4b899ea4928d43062c705619c8248a
* | Merge "camera3: Fix recording failure when switching resolutions while ↵Igor Murashkin2013-05-223-4/+27
|\ \ | | | | | | | | | preview on" into jb-mr2-dev
| * | camera3: Fix recording failure when switching resolutions while preview onIgor Murashkin2013-05-223-4/+27
| |/ | | | | | | | | Bug: 9069574 Change-Id: Ife2ae5467f799dbe37e66714b3a6c9a51e1fe328
* | Camera3: Fix Bug minTimestamp is never greater than frame timestampMansoor Aftab2013-05-221-1/+1
|/ | | | | | | | | | Bug in logic since minTimestamp is initialized to -1, and this needs to be updated for the first frame atleast for logic to work correctly for subsequent frames. Bug: 9007356 Change-Id: I70edc4d9f34ff67a141c027c67396dc2ca9e413a Signed-off-by: Igor Murashkin <iam@google.com>
* Camera2/3: Increase digital zoom stepsZhijun He2013-05-201-1/+1
| | | | | | | | Digitial zoom number of steps was 30 and a bit rough. Change it to 100 to make smooth zoom smoother. Bug: 9050908 Change-Id: I141bc0335d58cdcd6530c14cbbfe6c4ffb4c6dc6
* update to Fence::waitForever() API changeMathias Agopian2013-05-163-5/+2
| | | | | Bug: 8988871 Change-Id: I24a2620d356f3bb6207ed834c79fd3e48b429695
* Merge "Camera3: Fix fast flexible YUV->NV21 path." into jb-mr2-devEino-Ville Talvala2013-05-151-29/+33
|\
| * Camera3: Fix fast flexible YUV->NV21 path.Eino-Ville Talvala2013-05-141-29/+33
| | | | | | | | | | | | | | | | | | | | A U by any other name may smell just as sweet, but the color's pretty awful if you call it a V. Henceforth they never will be UV. Bug: 8949720 Change-Id: I4897e93d5a293e576bb1d7ba44d91792b869ad42
* | Camera: don't spam RingBufferConsumer logs in eng buildsIgor Murashkin2013-05-141-3/+3
|/ | | | | Bug: 8969579 Change-Id: Ia51d4072725754fd3b6ca028232a605885376287
* Camera: Pause preview when needing to delete jpeg/zsl streamsIgor Murashkin2013-05-137-9/+126
| | | | | Bug: 8876221 Change-Id: Idf9490a48462fa44d49c4ebe99425c3149ae6378
* Merge "Camera3: Refactor stream code to be DRY" into jb-mr2-devIgor Murashkin2013-05-139-799/+554
|\
| * Camera3: Refactor stream code to be DRYIgor Murashkin2013-05-109-799/+554
| | | | | | | | | | Bug: 8851039 Change-Id: Iaac2926bfa25dd6e9db8b307765d4fe709b88d21
* | Merge "Camera2/3: Optimize a few YCbCr_420_888 copy paths" into jb-mr2-devEino-Ville Talvala2013-05-101-20/+46
|\ \
| * | Camera2/3: Optimize a few YCbCr_420_888 copy pathsEino-Ville Talvala2013-05-091-20/+46
| | | | | | | | | | | | | | | | | | | | | | | | Covers cases where the HAL format and the API format have the same chroma layout. Bug: 8734880 Change-Id: Ia735082c260b5914fc14f12551f91917c4e53b01
* | | Merge "Camera2: FoV quirk crop regions" into jb-mr2-devAlex Ray2013-05-101-20/+17
|\ \ \
| * | | Camera2: FoV quirk crop regionsAlex Ray2013-05-071-20/+17
| | | | | | | | | | | | | | | | | | | | Bug: 8484377 Change-Id: I5ffcc20b68dc92b502acc9898e57f12cadb92848
* | | | Camera3: Fix initial orientation configuration.Eino-Ville Talvala2013-05-091-5/+0
| |/ / |/| | | | | | | | | | | | | | | | | One call to set orientation too many. Bug: 8683719 Change-Id: I4b776fc8665eed940a1f18a6f617be4f1406e41a
* | | Merge "camera3: Manage fences properly when buffers are returned with an ↵Igor Murashkin2013-05-092-24/+75
|\ \ \ | | |/ | |/| | | | error" into jb-mr2-dev
| * | camera3: Manage fences properly when buffers are returned with an errorIgor Murashkin2013-05-082-24/+75
| | | | | | | | | | | | | | | Bug: 8622089 Change-Id: I4df0258d6803d460d4dd98f0a80829eb844ca30d
* | | Merge "camera2: Add height to the crop region metadata property" into jb-mr2-devIgor Murashkin2013-05-091-3/+4
|\ \ \
| * | | camera2: Add height to the crop region metadata propertyIgor Murashkin2013-05-071-3/+4
| | |/ | |/| | | | | | | | | | Bug: 8756080 Change-Id: I90b9166440e92f7675255a01ddc4a980c2e52201
* | | Merge "Camera3: Support flexible YUV for preview callbacks" into jb-mr2-devEino-Ville Talvala2013-05-094-21/+181
|\ \ \ | |_|/ |/| |
| * | Camera3: Support flexible YUV for preview callbacksEino-Ville Talvala2013-05-074-21/+181
| |/ | | | | | | | | | | | | | | | | When the HAL supports it, and the client asks for YV12 or NV21, use the new flexible YUV format instead. Bug: 8734880 Change-Id: Ib0129d9c26a6b30f3be7aa624c2439c6edba1bbd
* | Merge "Camera: Hotplug - conditionally transition to PRESENT when clients ↵Igor Murashkin2013-05-072-12/+33
|\ \ | |/ |/| | | disconnect" into jb-mr2-dev
| * Camera: Hotplug - conditionally transition to PRESENT when clients disconnectIgor Murashkin2013-05-022-12/+33
| | | | | | | | | | | | | | | | | | Fixes an issue where a client could unconditionally transition to PRESENT after a client disconnects, even though the underlying HAL status was actually NOT_PRESENT or ENUMERATING. Bug: 8780114 Change-Id: I68adb5fc819eec3b046ddcb2507b84bedc999a0f
* | Merge "camera3: Don't eagerly finish configuring bidi streams more than ↵Igor Murashkin2013-05-061-6/+10
|\ \ | |/ |/| | | once" into jb-mr2-dev
| * camera3: Don't eagerly finish configuring bidi streams more than onceIgor Murashkin2013-05-021-6/+10
| | | | | | | | | | | | | | | | | | | | Finishing all stream configuration immediately is good, but when a stream is both input and output it attempted to finish configuring bidi streams twice. Since all ZSL streams are bidi, when we had a ZSL stream active preview would immediately stop working. Bug: 8563838 Change-Id: Iec998f11f6405fc15f3f31bd7cd29f03a7968d14
* | Merge "camera3: Don't crash when taking a still capture with ZSL disabled" ↵Igor Murashkin2013-05-021-1/+4
|\ \ | |/ | | | | into jb-mr2-dev
| * camera3: Don't crash when taking a still capture with ZSL disabledIgor Murashkin2013-05-021-1/+4
| | | | | | | | | | Bug: 8790212 Change-Id: I4bf7ac5ab856b0ea1738844182efb86137e14083
* | Merge "Camera2/3: Fix still image FOV reporting." into jb-mr2-devEino-Ville Talvala2013-05-022-10/+125
|\ \ | |/ |/|
| * Camera2/3: Fix still image FOV reporting.Eino-Ville Talvala2013-05-012-10/+125
| | | | | | | | | | | | | | | | | | | | Still FOV can vary as a function of the output sizes, with the function depending on the HAL version. Calculate and update the FOV whenever the output sizes might change. Bug: 8484377 Change-Id: I56f2cc768a1e128a159b326588be55b2752db06e
* | Merge "Camera3: Add missing buffer listener include (for ZSL)" into jb-mr2-devIgor Murashkin2013-05-011-0/+48
|\ \
| * | Camera3: Add missing buffer listener include (for ZSL)Igor Murashkin2013-05-011-0/+48
| | | | | | | | | | | | | | | Bug: 8563838 Change-Id: Ie053655f5583d20003abdabccee68980d7cdcbfd
* | | Merge changes I2feda142,I5a95e0be,Ia0c21ef0 into jb-mr2-devIgor Murashkin2013-05-0124-93/+2759
|\ \ \ | |/ / | | | | | | | | | | | | | | | * changes: Camera3: Add ZSL stream support camera: Add new RingBufferConsumer to keep a ring buffer of acquired frames Camera3: Add input stream support
| * | Camera3: Add ZSL stream supportIgor Murashkin2013-04-2919-66/+1751
| | | | | | | | | | | | | | | | | | Bug: 8563838 Change-Id: I2feda142ff5172aba17ade5c8d502f9bb5d5b766
| * | camera: Add new RingBufferConsumer to keep a ring buffer of acquired framesIgor Murashkin2013-04-293-1/+537
| | | | | | | | | | | | | | | Bug: 8563838 Change-Id: I5a95e0be94e5388b30639905efae42d3c3279f72
| * | Camera3: Add input stream supportIgor Murashkin2013-04-267-28/+473
| | | | | | | | | | | | | | | | | | | | | | | | - Untested with actual CAMERA3_STREAM_INPUT streams. Bug: 8629088 Change-Id: Ia0c21ef0a2c951e401ea8babd15d3cceb4bb25a1
* | | Camera: Don't complain repeatedly about missing android.led.availableLedsIgor Murashkin2013-04-302-4/+6
| |/ |/| | | | | | | Bug: 8765726 Change-Id: I78f5f98315068aaad3a39d56698b9c8a18cc8f4a
* | Merge "ProCamera: Add security permission checks for disabling transmit LED" ↵Igor Murashkin2013-04-273-0/+82
|\ \ | | | | | | | | | into jb-mr2-dev
| * | ProCamera: Add security permission checks for disabling transmit LEDIgor Murashkin2013-04-253-0/+82
| | | | | | | | | | | | | | | Bug: 8554573 Change-Id: Ie909908a4cab3700bd622282e8342e8fa5b72376
* | | Merge "Camera2: Fix deadlock on shutdown due to client getting killed." into ↵Eino-Ville Talvala2013-04-2711-149/+263
|\ \ \ | |/ / |/| / | |/ jb-mr2-dev