OSDN Git Service
Igor Murashkin [Tue, 25 Jun 2013 00:38:03 +0000 (00:38 +0000)]
Merge changes I5b2eeab2,I71568560
* changes:
Make android.hardware.photography.Camera work on HAL3+ devices
Initial implementation of android.hardware.photography.CameraDevice (service)
Lajos Molnar [Mon, 24 Jun 2013 17:47:54 +0000 (17:47 +0000)]
Merge "stagefright: support for video decoder metadata mode"
Lajos Molnar [Thu, 2 May 2013 23:37:36 +0000 (16:37 -0700)]
stagefright: support for video decoder metadata mode
Change-Id: Id360f29236798163f9f3a82135f601083a8a5058
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug:
7093648
The Android Open Source Project [Fri, 21 Jun 2013 18:58:20 +0000 (11:58 -0700)]
am
e6105c26: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
e6105c26a5b506f96e9fe1d3fec64a8b2ed1d6dd':
The Android Open Source Project [Fri, 21 Jun 2013 18:56:55 +0000 (11:56 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Id1c9edbb5b7b398fb863cbbd79e673ab2c10df9a
The Android Automerger [Fri, 21 Jun 2013 18:35:26 +0000 (11:35 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Jean-Michel Trivi [Fri, 21 Jun 2013 05:26:08 +0000 (22:26 -0700)]
am
455479bc: am
209bbbcf: Apply EQ and bass boost first in effect chain
* commit '
455479bc2c6a88746d4801f3f5a0e8d9f8609528':
Apply EQ and bass boost first in effect chain
Jean-Michel Trivi [Fri, 21 Jun 2013 05:23:58 +0000 (22:23 -0700)]
am
209bbbcf: Apply EQ and bass boost first in effect chain
* commit '
209bbbcf4190231f9dede758cbe77d109919f9f1':
Apply EQ and bass boost first in effect chain
Igor Murashkin [Thu, 20 Jun 2013 02:51:04 +0000 (19:51 -0700)]
Make android.hardware.photography.Camera work on HAL3+ devices
Bug:
9213377
Change-Id: I5b2eeab28985f53dfcb7b8e3029930f5adcd74f5
Igor Murashkin [Wed, 12 Jun 2013 01:10:18 +0000 (18:10 -0700)]
Initial implementation of android.hardware.photography.CameraDevice (service)
* Verified preview streaming requests
* Other things *should* work but unverified / unimplemented in client side
Missing:
* CameraService needs to return static camera info metadata
Bug:
9213377
Change-Id: I71568560fcf18d0e2b408ed1c4d0066647314868
Alex Ray [Fri, 21 Jun 2013 00:55:00 +0000 (17:55 -0700)]
camera2/3: Warn on missing active array size parameters
Change-Id: I752659e1f0522392b902839cd7f4d997dcd85966
Jean-Michel Trivi [Thu, 20 Jun 2013 23:49:25 +0000 (16:49 -0700)]
Apply EQ and bass boost first in effect chain
EQ and bass boost can improperly interact with other effects
(e.g. virtualizer) outside of the bundle. Apply them first
in an effect chain, which is equivalent to using them to affect
the content of a track, rather than how a track is presented,
when additional effects are cascaded behind EQ and BB.
Bug
8589316
Change-Id: Ifb34e46bc1969f613cdc90ee2a79af677e2fad92
Glenn Kasten [Thu, 20 Jun 2013 22:18:16 +0000 (15:18 -0700)]
am
d3ac2fc0: am
f3e21c30: am
60f3f102: Merge "Prevent AudioCommands being freed before read"
* commit '
d3ac2fc0c5429003f69d161e42bba7e94434ec09':
Prevent AudioCommands being freed before read
Glenn Kasten [Thu, 20 Jun 2013 22:16:00 +0000 (15:16 -0700)]
am
f3e21c30: am
60f3f102: Merge "Prevent AudioCommands being freed before read"
* commit '
f3e21c301b8fef49eecf9c716373fcbfbaa47670':
Prevent AudioCommands being freed before read
Glenn Kasten [Thu, 20 Jun 2013 22:13:19 +0000 (15:13 -0700)]
am
60f3f102: Merge "Prevent AudioCommands being freed before read"
* commit '
60f3f102ba2973cc31e5c7ea00d95bbf19968e8b':
Prevent AudioCommands being freed before read
Glenn Kasten [Thu, 20 Jun 2013 22:11:25 +0000 (22:11 +0000)]
Merge "Prevent AudioCommands being freed before read"
Christer Fletcher [Fri, 18 Jan 2013 14:27:03 +0000 (15:27 +0100)]
Prevent AudioCommands being freed before read
When AudioCommandThread::threadLoop process AudioCommands it was
possible for it to delete a command where the posting thread still
hadn't read that status from it.
If a second command signaled the thread loop to continue after it
had inserted a new command while the thread loop was actually waiting
for the first command to report that it had read the status the
thread loop would continue and delete the first command.
Changed the wait condition when waiting for the calling thread to
read status to use command->mCond instead of mWaitWorkCV. This way
it's guaranteed that the signal to continue comes from the correct
thread.
Change-Id: Ia69b48cb4fdfaf8b4c83b56a197fb9f2058a92d1
Eino-Ville Talvala [Wed, 19 Jun 2013 21:25:08 +0000 (14:25 -0700)]
am
9c8714da: am
e6478de7: Camera2/3: Avoid shutdown race in callback processor.
* commit '
9c8714daaf6a402abd85557e9b652c86f0df86e4':
Camera2/3: Avoid shutdown race in callback processor.
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:29:19 +0000 (16:29 -0700)]
am
bda5d1f2: am
241b5279: Camera3: Power: Properly shut down unused thread.
* commit '
bda5d1f2a34f9b7ded0bc0441be4856e78ec066c':
Camera3: Power: Properly shut down unused thread.
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.
Marco Nelissen [Mon, 17 Jun 2013 23:16:09 +0000 (23:16 +0000)]
Merge "Speed up id3v2 unsynchronization"
Marco Nelissen [Mon, 17 Jun 2013 23:14:39 +0000 (16:14 -0700)]
Speed up id3v2 unsynchronization
Instead of doing many overlapping memmoves, do a single copy pass
that skips over the inserted unsynchronization bytes. For some
files this reduces parsing time from minutes to milliseconds.
b/
9463262
Change-Id: I735b7051e77a093d86fb7a3e46209875946225ed
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
Andreas Huber [Mon, 17 Jun 2013 16:12:02 +0000 (16:12 +0000)]
Merge "The software avc decoder would silently drop output frames if not"
The Android Open Source Project [Sun, 16 Jun 2013 14:45:34 +0000 (07:45 -0700)]
am
05e87d53: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
05e87d536ed2b7cf1d68135121b630031e5d56c2':
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
Andreas Huber [Fri, 14 Jun 2013 18:58:27 +0000 (11:58 -0700)]
The software avc decoder would silently drop output frames if not
enough room was available in the output queue at the time they were
available. No more.
Change-Id: I5957290d40ba31bda7944271ec7f2aa0f1f7043c
Eino-Ville Talvala [Fri, 14 Jun 2013 16:11:21 +0000 (09:11 -0700)]
am
0cc75491: am
26bc908b: Camera2/3: Make sure to wait for idle after still capture.
* commit '
0cc754918a3c1353164ccc5798f63b28f65db406':
Camera2/3: Make sure to wait for idle after still capture.
Eino-Ville Talvala [Fri, 14 Jun 2013 16:11:20 +0000 (09:11 -0700)]
am
e4a453d4: am
214a17fd: Camera3: Always close HAL device even in face of errors.
* commit '
e4a453d4b7563d1dab674df6ce52c291e63c6ca7':
Camera3: Always close HAL device even in face of errors.
Glenn Kasten [Fri, 14 Jun 2013 16:11:18 +0000 (09:11 -0700)]
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
Glenn Kasten [Fri, 14 Jun 2013 00:24:44 +0000 (00:24 +0000)]
Merge "AudioRecord must be used as sp<> only"
Alex Ray [Thu, 13 Jun 2013 23:15:59 +0000 (23:15 +0000)]
Merge "camera2: accept 4-value active array size"
Glenn Kasten [Thu, 13 Jun 2013 20:47:02 +0000 (13:47 -0700)]
AudioRecord must be used as sp<> only
Bug:
9423855
Change-Id: I78ba8228c60dff11fb466156bb632c5dda45cdaf
Alex Ray [Thu, 13 Jun 2013 18:22:47 +0000 (11:22 -0700)]
camera2: accept 4-value active array size
Change-Id: Ia320a022b201a938a025efc30a54c05fcfe5b02f
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:43:49 +0000 (10:43 -0700)]
am
ccc366a9: am
1191454a: Merge "Camera3: Skipping no-ops good, not updating state machine bad." into jb-mr2-dev
* commit '
ccc366a90fdd8d9df5de27820f04bc534d122c07':
Camera3: Skipping no-ops good, not updating state machine bad.
Eino-Ville Talvala [Thu, 13 Jun 2013 17:43:48 +0000 (10:43 -0700)]
am
4541531a: am
c4a8d2dd: Merge "Camera2/3: Create JPEG stream unconditionally." into jb-mr2-dev
* commit '
4541531a6e64329764ad7359775689a8f5aca165':
Camera2/3: Create JPEG stream unconditionally.
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:25:37 +0000 (08:25 -0700)]
am
a4539807: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
a45398078e4f798a34310a2d5213e07eefb14238':
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:06:09 +0000 (18:06 -0700)]
am
a1d73d9b: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
a1d73d9be0beafd10642d6db0136b16353a32096':
audioflinger: fix effects on direct output threads
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
Glenn Kasten [Tue, 18 Dec 2012 23:57:32 +0000 (15:57 -0800)]
New control block for AudioTrack and AudioRecord
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
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
Andreas Huber [Wed, 12 Jun 2013 17:26:19 +0000 (10:26 -0700)]
Converter now takes the desired _output_ format instead of the
input format, allowing control over the type of encoding.
Change-Id: Iaaa1a825f447ea130e373bbd8e5dc96f2762db18
Lajos Molnar [Wed, 12 Jun 2013 16:32:30 +0000 (09:32 -0700)]
am
f8af99b7: am
0662f7b6: Merge "stagefright: synchronously change nativewindow crop" into jb-mr2-dev
* commit '
f8af99b7c10f1441d9a52676724b168f20752270':
stagefright: synchronously change nativewindow crop
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:47:34 +0000 (08:47 -0700)]
am
bb35be24: am
7be48189: Merge "audioflinger: fix effects on direct output threads" into jb-mr2-dev
* commit '
bb35be24239f05f59715960a93cd491a4cd3b4d6':
audioflinger: fix effects on direct output threads
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:25:58 +0000 (07:25 -0700)]
am
765f99f3: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
765f99f30fdc18396ce4edc9facbe6632c9b858e':
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:23:26 +0000 (18:23 -0700)]
am
44ade05f: am
ea26c777: Camera3: Skip no-op stream configurations.
* commit '
44ade05f8d030ae3af8d05359734b18eac433935':
Camera3: Skip no-op stream configurations.
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
Igor Murashkin [Tue, 11 Jun 2013 20:44:58 +0000 (20:44 +0000)]
Merge "camera: Make some binder interfaces compatible with AIDL"
Igor Murashkin [Fri, 31 May 2013 00:47:38 +0000 (17:47 -0700)]
camera: Make some binder interfaces compatible with AIDL
Done:
* ICameraService
* ICameraServiceListener
Partial:
* ICamera (disconnect only)
* IProCameraUser (disconnect only)
Bug:
9213377
Change-Id: I8e2e6e05cfd02ec36be1d5b2c551f10ffb43b5b4
Eino-Ville Talvala [Mon, 10 Jun 2013 20:34:08 +0000 (20:34 +0000)]
Merge "Camera3: Add more tracing"
The Android Open Source Project [Mon, 10 Jun 2013 18:11:53 +0000 (11:11 -0700)]
am
6c72c187: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '
6c72c1877fadca5068fa94f7a0249c0609e85534':
camera2/3: Fix deadlock take picture while preview callback
camera3: Fix crash in set error state.
camera2/3: Add protection to callback processing call
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
Eino-Ville Talvala [Mon, 3 Jun 2013 23:53:32 +0000 (16:53 -0700)]
Camera3: Add more tracing
Change-Id: I5f5d0d3f37244f19446c473db70373bdf16cce56
Zhijun He [Fri, 7 Jun 2013 17:01:13 +0000 (10:01 -0700)]
am
574ca4f4: am
ba696bbf: Merge "camera2/3: Fix deadlock take picture while preview callback" into jb-mr2-dev
* commit '
574ca4f4f15a42d6159150149f68bf3cb800d869':
camera2/3: Fix deadlock take picture while preview callback
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:59:12 +0000 (08:59 -0700)]
am
d3a5b48a: am
18b46679: Merge "AudioFlinger: do not cache audio device when 0." into jb-mr2-dev
* commit '
d3a5b48a1bc4f5d6ff4472f54f909abaadd5fa39':
AudioFlinger: do not cache audio device when 0.
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:11:34 +0000 (07:11 -0700)]
am
1c540f7d: am
911a184b: am
132bc5bd: Merge "Noise will be heard if audio sample rate not matched with audio track"
* commit '
1c540f7d1b04cfd74847587f127b7539c3c15864':
Noise will be heard if audio sample rate not matched with audio track
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
Mike Lockwood [Thu, 6 Jun 2013 22:00:14 +0000 (15:00 -0700)]
Remove "LOCAL_MODULE_TAGS := debug" for stagefright tests
Change-Id: I53815d2f6d7dfe7eebb26c3802eb3d195244aab1
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:22:29 +0000 (14:22 -0700)]
am
e097efde: am
b05eeaed: camera3: Fix crash in set error state.
* commit '
e097efde4363f80d5ffc34da6ec6253fbd4e5397':
camera3: Fix crash in set error state.
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.