summaryrefslogtreecommitdiffstats
path: root/services/camera
Commit message (Collapse)AuthorAgeFilesLines
* am bda5d1f2: am 241b5279: Camera3: Power: Properly shut down unused thread.Eino-Ville Talvala2013-06-171-2/+3
|\ | | | | | | | | * commit 'bda5d1f2a34f9b7ded0bc0441be4856e78ec066c': Camera3: Power: Properly shut down unused thread.
| * Camera3: Power: Properly shut down unused thread.Eino-Ville Talvala2013-06-171-2/+3
| | | | | | | | | | Bug: 9466221 Change-Id: I9ed0740561b2e04954eebc1b8aec89cfab40a3a0
* | am 0cc75491: am 26bc908b: Camera2/3: Make sure to wait for idle after still ↵Eino-Ville Talvala2013-06-141-0/+6
|\ \ | |/ | | | | | | | | | | capture. * commit '0cc754918a3c1353164ccc5798f63b28f65db406': Camera2/3: Make sure to wait for idle after still capture.
| * Camera2/3: Make sure to wait for idle after still capture.Eino-Ville Talvala2013-06-131-0/+6
| | | | | | | | | | | | | | | | | | While this wait should be immediate, it's important to guarantee that preview is stopped when takePicture completes, and that the device knows itself to be idle. Bug: 9413025 Change-Id: I1c151ba920e226107ee048918187364990f444c0
* | am e4a453d4: am 214a17fd: Camera3: Always close HAL device even in face of ↵Eino-Ville Talvala2013-06-141-10/+20
|\ \ | |/ | | | | | | | | | | errors. * commit 'e4a453d4b7563d1dab674df6ce52c291e63c6ca7': Camera3: Always close HAL device even in face of errors.
| * Camera3: Always close HAL device even in face of errors.Eino-Ville Talvala2013-06-131-10/+20
| | | | | | | | | | | | | | | | To improve robustness, make sure the HAL device instance is always closed, even if it cannot be put into the IDLE state. Bug: 9414167 Change-Id: I8e7035ff0afe7214951f9824e561b340cb37592e
* | Merge "camera2: accept 4-value active array size"Alex Ray2013-06-131-3/+10
|\ \
| * | camera2: accept 4-value active array sizeAlex Ray2013-06-131-3/+10
| | | | | | | | | | | | Change-Id: Ia320a022b201a938a025efc30a54c05fcfe5b02f
* | | am ccc366a9: am 1191454a: Merge "Camera3: Skipping no-ops good, not updating ↵Eino-Ville Talvala2013-06-131-0/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | state machine bad." into jb-mr2-dev * commit 'ccc366a90fdd8d9df5de27820f04bc534d122c07': Camera3: Skipping no-ops good, not updating state machine bad.
| * | Merge "Camera3: Skipping no-ops good, not updating state machine bad." into ↵Eino-Ville Talvala2013-06-131-0/+1
| |\ \ | | | | | | | | | | | | jb-mr2-dev
| | * | Camera3: Skipping no-ops good, not updating state machine bad.Eino-Ville Talvala2013-06-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a HAL-level stream reconfigure is not needed, still need to transition camera device to ACTIVE state in configureStreams. Otherwise, shutdown functions will not wait for device to drain properly. Bug: 9413025 Change-Id: I0b15792097c7e5771015f2a362735d5f88b8c6ea
* | | | am 4541531a: am c4a8d2dd: Merge "Camera2/3: Create JPEG stream ↵Eino-Ville Talvala2013-06-131-12/+16
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | unconditionally." into jb-mr2-dev * commit '4541531a6e64329764ad7359775689a8f5aca165': Camera2/3: Create JPEG stream unconditionally.
| * | Merge "Camera2/3: Create JPEG stream unconditionally." into jb-mr2-devEino-Ville Talvala2013-06-131-12/+16
| |\ \ | | |/ | |/|
| | * Camera2/3: Create JPEG stream unconditionally.Eino-Ville Talvala2013-06-111-12/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of creating the JPEG output stream only at first use, create it at time of preview start. This is important for reducing the first-capture latency on HAL3 devices, and for ZSL on them. Bug: 9339858 Change-Id: I4296f706cfd151c47ef315149e87d01fe554aaa4
* | | am 44ade05f: am ea26c777: Camera3: Skip no-op stream configurations.Eino-Ville Talvala2013-06-112-0/+10
|\ \ \ | |/ / | | | | | | | | | * commit '44ade05f8d030ae3af8d05359734b18eac433935': Camera3: Skip no-op stream configurations.
| * | Camera3: Skip no-op stream configurations.Eino-Ville Talvala2013-06-112-0/+10
| |/ | | | | | | | | | | | | | | | | | | | | | | | | If configuring the same set of streams more than once, don't actually call into the HAL for the second and subsequent configure calls, since they're no-ops. This can speed up camera operation substantially if the HAL implementation does not detect no-ops on its own and does a full shutdown/restart on each configure call. Bug: 9392513 Change-Id: I23baf4acbae2304735899adcf8e17565fa94d31d
* | Merge "Camera3: Add more tracing"Eino-Ville Talvala2013-06-102-3/+23
|\ \
| * | Camera3: Add more tracingEino-Ville Talvala2013-06-072-3/+23
| | | | | | | | | | | | Change-Id: I5f5d0d3f37244f19446c473db70373bdf16cce56
* | | am 574ca4f4: am ba696bbf: Merge "camera2/3: Fix deadlock take picture while ↵Zhijun He2013-06-071-87/+88
|\ \ \ | | |/ | |/| | | | | | | | | | | | | preview callback" into jb-mr2-dev * commit '574ca4f4f15a42d6159150149f68bf3cb800d869': camera2/3: Fix deadlock take picture while preview callback
| * | camera2/3: Fix deadlock take picture while preview callbackZhijun He2013-06-061-87/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Acquiring mInputMutex before SharedParameters mutex in preview callback thread causes circular locking dependency between callback thread and capture callback thread. Enforce the right lock ordering to break the dead lock. Bug: 9323319 Change-Id: Iea2e025e4d9e29debcf74297c19930075017e179
* | | am e097efde: am b05eeaed: camera3: Fix crash in set error state.Zhijun He2013-06-061-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit 'e097efde4363f80d5ffc34da6ec6253fbd4e5397': camera3: Fix crash in set error state.
| * | camera3: Fix crash in set error state.Zhijun He2013-06-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | When camera open fails in camera3device initialize call, setErrorStateLockedV() tries to access RequestThread object that is not created yet. Bug: 9319518 Change-Id: Id5c6c0150ecaecb198045d5c6eb1b2ceebf5a727
* | | am 1d263b89: am 62a8f67f: camera2/3: Add protection to callback processing callZhijun He2013-06-061-0/+7
|\ \ \ | |/ / | | | | | | | | | * commit '1d263b89bd1c5d73389f53976e104dd6b088ab6e': camera2/3: Add protection to callback processing call
| * | camera2/3: Add protection to callback processing callZhijun He2013-06-061-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | Callback stream in callbackprocessor could be delleted while process or discard callback are ongoing, which leads CpuConsumer related call crash. Bug 9303911 Change-Id: Ib6137e512208e5603468eba166640729b744e8f9
* | | am 4dd110ae: am 254446a8: Camera2/3: Move recording frame processing to its ↵Eino-Ville Talvala2013-06-053-12/+61
|\ \ \ | |/ / | | | | | | | | | | | | | | | own thread. * commit '4dd110ae6d9f00e1ec036f697045f4b3326b7873': Camera2/3: Move recording frame processing to its own thread.
| * | Camera2/3: Move recording frame processing to its own thread.Eino-Ville Talvala2013-06-043-12/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | Due to new deadlock opportunities from HAL3 integration, recording frame processing needs to move out of the new frame handler into its own thread in StreamingProcessor. Bug: 9282913 Change-Id: I8d2926f2de9d0d395eef3c328c65caebbdbd2827
* | | am cbbd6c83: am 8f908c0c: Merge "Camera2/3: Don\'t trigger AF when in ↵Eino-Ville Talvala2013-06-041-1/+10
|\ \ \ | |/ / | | / | |/ |/| | | | | INFINITY focus mode." into jb-mr2-dev * commit 'cbbd6c8354f7323933081b217ce53461d99215c4': Camera2/3: Don't trigger AF when in INFINITY focus mode.
| * Camera2/3: Don't trigger AF when in INFINITY focus mode.Eino-Ville Talvala2013-06-031-1/+10
| | | | | | | | | | | | | | | | | | | | While the HAL should ignore it, it's faster to immediately respond with success. Also filter out cancel autofocus calls for FIXED/INFINITY focus. Bug: 9263856 Change-Id: I637ec7c8b459d654ef11cb1142b959f2674224c5
* | camera: Dont segfault when result lacks timestampAlex Ray2013-05-301-3/+2
| | | | | | | | | | | | Also make a log message more useful. Change-Id: Id8b65a9b55e1ebe41598dc2db4b0b2aa3f161965
* | camera3: Error on minimum buffer countAlex Ray2013-05-291-2/+7
| | | | | | | | Change-Id: Idf16de20e940e411286ec3e477534b36ef1c9b11
* | Camera: static parameter default valuesAlex Ray2013-05-281-43/+51
| | | | | | | | | | | | Use sane default values for static metadata parameters. Change-Id: I180d9b6560ebba468a083e847b78e02b845db788
* | libcameraservice: missing argument when loggingAlex Ray2013-05-281-1/+2
| | | | | | | | Change-Id: I6f3da400f8f47a387968b9da4ee7cd8e0c9dea70
* | am 9f013a46: am 3c89a2e9: Merge "camera3: Don\'t try to disconnect stream ↵Igor Murashkin2013-05-284-2/+15
|\ \ | |/ | | | | | | | | | | native windows more than once" into jb-mr2-dev * commit '9f013a46e150da01ebb267574d8095eef399cd0c': camera3: Don't try to disconnect stream native windows more than once
| * 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
* | | am 22a5ddb6: am 6f6b31da: Merge "Camera3: Fix the deadlock during recording ↵Zhijun He2013-05-242-3/+15
|\ \ \ | |/ / | | | | | | | | | | | | | | | pinch zooming" into jb-mr2-dev * commit '22a5ddb68173b75053d838a30d091920cd0a1dca': Camera3: Fix the deadlock during recording pinch zooming
| * | 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
* | | | am 14e585c8: am 6947f125: Merge "camera3: Disable ZSL for limited mode ↵Ed Heyl2013-05-241-5/+13
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | camera HALs" into jb-mr2-dev * commit '14e585c8e0667c13202dbefc52f9d00ffe161cf1': camera3: Disable ZSL for limited mode camera HALs
| * | | 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
* | | | | stagefright: BufferProducer updatesLajos Molnar2013-05-231-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update BufferQueue and ConsumerBase users to new BufferQueue API, to allow BufferQueue slots to be reused. Buffer consumers generally now need to track the unique frameNumber belonging to each frame acquired if they are using BufferQueue directly. Otherwise, they can simply track the graphicBuffer. Change-Id: I30ee3158cf40fb10bbd085241646d5f1128ee480 Signed-off-by: Lajos Molnar <lajos@google.com> Related-to-bug: 7093648
* | | | | am 9b89c15d: am ca3fb120: Merge "camera3: Fix zsl buffers ↵Igor Murashkin2013-05-232-12/+20
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | released-while-in-use race condition" into jb-mr2-dev * commit '9b89c15d9d8abb9408760ffdb022df4c4367685b': camera3: Fix zsl buffers released-while-in-use race condition
| * | | | 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
* | | am 98730cd7: am 1f7f83b7: Merge "Camera3: Make sure new metadata results ↵Igor Murashkin2013-05-233-0/+39
|\ \ \ | |/ / | | | | | | | | | | | | | | | signal other threads waiting" into jb-mr2-dev * commit '98730cd7456b32255a37d691a70f49df22975a72': Camera3: Make sure new metadata results signal other threads waiting
| * | 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
* | | am b7337d56: am ed49d7b5: Merge "camera3: Fix recording failure when ↵Igor Murashkin2013-05-223-4/+27
|\ \ \ | |/ / | | | | | | | | | | | | | | | switching resolutions while preview on" into jb-mr2-dev * commit 'b7337d56a72c9b20abf57e853953126d0aa3dd1a': camera3: Fix recording failure when switching resolutions while preview on
| * | Merge "camera3: Fix recording failure when switching resolutions while ↵Igor Murashkin2013-05-223-4/+27
| |\ \ | | | | | | | | | | | | preview on" into jb-mr2-dev
generated by cgit v1.1 at 2024-05-30 12:53:20 +0000