OSDN Git Service
Eino-Ville Talvala [Wed, 19 Jun 2013 21:23:22 +0000 (14:23 -0700)]
am
e6478de7: Camera2/3: Avoid shutdown race in callback processor.
* commit '
e6478de72a8ae1d3abb3e8c20898977c45354a4f':
Camera2/3: Avoid shutdown race in callback processor.
Eino-Ville Talvala [Wed, 19 Jun 2013 15:42:17 +0000 (08:42 -0700)]
Camera2/3: Avoid shutdown race in callback processor.
It's possible, during shutdown, for callback processor's heap to be
destroyed when it's about to send the callback back to the user.
Properly copy the heap reference to a local variable before unlocking
the mutex.
Bug:
9485959
Change-Id: I301347b77145f19c7ac721b9127dc74f122acce2
Eino-Ville Talvala [Mon, 17 Jun 2013 23:23:56 +0000 (16:23 -0700)]
am
241b5279: Camera3: Power: Properly shut down unused thread.
* commit '
241b52798809d8db3d369af05ace1f73f723f29b':
Camera3: Power: Properly shut down unused thread.
Eino-Ville Talvala [Mon, 17 Jun 2013 20:29:16 +0000 (13:29 -0700)]
Camera3: Power: Properly shut down unused thread.
Bug:
9466221
Change-Id: I9ed0740561b2e04954eebc1b8aec89cfab40a3a0
The Android Open Source Project [Sun, 16 Jun 2013 14:44:00 +0000 (07:44 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I2ab98a5fccea49e0f4e6d22fddca485ad50b63b8
The Android Automerger [Sun, 16 Jun 2013 12:55:26 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Eino-Ville Talvala [Fri, 14 Jun 2013 15:35:48 +0000 (08:35 -0700)]
am
26bc908b: Camera2/3: Make sure to wait for idle after still capture.
* commit '
26bc908b3dafb5d80f092a22c5c71116526eae06':
Camera2/3: Make sure to wait for idle after still capture.
Eino-Ville Talvala [Fri, 14 Jun 2013 15:35:48 +0000 (08:35 -0700)]
am
214a17fd: Camera3: Always close HAL device even in face of errors.
* commit '
214a17fd37ef85fc841d3157b1e9096e1aa1b42f':
Camera3: Always close HAL device even in face of errors.
Glenn Kasten [Fri, 14 Jun 2013 12:48:38 +0000 (05:48 -0700)]
Glenn Kasten [Fri, 14 Jun 2013 12:43:03 +0000 (05:43 -0700)]
Glenn Kasten [Fri, 14 Jun 2013 12:39:16 +0000 (12:39 +0000)]
Merge "Fix typo."
Eino-Ville Talvala [Fri, 14 Jun 2013 01:04:28 +0000 (18:04 -0700)]
Camera2/3: Make sure to wait for idle after still capture.
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
Eino-Ville Talvala [Thu, 13 Jun 2013 19:20:02 +0000 (12:20 -0700)]
Camera3: Always close HAL device even in face of errors.
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
Eino-Ville Talvala [Thu, 13 Jun 2013 17:34:07 +0000 (10:34 -0700)]
am
1191454a: Merge "Camera3: Skipping no-ops good, not updating state machine bad." into jb-mr2-dev
* commit '
1191454a3a960a1972b0f36e625796c6c1b2c9ca':
Camera3: Skipping no-ops good, not updating state machine bad.
Eino-Ville Talvala [Thu, 13 Jun 2013 17:34:07 +0000 (10:34 -0700)]
am
c4a8d2dd: Merge "Camera2/3: Create JPEG stream unconditionally." into jb-mr2-dev
* commit '
c4a8d2ddfff6d91e493692251733f20ece3e713d':
Camera2/3: Create JPEG stream unconditionally.
Eino-Ville Talvala [Thu, 13 Jun 2013 17:33:20 +0000 (17:33 +0000)]
Merge "Camera3: Skipping no-ops good, not updating state machine bad." into jb-mr2-dev
Eino-Ville Talvala [Thu, 13 Jun 2013 17:33:07 +0000 (17:33 +0000)]
Merge "Camera2/3: Create JPEG stream unconditionally." into jb-mr2-dev
The Android Open Source Project [Thu, 13 Jun 2013 15:22:42 +0000 (08:22 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Id9419bf573d550f1ebebcc96fe615e1aaf8f36ef
The Android Automerger [Thu, 13 Jun 2013 12:55:17 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Open Source Project [Thu, 13 Jun 2013 01:04:12 +0000 (18:04 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I024b04bf1e47cc7c10209e83f640cc6f12e03274
Eino-Ville Talvala [Thu, 13 Jun 2013 00:06:41 +0000 (17:06 -0700)]
Camera3: Skipping no-ops good, not updating state machine bad.
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
Eric Laurent [Tue, 11 Jun 2013 21:38:48 +0000 (14:38 -0700)]
audioflinger: fix effects on direct output threads
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
Lajos Molnar [Wed, 12 Jun 2013 16:29:43 +0000 (09:29 -0700)]
am
0662f7b6: Merge "stagefright: synchronously change nativewindow crop" into jb-mr2-dev
* commit '
0662f7b6735df0a140f6512285d05f8f9a38bb98':
stagefright: synchronously change nativewindow crop
Lajos Molnar [Wed, 12 Jun 2013 16:27:40 +0000 (16:27 +0000)]
Merge "stagefright: synchronously change nativewindow crop" into jb-mr2-dev
Eric Laurent [Wed, 12 Jun 2013 15:46:03 +0000 (08:46 -0700)]
am
7be48189: Merge "audioflinger: fix effects on direct output threads" into jb-mr2-dev
* commit '
7be48189c0aefb82825a7689d9e1005175570779':
audioflinger: fix effects on direct output threads
Eric Laurent [Wed, 12 Jun 2013 15:44:42 +0000 (15:44 +0000)]
Merge "audioflinger: fix effects on direct output threads" into jb-mr2-dev
The Android Open Source Project [Wed, 12 Jun 2013 14:23:29 +0000 (07:23 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I87a7986866714bfd922259cf961d6d5f5b752362
The Android Automerger [Wed, 12 Jun 2013 12:55:52 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Lajos Molnar [Wed, 12 Jun 2013 00:56:24 +0000 (17:56 -0700)]
stagefright: synchronously change nativewindow crop
Only change the nativewindow crop before queuing frames
with the new crop.
Change-Id: Icd8a84c82e66a8be3d6bc1675c777b1de8dc39b9
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug:
9395753
Eino-Ville Talvala [Wed, 12 Jun 2013 01:21:05 +0000 (18:21 -0700)]
am
ea26c777: Camera3: Skip no-op stream configurations.
* commit '
ea26c7772f4721657db409068d4bed194ae49c94':
Camera3: Skip no-op stream configurations.
Eino-Ville Talvala [Tue, 11 Jun 2013 23:04:06 +0000 (16:04 -0700)]
Camera3: Skip no-op stream configurations.
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
Eric Laurent [Tue, 11 Jun 2013 21:38:48 +0000 (14:38 -0700)]
audioflinger: fix effects on direct output threads
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
Eino-Ville Talvala [Mon, 10 Jun 2013 22:12:01 +0000 (15:12 -0700)]
Camera2/3: Create JPEG stream unconditionally.
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
The Android Open Source Project [Mon, 10 Jun 2013 15:13:42 +0000 (08:13 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: I9864de7c2785357cea0c4b669607fee76e9f09e8
The Android Automerger [Sun, 9 Jun 2013 12:55:29 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Zhijun He [Thu, 6 Jun 2013 23:52:02 +0000 (16:52 -0700)]
camera2/3: Fix deadlock take picture while preview callback
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
Zhijun He [Fri, 7 Jun 2013 16:59:47 +0000 (09:59 -0700)]
am
ba696bbf: Merge "camera2/3: Fix deadlock take picture while preview callback" into jb-mr2-dev
* commit '
ba696bbff88d5627beaa0be95be78ba30138983d':
camera2/3: Fix deadlock take picture while preview callback
Zhijun He [Fri, 7 Jun 2013 16:58:12 +0000 (16:58 +0000)]
Merge "camera2/3: Fix deadlock take picture while preview callback" into jb-mr2-dev
Eric Laurent [Fri, 7 Jun 2013 15:57:00 +0000 (08:57 -0700)]
am
18b46679: Merge "AudioFlinger: do not cache audio device when 0." into jb-mr2-dev
* commit '
18b466790aa0a55ff4282ed8b5e550e58e0444b2':
AudioFlinger: do not cache audio device when 0.
Eric Laurent [Fri, 7 Jun 2013 15:52:59 +0000 (15:52 +0000)]
Merge "AudioFlinger: do not cache audio device when 0." into jb-mr2-dev
Glenn Kasten [Fri, 7 Jun 2013 14:09:39 +0000 (07:09 -0700)]
am
911a184b: am
132bc5bd: Merge "Noise will be heard if audio sample rate not matched with audio track"
* commit '
911a184bb5f5177a00bb4a8c80453f22e67b449c':
Noise will be heard if audio sample rate not matched with audio track
Glenn Kasten [Fri, 7 Jun 2013 14:06:15 +0000 (07:06 -0700)]
am
132bc5bd: Merge "Noise will be heard if audio sample rate not matched with audio track"
* commit '
132bc5bd1c68aa807a20e1655f009f74433be588':
Noise will be heard if audio sample rate not matched with audio track
Glenn Kasten [Fri, 7 Jun 2013 14:04:45 +0000 (14:04 +0000)]
Merge "Noise will be heard if audio sample rate not matched with audio track"
Ming Zhou [Wed, 27 Feb 2013 09:12:37 +0000 (17:12 +0800)]
Noise will be heard if audio sample rate not matched with audio track
When audio sample rate which set to audio track is not the same with
the actual pcm data, noise will be heard. Fix the bug when write 8 bit
pcm samples.
Change-Id: Idcb0d7b0e9aaa250dd22b758c8337e23d1706049
Signed-off-by: Ming Zhou <b42586@freescale.com>
Signed-off-by: guoyin.chen <guoyin.chen@freescale.com>
Eric Laurent [Fri, 7 Jun 2013 01:29:01 +0000 (18:29 -0700)]
AudioFlinger: do not cache audio device when 0.
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
Zhijun He [Thu, 6 Jun 2013 23:52:02 +0000 (16:52 -0700)]
camera2/3: Fix deadlock take picture while preview callback
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
Zhijun He [Thu, 6 Jun 2013 20:51:22 +0000 (13:51 -0700)]
camera3: Fix crash in set error state.
When camera open fails in camera3device initialize call, setErrorStateLockedV()
tries to access RequestThread object that is not created yet.
Bug:
9319518
Change-Id: Id5c6c0150ecaecb198045d5c6eb1b2ceebf5a727
Zhijun He [Thu, 6 Jun 2013 03:00:09 +0000 (20:00 -0700)]
camera2/3: Add protection to callback processing call
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
Zhijun He [Thu, 6 Jun 2013 21:18:06 +0000 (14:18 -0700)]
am
b05eeaed: camera3: Fix crash in set error state.
* commit '
b05eeaedacaff92b6e5ac89f99b0fccdf7643f09':
camera3: Fix crash in set error state.
Zhijun He [Thu, 6 Jun 2013 20:51:22 +0000 (13:51 -0700)]
camera3: Fix crash in set error state.
When camera open fails in camera3device initialize call, setErrorStateLockedV()
tries to access RequestThread object that is not created yet.
Bug:
9319518
Change-Id: Id5c6c0150ecaecb198045d5c6eb1b2ceebf5a727
Zhijun He [Thu, 6 Jun 2013 18:09:54 +0000 (11:09 -0700)]
am
62a8f67f: camera2/3: Add protection to callback processing call
* commit '
62a8f67f33faf19d0ff815672dd19bb71dd0d650':
camera2/3: Add protection to callback processing call
Zhijun He [Thu, 6 Jun 2013 03:00:09 +0000 (20:00 -0700)]
camera2/3: Add protection to callback processing call
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
The Android Open Source Project [Thu, 6 Jun 2013 17:37:16 +0000 (10:37 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: I0aa9bb7e725a8352da3eae512c2a62df4f12e3b3
The Android Automerger [Thu, 6 Jun 2013 12:55:27 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Masaki Muranaka [Thu, 6 Jun 2013 09:36:34 +0000 (09:36 +0000)]
Fix typo.
Change-Id: Ia72ed2bef54751dc2d6c3379a58de95a0e9ebfdd
Eino-Ville Talvala [Tue, 4 Jun 2013 23:34:35 +0000 (16:34 -0700)]
Camera2/3: Move recording frame processing to its own thread.
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
Lajos Molnar [Fri, 26 Apr 2013 23:11:45 +0000 (16:11 -0700)]
stagefright: Fix port-reconfiguration & output-buffer-filled race condition
Remove the invalid assumption that when a port-reconfiguration event
is received, buffers cannot be downstream (waiting to be rendered).
Luckily, these buffers are properly handled (freed) after they are
sent to be rendered.
Change-Id: I1df39c1ffc2bfb96f8b7b4ee5be07cae654f956f
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug:
8736466
Eino-Ville Talvala [Wed, 5 Jun 2013 18:43:49 +0000 (11:43 -0700)]
am
254446a8: Camera2/3: Move recording frame processing to its own thread.
* commit '
254446a80cb13d5beb606bfc3e60a17473869478':
Camera2/3: Move recording frame processing to its own thread.
The Android Automerger [Wed, 5 Jun 2013 17:11:30 +0000 (10:11 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Eino-Ville Talvala [Tue, 4 Jun 2013 23:34:35 +0000 (16:34 -0700)]
Camera2/3: Move recording frame processing to its own thread.
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
Eino-Ville Talvala [Mon, 3 Jun 2013 23:50:53 +0000 (16:50 -0700)]
Camera2/3: Don't trigger AF when in INFINITY focus mode.
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
Eino-Ville Talvala [Tue, 4 Jun 2013 16:19:14 +0000 (09:19 -0700)]
am
8f908c0c: Merge "Camera2/3: Don\'t trigger AF when in INFINITY focus mode." into jb-mr2-dev
* commit '
8f908c0c211f8051f339bc85b01a6450f0dfd7d0':
Camera2/3: Don't trigger AF when in INFINITY focus mode.
Eino-Ville Talvala [Tue, 4 Jun 2013 16:17:17 +0000 (16:17 +0000)]
Merge "Camera2/3: Don't trigger AF when in INFINITY focus mode." into jb-mr2-dev
Eino-Ville Talvala [Mon, 3 Jun 2013 23:50:53 +0000 (16:50 -0700)]
Camera2/3: Don't trigger AF when in INFINITY focus mode.
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
Lajos Molnar [Mon, 3 Jun 2013 20:32:36 +0000 (13:32 -0700)]
am
25b5617c: Merge "stagefright: Fix port-reconfiguration & output-buffer-filled race condition" into jb-mr2-dev
* commit '
25b5617c56488fe5413473ffae6b43f6c5bddc96':
stagefright: Fix port-reconfiguration & output-buffer-filled race condition
Lajos Molnar [Mon, 3 Jun 2013 20:30:48 +0000 (20:30 +0000)]
Merge "stagefright: Fix port-reconfiguration & output-buffer-filled race condition" into jb-mr2-dev
Andreas Huber [Mon, 3 Jun 2013 15:46:18 +0000 (08:46 -0700)]
am
b7319a7e: Update HTTP proxy configuration for all media playback inside stagefright.
* commit '
b7319a7eb0a06ef4fd3a0c9157ee63e637ad7aa1':
Update HTTP proxy configuration for all media playback inside stagefright.
Andreas Huber [Wed, 29 May 2013 21:20:52 +0000 (14:20 -0700)]
Update HTTP proxy configuration for all media playback inside stagefright.
Change-Id: Ie0dd00045aba668d8b49da73224e7a7c9c04f69b
related-to-bug:
8873723
(cherry picked from commit
2704965b8a1ff3b7450ff58ccecf86d8ec688c40)
Lajos Molnar [Fri, 26 Apr 2013 23:11:45 +0000 (16:11 -0700)]
stagefright: Fix port-reconfiguration & output-buffer-filled race condition
Remove the invalid assumption that when a port-reconfiguration event
is received, buffers cannot be downstream (waiting to be rendered).
Luckily, these buffers are properly handled (freed) after they are
sent to be rendered.
Change-Id: I1df39c1ffc2bfb96f8b7b4ee5be07cae654f956f
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug:
8736466
The Android Open Source Project [Thu, 30 May 2013 14:31:31 +0000 (07:31 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Ia17841b4d49f0fe09e1034ff0b28efe55947f03a
The Android Automerger [Thu, 30 May 2013 12:55:32 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Lajos Molnar [Wed, 29 May 2013 22:14:04 +0000 (15:14 -0700)]
am
41688da2: Merge "MediaMuxer: Remove SAMPLE_FLAG_SYNC flag" into jb-mr2-dev
* commit '
41688da226e91c97ea3b2fe096044e1e5b0520bc':
MediaMuxer: Remove SAMPLE_FLAG_SYNC flag
Lajos Molnar [Wed, 29 May 2013 19:11:25 +0000 (19:11 +0000)]
Merge "MediaMuxer: Remove SAMPLE_FLAG_SYNC flag" into jb-mr2-dev
The Android Open Source Project [Wed, 29 May 2013 15:05:57 +0000 (08:05 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I55d8c1a91b9750864f82176768ea93bf11337726
The Android Automerger [Wed, 29 May 2013 12:55:12 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Igor Murashkin [Tue, 28 May 2013 23:49:02 +0000 (16:49 -0700)]
am
3c89a2e9: Merge "camera3: Don\'t try to disconnect stream native windows more than once" into jb-mr2-dev
* commit '
3c89a2e9d4ee10b9e955783af2ab9e9dd137922f':
camera3: Don't try to disconnect stream native windows more than once
Igor Murashkin [Tue, 28 May 2013 23:47:00 +0000 (23:47 +0000)]
Merge "camera3: Don't try to disconnect stream native windows more than once" into jb-mr2-dev
Lajos Molnar [Tue, 28 May 2013 17:11:35 +0000 (10:11 -0700)]
MediaMuxer: Remove SAMPLE_FLAG_SYNC flag
MediaMuxer.writeSampleData() uses MediaCodec.BufferInfo
objects to specify the flags, so use directly the MediaCodec
flags. This is more intuitive and avoids users of the
MediaMuxer API having to create translations between
MediaMuxer's and MediaCodec's flag constants.
Change-Id: I18e12a6839ffb2c63da62516a4dc4c94e8bb3d17
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug:
9169479
Igor Murashkin [Tue, 28 May 2013 22:31:39 +0000 (15:31 -0700)]
camera3: Don't try to disconnect stream native windows more than once
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
The Android Open Source Project [Tue, 28 May 2013 14:37:26 +0000 (07:37 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Id0d9ce35d7c0fe8ec3d2edd00e42df41fba064ea
The Android Automerger [Sun, 26 May 2013 12:55:19 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Open Source Project [Fri, 24 May 2013 22:28:17 +0000 (15:28 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Icbc5d05e35b35baffce494c53fca9caf82658760
Zhijun He [Wed, 22 May 2013 21:01:30 +0000 (14:01 -0700)]
Camera3: Fix the deadlock during recording pinch zooming
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
Zhijun He [Fri, 24 May 2013 15:34:46 +0000 (08:34 -0700)]
am
6f6b31da: Merge "Camera3: Fix the deadlock during recording pinch zooming" into jb-mr2-dev
* commit '
6f6b31da6097f1d770137ebadac5023dd8b79413':
Camera3: Fix the deadlock during recording pinch zooming
Zhijun He [Fri, 24 May 2013 15:32:48 +0000 (15:32 +0000)]
Merge "Camera3: Fix the deadlock during recording pinch zooming" into jb-mr2-dev
Ed Heyl [Fri, 24 May 2013 05:17:51 +0000 (22:17 -0700)]
am
6947f125: Merge "camera3: Disable ZSL for limited mode camera HALs" into jb-mr2-dev
* commit '
6947f125f76dde6664779126415d11b3365225da':
camera3: Disable ZSL for limited mode camera HALs
Igor Murashkin [Thu, 23 May 2013 23:51:44 +0000 (16:51 -0700)]
camera3: Disable ZSL for limited mode camera HALs
Bug:
9111852
Change-Id: Idad7e0d2f912341bd643d0ad1a0861fb2043aa90
Ed Heyl [Fri, 24 May 2013 05:15:23 +0000 (05:15 +0000)]
Merge "camera3: Disable ZSL for limited mode camera HALs" into jb-mr2-dev
Igor Murashkin [Wed, 22 May 2013 22:54:57 +0000 (15:54 -0700)]
camera3: Fix zsl buffers released-while-in-use race condition
Bug:
9007356
Change-Id: I0ced31020410978c549d408b2815f925e9c9ffcf
Igor Murashkin [Thu, 23 May 2013 23:51:44 +0000 (16:51 -0700)]
camera3: Disable ZSL for limited mode camera HALs
Bug:
9111852
Change-Id: Idad7e0d2f912341bd643d0ad1a0861fb2043aa90
Igor Murashkin [Thu, 23 May 2013 20:44:15 +0000 (13:44 -0700)]
am
ca3fb120: Merge "camera3: Fix zsl buffers released-while-in-use race condition" into jb-mr2-dev
* commit '
ca3fb120f5697c05e3ea1a50abe913a9cc4a8d73':
camera3: Fix zsl buffers released-while-in-use race condition
Igor Murashkin [Thu, 23 May 2013 20:42:32 +0000 (20:42 +0000)]
Merge "camera3: Fix zsl buffers released-while-in-use race condition" into jb-mr2-dev
Zhijun He [Wed, 22 May 2013 21:01:30 +0000 (14:01 -0700)]
Camera3: Fix the deadlock during recording pinch zooming
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
Igor Murashkin [Thu, 23 May 2013 18:01:51 +0000 (11:01 -0700)]
am
1f7f83b7: Merge "Camera3: Make sure new metadata results signal other threads waiting" into jb-mr2-dev
* commit '
1f7f83b7a1f2e2d01f808913ef0b869652c08949':
Camera3: Make sure new metadata results signal other threads waiting
Igor Murashkin [Thu, 23 May 2013 17:57:16 +0000 (17:57 +0000)]
Merge "Camera3: Make sure new metadata results signal other threads waiting" into jb-mr2-dev
The Android Open Source Project [Thu, 23 May 2013 15:05:05 +0000 (08:05 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I93c0800a90b8c82a59e9f2de7d89d78bf8304733
The Android Automerger [Thu, 23 May 2013 12:55:17 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Igor Murashkin [Wed, 22 May 2013 22:54:57 +0000 (15:54 -0700)]
camera3: Fix zsl buffers released-while-in-use race condition
Bug:
9007356
Change-Id: I0ced31020410978c549d408b2815f925e9c9ffcf
Igor Murashkin [Wed, 22 May 2013 19:56:26 +0000 (12:56 -0700)]
am
ed49d7b5: Merge "camera3: Fix recording failure when switching resolutions while preview on" into jb-mr2-dev
* commit '
ed49d7b57e66cc2520817b345ef9de289d688bd4':
camera3: Fix recording failure when switching resolutions while preview on
Igor Murashkin [Wed, 22 May 2013 19:54:28 +0000 (19:54 +0000)]
Merge "camera3: Fix recording failure when switching resolutions while preview on" into jb-mr2-dev
OSDN Git Service
