summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | | | | | * | | | | MediaBuffer: ABuffer will release MediaBuffer when it's destructed.Wei Jia2014-09-2211-99/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17454455 Change-Id: Ia423bcc2e1fa39137f114eac44912ed15357bb99
| | | | | | | * | | | | merge in lmp-release history after reset to ↵The Android Automerger2014-09-220-0/+0
| | | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8d6ae6d9e9f2740f88928fae52e811ca68b0024e
| | | | | | | | * \ \ \ \ merge in lmp-release history after reset to ↵The Android Automerger2014-09-210-0/+0
| | | | | | | | |\ \ \ \ \ | | | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | 8d6ae6d9e9f2740f88928fae52e811ca68b0024e
| | | | | | | | * | | | | merge in lmp-release history after reset to ↵The Android Automerger2014-09-200-0/+0
| | | | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a7326b42c42f5014e8dabf18d69a8376b2f3f67d
| | | | | | | | | * \ \ \ \ merge in lmp-release history after reset to ↵The Android Automerger2014-09-200-0/+0
| | | | | | | | | |\ \ \ \ \ | | | | | | | | |/ / / / / / | | | | | | | |/| / / / / / | | | | | | | | |/ / / / / 8d6ae6d9e9f2740f88928fae52e811ca68b0024e
| | | | | | | | * | | | | AudioEffect acquires sessionJean-Michel Trivi2014-09-182-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, users of audio sessions, AudioTrack and AudioRecord, are acquiring and releasing audio sessions according to their life-cycle. AudioEffect instances were not counting as users of an audio session. This caused an effect used on a session to be purged by AudioFlinger::purgeStaleEffects_l() whenever the last user of that session went away. This CL makes AudioEffect acquire and release a session when created and destroyed. Bug 15432115 Change-Id: I922532150009988d43872f9b5928044a830ae0b3
| | | | | | | | * | | | | merge in lmp-release history after reset to ↵The Android Automerger2014-09-180-0/+0
| | | | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2973994af39d55b58728df3dca067594e826ea2a
| | | | | | | | | * | | | | Add support for ANDROID_LOOP to NuPlayerMarco Nelissen2014-09-177-4/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17518139 Change-Id: I9355ddd4c998d967013dd8bd32d670a9a83dea31
| | | | | | | | | * | | | | merge in lmp-release history after reset to ↵The Android Automerger2014-09-170-0/+0
| | | | | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 90869c2bef1bc47394a9f603ccebb62b2592fd2b
| | | | | | | | | | * \ \ \ \ merge in lmp-release history after reset to ↵The Android Automerger2014-09-160-0/+0
| | | | | | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 086c1e3f41a92aa0025a1da1db5dabbfdffaf129
| | | | | | | | | | | * \ \ \ \ merge in lmp-release history after reset to ↵The Android Automerger2014-09-150-0/+0
| | | | | | | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 83a23e1e1e45d9e2f5497e214796250f74aad1d4
| | | | | | | | | | | | * \ \ \ \ merge in lmp-release history after reset to ↵The Android Automerger2014-09-140-0/+0
| | | | | | | | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f0b31e6333839972afb2e374f6d8824180d29fc2
| | | | | | | | | | | | | * \ \ \ \ merge in lmp-release history after reset to ↵The Android Automerger2014-09-130-0/+0
| | | | | | | | | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 715e30cbbc8b1ed62165ef0e33368f27b6865b20
| | | | | | | | | | | | | | * \ \ \ \ merge in lmp-release history after reset to ↵The Android Automerger2014-09-130-0/+0
| | | | | | | | | | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | |/ / / / / | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | 4d22f2085141374fd88dba4142a8135f1bd9165c
| | | | | | | | | | | | | * | | | | | StagefrightRecorder: default to codec and fps from camcorder low profileChong Zhang2014-09-112-6/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16870964 Change-Id: I18425af630d3f041a3bcf77fbae3f07856fe8af2
| | | | | | | | | | | | | * | | | | | AudioPolicyManager: Use "safe" speaker for notifications if availableJon Eklund2014-09-111-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On particularly loud devices, unexpected audio bursts can be harmful. For longer audio events, the conventional mitigation strategy is to somehow soft-start (ramp) the loudspeaker volume, but this strategy can severely impact the audibility of short audio events. Use of the "safe" speaker path hints to AudioHAL to immediately output at best allowable level for transient audio events. SPEAKER_SAFE is aliased to SPEAKER for purposes of volume control. Bug: 17319721 Change-Id: I75187c23f3d1f18e9f638c5d14e7b0bf805a67bc
| | | | | | | | | | | | | * | | | | | merge in lmp-release history after reset to ↵The Android Automerger2014-09-110-0/+0
| | | | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4953f92be5c45d7b79448e8964ecbdc39eacb782
| | | | | | | | | | | | | | * | | | | | mediaplayer: release MediaBuffer in stale input buffersLajos Molnar2014-09-101-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17454455 Change-Id: If63a6e42f96851d6c10fdec11360f0dabae9bf50
| | | | | | | | | | | | | | * | | | | | NuPlayerDriver: do not set to paused state when receiving playback complete ↵Wei Jia2014-09-101-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and reset is in progress. Bug: 17453240 Change-Id: If243e2232779681fc84dc767feaed00f23d8fdb1
| | | | | | | | | | | | | | * | | | | | Revert "Fix AAC timestamps for multiple aac frames per input buffer"Marco Nelissen2014-09-102-194/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e086387c805311ac87904c3c4d6d4eb08d4b4ee2. (broke multichannel movie playback) Bug: 17454025 Change-Id: I95b82359f87f8beca66f35c34b7e125850a44747
| | | | | | | | | | | | | | * | | | | | fix failure in MediaCodecTest#testExceptionChong Zhang2014-09-101-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reset codec after failed configure() Bug: 17418876 Change-Id: I21ff8a0751dae6a164678015142e11d481403bed
| | | | | | | | | | | | | | * | | | | | mediaplayer: limit number of outstanding buffer requestsLajos Molnar2014-09-101-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14679336 Change-Id: I94a20ada30a9a25065329a85fc884d32d154d029
| | | | | | | | | | | | | | * | | | | | merge in lmp-release history after reset to ↵The Android Automerger2014-09-100-0/+0
| | | | | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 83ee5564965408307e6f045ce5faed72bc3437b0
| | | | | | | | | | | | | | | * | | | | | NuPlayer: make previous decoders obsolete when reset is done.Wei Jia2014-09-091-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17428608 Change-Id: I724174d65f8e00bfecb51e6f690ae709ed2cf442
| | | | | | | | | | | | | | | * | | | | | NuPlayer::Renderer::onPause() - Converted CHECK(!mPaused) to a warning.Rachad2014-09-091-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17436451 Change-Id: I7e9e0c48bbdd8ab65c5f4a587699a28435bd03f4
| | | | | | | | | | | | | | | * | | | | | NuPlayer: check mSource before deferencing it.Wei Jia2014-09-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17428608 Change-Id: I7b264d1288ed3c495434aedeeeef2fbfc3ca2f16
| | | | | | | | | | | | | | | * | | | | | merge in lmp-release history after reset to ↵The Android Automerger2014-09-090-0/+0
| | | | | | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1a9ac031e9de8b3be1ec2c8d6d00f92bd3d59ea8
| | | | | | | | | | | | | | | | * \ \ \ \ \ merge in lmp-release history after reset to ↵The Android Automerger2014-09-080-0/+0
| | | | | | | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 835ae86b49da5e15a501cb12c25458f8b63e38be
| | | | | | | | | | | | | | | | | * \ \ \ \ \ merge in lmp-release history after reset to ↵The Android Automerger2014-09-070-0/+0
| | | | | | | | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cb16968f593e4d58857c693c8ec6f2d2337f5512
| | | | | | | | | | | | | | | | | | * \ \ \ \ \ merge in lmp-release history after reset to ↵The Android Automerger2014-09-060-0/+0
| | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ae6b041b7ceed3b1690a7201d6587538dbab8c1b
| | | | | | | | | | | | | | | | | | | * \ \ \ \ \ merge in lmp-release history after reset to ↵The Android Automerger2014-09-060-0/+0
| | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | |/| / / / / / / | | | | | | | | | | | | | | | | | | |/ / / / / / cb16968f593e4d58857c693c8ec6f2d2337f5512
| | | | | | | | | | | | | | | | | | * | | | | | merge in lmp-release history after reset to ↵The Android Automerger2014-09-040-0/+0
| | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9007305003e689362749a264af2eafea80eb12a0
| | | | | | | | | | | | | | | | | | | * | | | | | Move stale handler cleanup to constructorMarco Nelissen2014-09-031-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids the potential side effect of deleting more ALoopers inside the cleanup loop. Bug: 17059501 Change-Id: I41efaf490449b95fedfe01175f3b19067d50da24
| | | | | | | | | | | | | | | | | | | * | | | | | Fix more potential deadlocks in ALooperRosterMarco Nelissen2014-09-032-31/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17059501 Change-Id: I242f2859527bed2d6e275c27de94fb19f4dcdc28
| | | | | | | | | | | | | | | | | | | * | | | | | merge in lmp-release history after reset to ↵The Android Automerger2014-09-030-0/+0
| | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 453d633ba6351c8efc2103383ca178a0674bd373
| | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ merge in lmp-release history after reset to ↵The Android Automerger2014-09-020-0/+0
| | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e7494680914c384dc6e93ae85f4337b06b300468
| | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ merge in lmp-release history after reset to ↵The Android Automerger2014-09-010-0/+0
| | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 64a385d5d8e42ac96c88fb025212b4023690db39
| | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ merge in lmp-release history after reset to ↵The Android Automerger2014-08-310-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 64a385d5d8e42ac96c88fb025212b4023690db39
| | | | | | | | | | | | | | | | | | | | | | * | | | | | Camera API1: Fix ZSLProcessor3 deadlockZhijun He2014-08-271-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ZSLProcessor3 shouldn't acquire mInputMutex in onBufferReleased call for output buffers, because the caller (Camera3Stream::returnBuffer) holds the camera3 stream lock already. This could cause deadlock for ZSL reprocess request as it holds the ZSLProcessor3 input lock and try to acquire camera3 stream lock to submit the request. Bug: 17299038 Change-Id: I6a7bf8ebd7c2064852358c655f3a3e9a67769213
| | | | | | | | | | | | | | | | | | | | | | * | | | | | Fix memory leak in getConnectionStateMarco Nelissen2014-08-272-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turns out having an sp<> point at the containing object doesn't really work so well. Bug: 17210991 Change-Id: I4bcb0c38adffc574d661f0772583357868f6c5b4
| | | | | | | | | | | | | | | | | | | | | | * | | | | | merge in lmp-release history after reset to ↵The Android Automerger2014-08-270-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9dd4a2ddd7caf8cbe50d8a76e0ec3e0274d2bce6
| | | | | | | | | | | | | | | | | | | | | | | * | | | | | Fix SoundPool lockupMarco Nelissen2014-08-261-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NuPlayerDriver needs to update its internal state before calling its listener, so that when the listener calls back into NuPlayerDriver, NuPlayerDriver has the right state. Bug: 14057920 Change-Id: I224882c427f5e3c9d4bf96c5d68075e235062401
| | | | | | | | | | | | | | | | | | | | | | | * | | | | | do string compare with mime immediately after we get the valueChong Zhang2014-08-261-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17210803 Change-Id: I4d20dd4b95d18251c18a371bd8f89b1320b38879
| | | | | | | | | | | | | | | | | | | | | | | * | | | | | merge in lmp-release history after reset to ↵The Android Automerger2014-08-260-0/+0
| | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d42173a44721af1a600b9c8599bc736394fcc724
| | | | | | | | | | | | | | | | | | | | | | | | * | | | | | Revert "disable AwesomePlayer for Ogg vorbis"Rachad Alao2014-08-252-14/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Temporarily revert commit 9b48f5d780757ffb81709df3633d06b62edaf39f as a workaround for b/17173673 Bug: 17173673 Change-Id: Iec52289e77485a58ce28cc515d6a5b8e7b2d328a
| | | | | | | | | | | | | | | | | | | | | | | | * | | | | | merge in lmp-release history after reset to ↵The Android Automerger2014-08-250-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 34febc9654ba3b447239b7761ce4c93ca9a20b5f
| | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ merge in lmp-release history after reset to ↵The Android Automerger2014-08-240-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 34febc9654ba3b447239b7761ce4c93ca9a20b5f
| | | | | | | | | | | | | | | | | | | | | | | | | * | | | | | merge in lmp-release history after reset to ↵The Android Automerger2014-08-230-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 848726d845b51da04364bdaf4ec915c85d593c0e
| | | | | | | | | | | | | | | | | | | | | | | | | | * | | | | | move cache prefill to GenericSource's message handlerChong Zhang2014-08-224-103/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows prepareAsync to be terminated by reset promptly. It also makes it easier to do buffer update as GenericSource can access the cache status now. Bug: 16892748 Bug: 17182378 Change-Id: Ia55c04a810fd805041cb2025f6739afa5120b5ed
| | | | | | | | | | | | | | | | | | | | | | | | | | * | | | | | Fix SoundPool and MediaPlayerService buffer overflowAndy Hung2014-08-223-13/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Overflow occurs when SoundPool sample tracks cannot fit in the MediaPlayerService AudioCache buffer. Unnecessary decoding occurred with AwesomePlayer and an assert failure occurred with NuPlayer. NuPlayerRenderer is also tweaked to handle the latter case. Bug: 17122639 Change-Id: I4d25d3e2c0c62e36a91da6bf969edabddc2ebbb0