summaryrefslogtreecommitdiffstats
path: root/services
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.
| * am 241b5279: Camera3: Power: Properly shut down unused thread.Eino-Ville Talvala2013-06-171-2/+3
| |\ | | | | | | | | | | | | * commit '241b52798809d8db3d369af05ace1f73f723f29b': 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.
| * | am 26bc908b: Camera2/3: Make sure to wait for idle after still capture.Eino-Ville Talvala2013-06-141-0/+6
| |\ \ | | |/ | | | | | | | | | * commit '26bc908b3dafb5d80f092a22c5c71116526eae06': 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.
| * | am 214a17fd: Camera3: Always close HAL device even in face of errors.Eino-Ville Talvala2013-06-141-10/+20
| |\ \ | | |/ | | | | | | | | | * commit '214a17fd37ef85fc841d3157b1e9096e1aa1b42f': 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.
| * | | am 1191454a: Merge "Camera3: Skipping no-ops good, not updating state ↵Eino-Ville Talvala2013-06-131-0/+1
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | machine bad." into jb-mr2-dev * commit '1191454a3a960a1972b0f36e625796c6c1b2c9ca': 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.
| * | | | am c4a8d2dd: Merge "Camera2/3: Create JPEG stream unconditionally." into ↵Eino-Ville Talvala2013-06-131-12/+16
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev * commit 'c4a8d2ddfff6d91e493692251733f20ece3e713d': 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
* | | | | New control block for AudioTrack and AudioRecordGlenn Kasten2013-06-126-211/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Main differences between old and new control block: - removes the mutex, which was a potential source of priority inversion - circular indices into shared buffer, which is now always a power-of-2 size Change-Id: I4e9b7fa99858b488ac98a441fa70e31dbba1b865
* | | | | am bb35be24: am 7be48189: Merge "audioflinger: fix effects on direct output ↵Eric Laurent2013-06-121-7/+5
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | | | | | | | | | threads" into jb-mr2-dev * commit 'bb35be24239f05f59715960a93cd491a4cd3b4d6': audioflinger: fix effects on direct output threads
| * | | am 7be48189: Merge "audioflinger: fix effects on direct output threads" into ↵Eric Laurent2013-06-121-7/+5
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | jb-mr2-dev * commit '7be48189c0aefb82825a7689d9e1005175570779': audioflinger: fix effects on direct output threads
| | * | Merge "audioflinger: fix effects on direct output threads" into jb-mr2-devEric Laurent2013-06-121-7/+5
| | |\ \
| | | * | audioflinger: fix effects on direct output threadsEric Laurent2013-06-111-7/+5
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PlaybackThread::addTrack_l() uses the assumption that effects are attached to a track only if the track accumulation buffer is different from the mixer thread output buffer. This is not true for direct output threads where only one track is active an only one buffer is needed. This assumption is an optimization to avoid checking for effect chains with the same session ID each time a track is processed. The optimization is not key if only one track is attached to the thread which is the case for direct outputs. Current code fails to increment the active track count in the effect chain on direct output threads when a track is started thus making the effect framework clear the mix buffer and produce silence each time the mixer runs. The fix consists in removing the optimization described above. Bug: 9324989. Change-Id: Id7a6337450ed90d326299c2ce9fc02f4b9e2fa6f
* | | | 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.
| * | | am ea26c777: Camera3: Skip no-op stream configurations.Eino-Ville Talvala2013-06-112-0/+10
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'ea26c7772f4721657db409068d4bed194ae49c94': 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
| * | | am ba696bbf: Merge "camera2/3: Fix deadlock take picture while preview ↵Zhijun He2013-06-071-87/+88
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | callback" into jb-mr2-dev * commit 'ba696bbff88d5627beaa0be95be78ba30138983d': camera2/3: Fix deadlock take picture while preview callback
| | * | Merge "camera2/3: Fix deadlock take picture while preview callback" into ↵Zhijun He2013-06-071-87/+88
| | |\ \ | | | | | | | | | | | | | | | jb-mr2-dev
| | | * | 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 d3a5b48a: am 18b46679: Merge "AudioFlinger: do not cache audio device ↵Eric Laurent2013-06-072-4/+6
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | when 0." into jb-mr2-dev * commit 'd3a5b48a1bc4f5d6ff4472f54f909abaadd5fa39': AudioFlinger: do not cache audio device when 0.
| * | | | am 18b46679: Merge "AudioFlinger: do not cache audio device when 0." into ↵Eric Laurent2013-06-072-4/+6
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev * commit '18b466790aa0a55ff4282ed8b5e550e58e0444b2': AudioFlinger: do not cache audio device when 0.
| | * | | Merge "AudioFlinger: do not cache audio device when 0." into jb-mr2-devEric Laurent2013-06-072-4/+6
| | |\ \ \ | | | |/ / | | |/| |
| | | * | AudioFlinger: do not cache audio device when 0.Eric Laurent2013-06-062-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioFlinger should not cache the audio device passed to the audio HAL when it is AUDIO_DEVICE_NONE but keep previous valid selection instead. Bug: 9323399. Change-Id: I6f9480e55a21be4115453e6a5eebc5cf2536c476
* | | | | 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.
| * | | | am b05eeaed: camera3: Fix crash in set error state.Zhijun He2013-06-061-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'b05eeaedacaff92b6e5ac89f99b0fccdf7643f09': 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
| * | | am 62a8f67f: camera2/3: Add protection to callback processing callZhijun He2013-06-061-0/+7
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '62a8f67f33faf19d0ff815672dd19bb71dd0d650': 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.
| * | | am 254446a8: Camera2/3: Move recording frame processing to its own thread.Eino-Ville Talvala2013-06-053-12/+61
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '254446a80cb13d5beb606bfc3e60a17473869478': 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.
| * | am 8f908c0c: Merge "Camera2/3: Don\'t trigger AF when in INFINITY focus ↵Eino-Ville Talvala2013-06-041-1/+10
| |\ \ | | |/ | | | | | | | | | | | | | | | mode." into jb-mr2-dev * commit '8f908c0c211f8051f339bc85b01a6450f0dfd7d0': 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
* | | Merge "Consistent whitespace"Glenn Kasten2013-05-313-10/+25
|\ \ \