OSDN Git Service
Lajos Molnar [Wed, 10 Sep 2014 03:08:39 +0000 (20:08 -0700)]
mediaplayer: limit number of outstanding buffer requests
Bug:
14679336
Change-Id: I94a20ada30a9a25065329a85fc884d32d154d029
The Android Automerger [Wed, 10 Sep 2014 13:10:59 +0000 (06:10 -0700)]
merge in lmp-release history after reset to
83ee5564965408307e6f045ce5faed72bc3437b0
Zhijun He [Wed, 10 Sep 2014 05:12:17 +0000 (05:12 +0000)]
Merge "CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P" into lmp-dev
Eric Laurent [Wed, 10 Sep 2014 01:03:58 +0000 (01:03 +0000)]
Merge "audioflinger: fix audio patch release" into lmp-dev
Eric Laurent [Wed, 10 Sep 2014 00:00:14 +0000 (17:00 -0700)]
audioflinger: fix audio patch release
Fix error in PatchPanel:releaseAudioPatch() causing
the wrong patch handle to be passed to the audio HAL.
Bug:
17368621.
Change-Id: I037fd2e6273508c830414b5900d07c0178b96dae
Jeff Tinker [Tue, 9 Sep 2014 23:56:04 +0000 (23:56 +0000)]
Merge "Add error code for insufficient output protection" into lmp-dev
Zhijun He [Tue, 9 Sep 2014 23:18:31 +0000 (16:18 -0700)]
CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P
Bug:
17059255
Change-Id: Ic6b272e4ceec8fc852c9eb787370f4d366dad0ac
Wei Jia [Tue, 9 Sep 2014 21:49:08 +0000 (14:49 -0700)]
NuPlayer: make previous decoders obsolete when reset is done.
Bug:
17428608
Change-Id: I724174d65f8e00bfecb51e6f690ae709ed2cf442
Rachad [Tue, 9 Sep 2014 20:10:28 +0000 (13:10 -0700)]
NuPlayer::Renderer::onPause() - Converted CHECK(!mPaused) to a warning.
Bug:
17436451
Change-Id: I7e9e0c48bbdd8ab65c5f4a587699a28435bd03f4
Wei Jia [Tue, 9 Sep 2014 22:08:44 +0000 (22:08 +0000)]
Merge "NuPlayer: make previous decoders obsolete when reset is done." into lmp-dev
Phil Burk [Tue, 9 Sep 2014 22:03:13 +0000 (22:03 +0000)]
Merge "[media][nuplayer] Remove debug message EWOULDBLOCK" into lmp-dev
Phil Burk [Tue, 9 Sep 2014 18:46:18 +0000 (11:46 -0700)]
[media][nuplayer] Remove debug message EWOULDBLOCK
A debug message that was silent during testing is now spewing messages.
It was removed.
Bug:
17438882
Change-Id: I9c61409cac77c7bc1fd1088815823207094606f2
Signed-off-by: Phil Burk <philburk@google.com>
Wei Jia [Tue, 9 Sep 2014 21:49:08 +0000 (14:49 -0700)]
NuPlayer: make previous decoders obsolete when reset is done.
Bug:
17428608
Change-Id: I724174d65f8e00bfecb51e6f690ae709ed2cf442
Rachad [Tue, 9 Sep 2014 21:44:13 +0000 (21:44 +0000)]
Merge " NuPlayer::Renderer::onPause() - Converted CHECK(!mPaused) to a warning." into lmp-dev
Marco Nelissen [Tue, 9 Sep 2014 20:30:29 +0000 (20:30 +0000)]
Merge "Fix AAC timestamps for multiple aac frames per input buffer" into lmp-dev
Rachad [Tue, 9 Sep 2014 20:10:28 +0000 (13:10 -0700)]
NuPlayer::Renderer::onPause() - Converted CHECK(!mPaused) to a warning.
Bug:
17436451
Change-Id: I7e9e0c48bbdd8ab65c5f4a587699a28435bd03f4
Wei Jia [Tue, 9 Sep 2014 19:08:47 +0000 (12:08 -0700)]
NuPlayer: check mSource before deferencing it.
Bug:
17428608
Change-Id: I7b264d1288ed3c495434aedeeeef2fbfc3ca2f16
Wei Jia [Tue, 9 Sep 2014 19:43:15 +0000 (19:43 +0000)]
Merge "NuPlayer: check mSource before deferencing it." into lmp-dev
Wei Jia [Tue, 9 Sep 2014 19:08:47 +0000 (12:08 -0700)]
NuPlayer: check mSource before deferencing it.
Bug:
17428608
Change-Id: I7b264d1288ed3c495434aedeeeef2fbfc3ca2f16
Eric Laurent [Tue, 9 Sep 2014 18:57:42 +0000 (18:57 +0000)]
Merge "audio policy: fix output stream selection" into lmp-dev
The Android Automerger [Tue, 9 Sep 2014 13:11:52 +0000 (06:11 -0700)]
merge in lmp-release history after reset to
1a9ac031e9de8b3be1ec2c8d6d00f92bd3d59ea8
Eric Laurent [Mon, 8 Sep 2014 23:44:28 +0000 (16:44 -0700)]
audio policy: fix output stream selection
Make sure that all outputs considered by selectOutput()
when called from AudioPolicyManager::getOutputForDevice()
support the requested audio format.
Bug:
17340382.
Change-Id: I76520ce60e9a8fe4d2d23125d6143bb016522754
Phil Burk [Mon, 8 Sep 2014 23:00:40 +0000 (23:00 +0000)]
Merge "[audio][nuplayer] Aggregate buffers to reduce power." into lmp-dev
Andy Hung [Mon, 8 Sep 2014 21:17:22 +0000 (21:17 +0000)]
Merge "Fix potential deadlock between AudioPolicyService and AudioSystem" into lmp-dev
Yin-Chia Yeh [Mon, 8 Sep 2014 20:56:03 +0000 (20:56 +0000)]
Merge "Camera2: reconfigure video snapshot size if needed" into lmp-dev
Andy Hung [Mon, 8 Sep 2014 18:47:24 +0000 (11:47 -0700)]
Fix potential deadlock between AudioPolicyService and AudioSystem
Bug:
17109761
Change-Id: I315c1c5066f62b05e1c13b04fae1272b5fbce977
Phil Burk [Wed, 3 Sep 2014 22:04:12 +0000 (15:04 -0700)]
[audio][nuplayer] Aggregate buffers to reduce power.
Combine audio data from multiple buffers into one.
This reduces churn between threads and saves battery power.
Only use buffer aggregation when offloading the decoder.
Pend buffer if it won't fit in the bigger buffer.
Bug:
15094301
Change-Id: Iad3dac90b5d6b0fa43432b0e6776652ee2eafaa1
Signed-off-by: Phil Burk <philburk@google.com>
Wei Jia [Mon, 8 Sep 2014 17:45:06 +0000 (17:45 +0000)]
Merge "NuPlayerDriver: put player in paused state when reaching EOS." into lmp-dev
Glenn Kasten [Mon, 8 Sep 2014 16:35:00 +0000 (16:35 +0000)]
Merge "Make IPowerManager native conform to .aidl for oneway" into lmp-dev
Yin-Chia Yeh [Fri, 5 Sep 2014 21:14:44 +0000 (14:14 -0700)]
Camera2: reconfigure video snapshot size if needed
When recording fails to start due to stream configuration failed,
try configure stream again by setting jpeg stream to video size.
Bug:
16162133
Change-Id: Ib20271e787ae07719ce419f0b15c7f86434f7ebb
Eric Laurent [Mon, 8 Sep 2014 15:37:45 +0000 (15:37 +0000)]
Merge "audiopolicy: fix direct output profile probing" into lmp-dev
The Android Automerger [Mon, 8 Sep 2014 13:12:18 +0000 (06:12 -0700)]
merge in lmp-release history after reset to
835ae86b49da5e15a501cb12c25458f8b63e38be
Andy Hung [Mon, 8 Sep 2014 04:46:12 +0000 (04:46 +0000)]
Merge "Revert "Revert "disable AwesomePlayer for Ogg vorbis""" into lmp-dev
Eric Laurent [Sun, 7 Sep 2014 19:26:06 +0000 (12:26 -0700)]
audiopolicy: fix direct output profile probing
Do not select maximum sampling rate and channel count
when opening a direct output for the first time
to make sure that the combination of sampling rate
and channel count is supported by the connected sink.
Bug:
17047809.
Change-Id: I077a3c1436158378f2762343469ceb39fab9775e
Marco Nelissen [Fri, 5 Sep 2014 16:28:24 +0000 (09:28 -0700)]
Fix AAC timestamps for multiple aac frames per input buffer
Support multiple aac frames per input buffer also for non-ADTS streams.
Bug:
16715379
Change-Id: I84f33d9bb65b6821b2a697f6750356cea98777c4
The Android Automerger [Sun, 7 Sep 2014 13:10:24 +0000 (06:10 -0700)]
merge in lmp-release history after reset to
cb16968f593e4d58857c693c8ec6f2d2337f5512
The Android Automerger [Sat, 6 Sep 2014 15:51:27 +0000 (08:51 -0700)]
merge in lmp-release history after reset to
ae6b041b7ceed3b1690a7201d6587538dbab8c1b
The Android Automerger [Sat, 6 Sep 2014 13:10:05 +0000 (06:10 -0700)]
merge in lmp-release history after reset to
cb16968f593e4d58857c693c8ec6f2d2337f5512
Jungshik Jang [Sat, 6 Sep 2014 02:58:39 +0000 (02:58 +0000)]
Merge "Fix "invalid device combination" in system audio mode." into lmp-dev
Robert Shih [Sat, 6 Sep 2014 00:49:52 +0000 (00:49 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: parse csd correctly; workaround malformed csd" into lmp-dev
Robert Shih [Fri, 16 May 2014 19:22:35 +0000 (12:22 -0700)]
DO NOT MERGE - MPEG4Extractor: parse csd correctly; workaround malformed csd
Bug:
14895152
Change-Id: Ibfee9e176459099507589c26a5eca6c61caabd1c
(cherry picked from commit
bc413f6ad0023f7ad451a0129a07fc31dbc65665)
Glenn Kasten [Fri, 5 Sep 2014 23:45:52 +0000 (16:45 -0700)]
Make IPowerManager native conform to .aidl for oneway
But provide a temporary escape hatch for AudioFlinger.
This oneway option will be removed as soon as possible.
Bug:
16408906
Change-Id: I058a50906af810787e444a96819cb781b7f639ad
Jean-Michel Trivi [Fri, 5 Sep 2014 23:36:21 +0000 (23:36 +0000)]
Merge "Cache audio attributes when player not available" into lmp-dev
Lajos Molnar [Fri, 5 Sep 2014 23:08:53 +0000 (23:08 +0000)]
Merge "stagefright: allow P-frames spacing of 0 and 1" into lmp-dev
Robert Shih [Fri, 5 Sep 2014 22:12:51 +0000 (22:12 +0000)]
Merge "GenericSource: refactor track selection for dedicated looper" into lmp-dev
Wei Jia [Fri, 5 Sep 2014 21:58:59 +0000 (14:58 -0700)]
NuPlayerDriver: put player in paused state when reaching EOS.
Bug:
17352759
Change-Id: I19b183e0a86b712524f79ec7c35e32b5a5b47bc6
Zhijun He [Fri, 5 Sep 2014 21:53:53 +0000 (21:53 +0000)]
Merge "Camera API1: fix AE state check in precapture state" into lmp-dev
Andy Hung [Fri, 5 Sep 2014 21:49:32 +0000 (21:49 +0000)]
Merge "NuPlayer: Restrict seek on video texture changes" into lmp-dev
Andy Hung [Fri, 5 Sep 2014 20:38:27 +0000 (20:38 +0000)]
Merge "NuPlayer: Discard seeks when source and decoders are NULL" into lmp-dev
Chong Zhang [Fri, 5 Sep 2014 19:19:47 +0000 (19:19 +0000)]
Merge "Split CEA-608 Closed caption into 4 tracks CC1~CC4" into lmp-dev
Jean-Michel Trivi [Fri, 5 Sep 2014 18:20:11 +0000 (11:20 -0700)]
Cache audio attributes when player not available
Cache the audio attributes stored in a Parcel in the client-side
MediaPlayer object if they are set through setParameter()
before the server-side MediaPlayer is available. Apply them when
the player is prepared.
Bug
17280746
Change-Id: I72f1a7fc4e2b076fae8cbdede77a2f74e98b2a03
Andy Hung [Fri, 5 Sep 2014 18:42:58 +0000 (11:42 -0700)]
NuPlayer: Restrict seek on video texture changes
MediaPlayer::setVideoSurfaceTexture() should generate seek to refresh
display only if player is started and has video.
Bug:
17379148
Bug:
17404923
Change-Id: I5f55dc40943e4419d08be6fdab964b8a2c5ee519
Eric Laurent [Fri, 5 Sep 2014 18:01:41 +0000 (18:01 +0000)]
Merge "audio policy service: filter out delayed audio patch commands if needed." into lmp-dev
Eric Laurent [Fri, 5 Sep 2014 17:13:31 +0000 (17:13 +0000)]
Merge "Fix to parse audio_source_t member of audio_attributes_t" into lmp-dev
Hyejin Kim [Fri, 5 Sep 2014 06:50:03 +0000 (15:50 +0900)]
Fix to parse audio_source_t member of audio_attributes_t
When unmarshalling audio_attributes_t typed data,
it didn't parse the audio_source_t member between content_type and flags.
Bug:
16906307
Change-Id: Ia0d8df9b5c31441d34dc82678bceccd8ce31423d
Eric Laurent [Thu, 4 Sep 2014 23:40:57 +0000 (16:40 -0700)]
audio policy service: filter out delayed audio patch commands if needed.
As for set parameters commands, create or release audio patch commands
modifying the same patch handle should be filtered by the audio policy service
command thread so that an immediate command is not overridden by
a pending delayed command.
Bug:
17379728.
Change-Id: I6aa4652b4bfec59eebd3c3cb7d1d9ac1bc1d6e49
Jungshik Jang [Fri, 5 Sep 2014 12:25:48 +0000 (21:25 +0900)]
Fix "invalid device combination" in system audio mode.
HDMI-CEC system audio mode removes speaker from output
list. It also has multiple outputs by connected outputs.
However, getDeviceForVolume() doesn't cover multiple
output with no speaker or bluetooth case.
This change picks one of system audio outputs in order.
Bug:
17400026
Change-Id: I102fd0052c9c4c9543f9e8f3b16ec6815d7485d8
Andy Hung [Thu, 4 Sep 2014 01:22:22 +0000 (18:22 -0700)]
NuPlayer: Discard seeks when source and decoders are NULL
Problem occurs when loop mode asynchronously seeks to the
start of the source after a MediaPlayer::reset().
Bug:
17379148
Change-Id: I50bfe65a753afffb1d478db54c76067a9c61a0ae
Robert Shih [Thu, 4 Sep 2014 22:58:34 +0000 (22:58 +0000)]
Merge "PlaylistFetcher: do not reset mStartTimeUs if we are resuming" into lmp-dev
Lajos Molnar [Thu, 4 Sep 2014 18:45:26 +0000 (11:45 -0700)]
stagefright: allow P-frames spacing of 0 and 1
Bug:
17387418
Change-Id: Ib966496b4ca220d96fb3741c29002c13cd2db848
The Android Automerger [Thu, 4 Sep 2014 13:11:30 +0000 (06:11 -0700)]
merge in lmp-release history after reset to
9007305003e689362749a264af2eafea80eb12a0
Chong Zhang [Fri, 1 Aug 2014 20:46:53 +0000 (13:46 -0700)]
Split CEA-608 Closed caption into 4 tracks CC1~CC4
Bug:
16463078
Change-Id: Ib3073090934232016e535fbb8fa56cdf9d7ab6eb
Robert Shih [Thu, 21 Aug 2014 00:00:21 +0000 (17:00 -0700)]
GenericSource: refactor track selection for dedicated looper
- move getFormatMeta, getSelectedTrack, selectTrack, and seekTo to
dedicated looper
- start & dequeueAccessUnit posts readBuffer requests instead of reading
directly
- call internal doGetFormatMeta in onPrepareAsync
Bug:
16892748
Change-Id: I5d5e34381f1dfceca655c52a201627b53454ad22
Robert Shih [Sat, 30 Aug 2014 01:57:34 +0000 (18:57 -0700)]
PlaylistFetcher: do not reset mStartTimeUs if we are resuming
Bug:
17376049
Change-Id: Ie519bdf7128841172df41e6512d624e99d9853d6
Andy Hung [Wed, 3 Sep 2014 23:28:52 +0000 (23:28 +0000)]
Revert "Revert "disable AwesomePlayer for Ogg vorbis""
This reverts commit
da65048e8e6f65ed9b3f23cda3f4554025c76fc4.
Deadlock audio issues for NuPlayer have been resolved.
Change-Id: I1853d367dc771a9396a9b2d48ff34e50c78c112c
hkuang [Wed, 3 Sep 2014 21:54:45 +0000 (21:54 +0000)]
Merge "Fix the bug that same video frame has been decoded twice during port reconfig." into lmp-dev
Wei Jia [Wed, 3 Sep 2014 21:23:57 +0000 (21:23 +0000)]
Merge "NuPlayer: add seek operation when change video texture surface." into lmp-dev
Zhijun He [Wed, 3 Sep 2014 18:36:00 +0000 (11:36 -0700)]
Camera API1: fix AE state check in precapture state
It is legal to transit to CONVERGED or FLASH_REQUIRED after a AE precapture
trigger.
Bug:
17365185
Change-Id: Id041eff5eac564c32d09b547a0139d24807336f4
Marco Nelissen [Thu, 28 Aug 2014 19:40:34 +0000 (12:40 -0700)]
Move stale handler cleanup to constructor
This avoids the potential side effect of deleting more ALoopers
inside the cleanup loop.
Bug:
17059501
Change-Id: I41efaf490449b95fedfe01175f3b19067d50da24
Marco Nelissen [Thu, 28 Aug 2014 17:49:08 +0000 (10:49 -0700)]
Fix more potential deadlocks in ALooperRoster
Bug:
17059501
Change-Id: I242f2859527bed2d6e275c27de94fb19f4dcdc28
Marco Nelissen [Wed, 3 Sep 2014 19:09:43 +0000 (19:09 +0000)]
Merge "Use CharacterEncodingDetector in metadataretriever" into lmp-dev
hkuang [Tue, 2 Sep 2014 20:57:31 +0000 (13:57 -0700)]
Fix the bug that same video frame has been decoded twice during port reconfig.
This does not hurt normal video playback. But in adaptive playback,
this will lead to a little bit delay for some clips.
Bug:
17202935
Change-Id: I5af0a5911e28a1597c74d79960fac25faf72c9d2
Wei Jia [Wed, 3 Sep 2014 02:01:34 +0000 (19:01 -0700)]
NuPlayer: add seek operation when change video texture surface.
Bug:
17278770
Change-Id: I9fd5207e1eccb91e64644d2d1da4183d4bf7ac2c
Marco Nelissen [Wed, 3 Sep 2014 15:52:32 +0000 (15:52 +0000)]
Merge "Move stale handler cleanup to constructor" into lmp-dev
Marco Nelissen [Wed, 3 Sep 2014 15:52:23 +0000 (15:52 +0000)]
Merge "Fix more potential deadlocks in ALooperRoster" into lmp-dev
Glenn Kasten [Wed, 3 Sep 2014 15:29:57 +0000 (15:29 +0000)]
Merge "Restore the ability to build tee sink for debugging" into lmp-dev
The Android Automerger [Wed, 3 Sep 2014 13:10:53 +0000 (06:10 -0700)]
merge in lmp-release history after reset to
453d633ba6351c8efc2103383ca178a0674bd373
Chong Zhang [Wed, 3 Sep 2014 01:13:08 +0000 (01:13 +0000)]
Merge "render one video frame after flush even when we're paused" into lmp-dev
Chong Zhang [Sat, 30 Aug 2014 01:34:17 +0000 (18:34 -0700)]
render one video frame after flush even when we're paused
allows the video to get some update when user seeks while paused.
Bug:
17140448
Change-Id: I064806bfd566585eeb4150a508422c9775e08f99
Eric Laurent [Tue, 2 Sep 2014 21:45:53 +0000 (14:45 -0700)]
audio flinger: fix use of global effect buffer
When float mixing format is enabled, audio effects use a specific
buffer in 16 bit format. This buffer was not enabled when only
global effects were present resulting in the mixer accumulating directly
to the output sink buffer.
Bug:
16202259.
Change-Id: I3537d36c63196d97772f0ab22dd31d04dfa7fdd6
Glenn Kasten [Thu, 28 Aug 2014 23:23:16 +0000 (16:23 -0700)]
Restore the ability to build tee sink for debugging
This changelist does not enable tee sink, but makes it possible to do so.
Tee sink had suffered some bit rot since it is not built by default.
Also fixes a crash for > 2 byte per sample or > 2 channels.
Still does not write correct header for floating-point;
that will be best solved by moving to libsndfile.
Bug:
16990102
Change-Id: I8e92c588ccc513d7802d696fcfb324e815772df6
Marco Nelissen [Fri, 29 Aug 2014 23:00:28 +0000 (16:00 -0700)]
Use CharacterEncodingDetector in metadataretriever
instead of media scanner. This way the java MediaMetadataRetriever API
will give the same result as the media scanner.
Also apply some tweaks to the encoding detector to improve handling of
ISO-8859-1 tags.
Bug:
16302581,
17205395
Change-Id: I1682a7a6a8bf04cffaa455044ba72dd7fd152d49
Ruben Brunk [Tue, 2 Sep 2014 18:19:13 +0000 (18:19 +0000)]
Merge "camera1: Ensure MemoryHeap buffers are mmapped before copying." into lmp-dev
Ronghua Wu [Tue, 2 Sep 2014 17:43:48 +0000 (17:43 +0000)]
Merge "Add adaptive playback support to VPX decoder." into lmp-dev
The Android Automerger [Tue, 2 Sep 2014 13:10:59 +0000 (06:10 -0700)]
merge in lmp-release history after reset to
e7494680914c384dc6e93ae85f4337b06b300468
Wei Jia [Tue, 2 Sep 2014 01:40:36 +0000 (01:40 +0000)]
Merge "NuPlayerRenderer: stop feeding AudioSink when paused." into lmp-dev
The Android Automerger [Mon, 1 Sep 2014 14:55:55 +0000 (07:55 -0700)]
merge in lmp-release history after reset to
64a385d5d8e42ac96c88fb025212b4023690db39
The Android Automerger [Sun, 31 Aug 2014 16:31:48 +0000 (09:31 -0700)]
merge in lmp-release history after reset to
64a385d5d8e42ac96c88fb025212b4023690db39
Ronghua Wu [Sat, 30 Aug 2014 02:06:51 +0000 (02:06 +0000)]
Merge "GenericSource: set DRM playback status." into lmp-dev
Wei Jia [Sat, 30 Aug 2014 02:04:48 +0000 (02:04 +0000)]
Merge "MediaCodec: set state to UNINITIALIZED when receiving fatal error." into lmp-dev
Rachad [Sat, 30 Aug 2014 01:10:37 +0000 (01:10 +0000)]
Merge "Tunneled Video Playback: Changed AudioHwSync token to int32_t to match Audio stack api." into lmp-dev
Wei Jia [Fri, 29 Aug 2014 21:47:50 +0000 (14:47 -0700)]
MediaCodec: set state to UNINITIALIZED when receiving fatal error.
NuPlayerDecoder: release MediaCodec when handling an error.
Bug:
16661923
Change-Id: I1b6fd7ee5cc1136b3f289135e5360cd3d98f9799
Wei Jia [Fri, 29 Aug 2014 23:33:49 +0000 (16:33 -0700)]
NuPlayerRenderer: stop feeding AudioSink when paused.
NuPlayerDriver: current position is updated only in running state.
Bug:
17141882
Change-Id: Ia88551cc29ef8f0e7ef0600a214feb5633389b6e
Ruben Brunk [Sat, 30 Aug 2014 00:25:13 +0000 (17:25 -0700)]
camera1: Ensure MemoryHeap buffers are mmapped before copying.
Bug:
16986293
Change-Id: Icb68254d7ed1812fa9e60342749a2746d6fcfb17
Lajos Molnar [Fri, 29 Aug 2014 21:39:34 +0000 (21:39 +0000)]
Merge "stagefright: add codec capability info for google video codecs" into lmp-dev
Ronghua Wu [Thu, 28 Aug 2014 22:50:29 +0000 (15:50 -0700)]
GenericSource: set DRM playback status.
Bug:
17307158
Change-Id: I36b801a9b67831b618930cf1241756bb9644b4fd
Eric Laurent [Fri, 29 Aug 2014 18:29:49 +0000 (18:29 +0000)]
Merge "sound trigger: fix cross deadlock between service and client" into lmp-dev
Eric Laurent [Fri, 29 Aug 2014 18:29:36 +0000 (18:29 +0000)]
Merge "audio policy: fix input source passed to openInput()" into lmp-dev
Dmitry Shmidt [Fri, 29 Aug 2014 18:28:26 +0000 (18:28 +0000)]
Merge "audiopolicy: Indicate output device change to all input threads for pre-processing" into lmp-dev
Eric Laurent [Fri, 29 Aug 2014 02:45:37 +0000 (19:45 -0700)]
sound trigger: fix cross deadlock between service and client
Do not call callback methods on ISoundTriggerClient with the service mutex
locked: the client implementation will lock its mutex to process
the callback and if a request from the same client with client
mutex locked was waiting for the service mutex a deadlock occurs.
Bug:
16873049.
Change-Id: Ifc3b31fdfaed525981fa59876c041478f38b42e8