summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | | | | | audioflinger: enable effects after registration if neededEric Laurent2013-10-122-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug where effects were not properly reenabled after being moved from one playback thread to another. The effect is enabled but the audio policy manager sees it as disabled. Bug: 11181933. Change-Id: I19cac7acbaf61c546e667fd85ed7d4eda1c716d8
* | | | | | | | | | am 7f8f7585: am fd477974: AudioFlinger: more fixes for offload audio lostEric Laurent2013-10-282-14/+26
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7f8f758506a95d6fe5c0e52aa7b5ef82fb18861a': AudioFlinger: more fixes for offload audio lost
| * | | | | | | | | am fd477974: AudioFlinger: more fixes for offload audio lostEric Laurent2013-10-282-14/+26
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fd4779740ec3e9e865d5514464df26d015354388': AudioFlinger: more fixes for offload audio lost
| | * | | | | | | | AudioFlinger: more fixes for offload audio lostEric Laurent2013-10-282-14/+26
| | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mStandby being false was not a reliable indication that something had been written to audio HAL. Considering the last track in mActiveTracks vector as the latest activated track was wrong as this is a SortedVector. Bug: 11247103. Change-Id: I397d011c5afcdd779def3fe25aaae7669a472cfc
* | | | | | | | | am 241be8d5: (-s ours) am 9cae2170: Assign blame for playback wakelocks.Marco Nelissen2013-10-260-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '241be8d5874023761121043b8709a6062baac6f1': Assign blame for playback wakelocks.
| * | | | | | | | am 9cae2170: Assign blame for playback wakelocks.Marco Nelissen2013-10-2614-52/+171
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9cae217050aa1347d4ac5053c305754879e3f97f': Assign blame for playback wakelocks.
| | * | | | | | | Assign blame for playback wakelocks.Marco Nelissen2013-10-2514-52/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set a work source for the playback wakelock, so that playback is counted against the requesting app instead of the media server. Cherrypicked from master. b/9464621 Change-Id: I7329f88a288a95a582a78005a1c3d16a5a611e31
* | | | | | | | | Assign blame for playback wakelocks.Marco Nelissen2013-10-2514-53/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set a work source for the playback wakelock, so that playback is counted against the requesting app instead of the media server. Change-Id: I7329f88a288a95a582a78005a1c3d16a5a611e31
* | | | | | | | | am de5f7cd6: am be567be3: Merge "Check for NULL buffer in repeat-latest" ↵Andy McFadden2013-10-241-0/+17
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-dev * commit 'de5f7cd61df74027834cd1ed2f1e482238f3ed4b': Check for NULL buffer in repeat-latest
| * | | | | | | | am be567be3: Merge "Check for NULL buffer in repeat-latest" into klp-devAndy McFadden2013-10-241-0/+17
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'be567be3f92026f5964c1c9ecce00e30bb7df412': Check for NULL buffer in repeat-latest
| | * | | | | | | Merge "Check for NULL buffer in repeat-latest" into klp-devAndy McFadden2013-10-241-0/+17
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| | | * | | | | | Check for NULL buffer in repeat-latestAndy McFadden2013-10-231-0/+17
| | | | |_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Repeating the most-recent buffer appears to fail when the producer disconnects. This adds a NULL check to avoid crashing. Bug 10607920 Change-Id: Ied036004425f046fcf9c26303823681f3fddb99e
* | | | | | | | am 57c1f758: am f3a6234b: Merge "Fix kAutoRampDurationUs overflow issue" ↵Vineeta Srivastava2013-10-241-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-dev * commit '57c1f758d8811024aa1298d2ba244577c44ef7b9': Fix kAutoRampDurationUs overflow issue
| * | | | | | | am f3a6234b: Merge "Fix kAutoRampDurationUs overflow issue" into klp-devVineeta Srivastava2013-10-231-2/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f3a6234ba21640cf2bc893dbcb98fb9b0fa47481': Fix kAutoRampDurationUs overflow issue
| | * | | | | | Merge "Fix kAutoRampDurationUs overflow issue" into klp-devVineeta Srivastava2013-10-231-2/+2
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | Fix kAutoRampDurationUs overflow issueVineeta Srivastava2013-10-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When kAutoRampDurationUs multiplies with mSampleRate, it overflows to int64. Type cast it to int64 to make sure RampDurationUs properly. BUg: 11162491 Change-Id: I4f93bc9acc8456e25623a9255ca7a5b206425009
* | | | | | | | am c20636f7: am e7329bd5: am d5255d1d: Merge "If dlopen("libwvm.so") fails, ↵Elliott Hughes2013-10-231-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | log the reason why." * commit 'c20636f7a4053c6f93a8808617252afcd5dc8d50': If dlopen("libwvm.so") fails, log the reason why.
| * | | | | | | am e7329bd5: am d5255d1d: Merge "If dlopen("libwvm.so") fails, log the ↵Elliott Hughes2013-10-231-1/+1
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reason why." * commit 'e7329bd564e7c5f671b786dc7d0cc684d6d11fca': If dlopen("libwvm.so") fails, log the reason why.
| | * | | | | | am d5255d1d: Merge "If dlopen("libwvm.so") fails, log the reason why."Elliott Hughes2013-10-231-1/+1
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | * commit 'd5255d1de125d15afae6cfc35701a5255b5e2933': If dlopen("libwvm.so") fails, log the reason why.
| | | * | | | | Merge "If dlopen("libwvm.so") fails, log the reason why."Elliott Hughes2013-10-231-1/+1
| | | |\ \ \ \ \
| | | | * | | | | If dlopen("libwvm.so") fails, log the reason why.Elliott Hughes2013-10-231-1/+1
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11342992 Change-Id: I99986b6181df6d7615fdc1520d2edaadaccd9bb4
* | | | | | | | am 173f0125: am 9857473f: am 0f4b0d23: Merge "libeffects: do not use GNU ↵Nick Kralevich2013-10-205-35/+35
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | old-style field designators" * commit '173f0125bdd54ba325068d51baa5c31c3e685b1e': libeffects: do not use GNU old-style field designators
| * | | | | | | am 9857473f: am 0f4b0d23: Merge "libeffects: do not use GNU old-style field ↵Nick Kralevich2013-10-205-35/+35
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | designators" * commit '9857473f48abf1333ddd3454ab3c916b4e69daa4': libeffects: do not use GNU old-style field designators
| | * | | | | | am 0f4b0d23: Merge "libeffects: do not use GNU old-style field designators"Nick Kralevich2013-10-205-35/+35
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '0f4b0d238613cd98fe0b8931f7e6cbcc8b9ad7b1': libeffects: do not use GNU old-style field designators
| | | * | | | | Merge "libeffects: do not use GNU old-style field designators"Nick Kralevich2013-10-205-35/+35
| | | |\ \ \ \ \
| | | | * | | | | libeffects: do not use GNU old-style field designatorssynergydev2013-10-195-35/+35
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not using a GNU extension improves portability Change-Id: I4e8a0376c089828ca4fc7f1aaf3914bfd917d4c5
* | | | | | | | am 3f93c8f8: am 998c4e88: am 0219856e: Merge "libvideoeditor: fix ↵Nick Kralevich2013-10-181-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | M4OSA_Clock header guard" * commit '3f93c8f8dbfb8b7cfed2cd21210f875497cbb39c': libvideoeditor: fix M4OSA_Clock header guard
| * | | | | | | am 998c4e88: am 0219856e: Merge "libvideoeditor: fix M4OSA_Clock header guard"Nick Kralevich2013-10-181-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '998c4e88f962336472c5e1c3afbf0ed8d6d3a971': libvideoeditor: fix M4OSA_Clock header guard
| | * | | | | | am 0219856e: Merge "libvideoeditor: fix M4OSA_Clock header guard"Nick Kralevich2013-10-181-1/+1
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '0219856e5e45c0bdd20f2199297ec92f11f0875f': libvideoeditor: fix M4OSA_Clock header guard
| | | * | | | | Merge "libvideoeditor: fix M4OSA_Clock header guard"Nick Kralevich2013-10-191-1/+1
| | | |\ \ \ \ \
| | | | * | | | | libvideoeditor: fix M4OSA_Clock header guardsynergydev2013-10-181-1/+1
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CLOCK was mispelled as CLOCH Change-Id: Ie7163fc8723d7a5b9df113f55a4a550e5465d9b5
* | | | | | | | am 77177fa2: am 95c03858: Merge "Allow releaseBuffer after flush" into klp-devGlenn Kasten2013-10-183-6/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '77177fa20773d02b4f9c4147ecb98107f019fa7d': Allow releaseBuffer after flush
| * | | | | | | am 95c03858: Merge "Allow releaseBuffer after flush" into klp-devGlenn Kasten2013-10-183-6/+11
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | * commit '95c03858e2ab4fb693a2bfe47b3caa806e43c044': Allow releaseBuffer after flush
| | * | | | | | Merge "Allow releaseBuffer after flush" into klp-devGlenn Kasten2013-10-183-6/+11
| | |\ \ \ \ \ \
| | | * | | | | | Allow releaseBuffer after flushGlenn Kasten2013-10-183-6/+11
| | | | |_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After AudioTrack start checks for pending flush, allow releaseBuffer on any previously obtained buffer. For example, this can happen if the resampler has obtained a buffer but not released the whole buffer yet. Note that the resampler will be reading obsolete data. Bug: 11285590 Change-Id: I0614fbb62e43604aac3089cce4b7797c87a306b5
* | | | | | | | am 6edd8ca5: am 6a51d7ed: audioflinger: fix track terminated before playingEric Laurent2013-10-182-13/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '6edd8ca5b7e3d169db4314d2b994bc9d48e9e082': audioflinger: fix track terminated before playing
| * | | | | | | am 6a51d7ed: audioflinger: fix track terminated before playingEric Laurent2013-10-182-13/+10
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '6a51d7ed7062536ccc892c8850a34ed55cbc8d5c': audioflinger: fix track terminated before playing
| | * | | | | | audioflinger: fix track terminated before playingEric Laurent2013-10-172-13/+10
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a track is terminated before any audio was written, we should not send a drain request to the HAL. The drain will be ignored and we will wait the async callback for ever. Also fix a potential deadlock by not deleting a track with the thread mutex held: mPreviousTrack changed from a sp to a raw pointer. Bug: 11247103. Change-Id: I0a4b47b099204c7c326d45d700234ab8f72d8eae
* | | | | | | am e45796de: am dedc7b0f: Merge "Fix flush() followed by start()" into klp-devGlenn Kasten2013-10-171-0/+9
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'e45796dee9c072cdb13a00b407e68be2cd55e2f2': Fix flush() followed by start()
| * | | | | | am dedc7b0f: Merge "Fix flush() followed by start()" into klp-devGlenn Kasten2013-10-171-0/+9
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'dedc7b0fa23c21b525dc8abb572bb8161ad66a9b': Fix flush() followed by start()
| | * | | | | Merge "Fix flush() followed by start()" into klp-devGlenn Kasten2013-10-171-0/+9
| | |\ \ \ \ \
| | | * | | | | Fix flush() followed by start()Glenn Kasten2013-10-171-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11259166 Change-Id: I72526cdfd4e3ff4b06e6a317e577f57cc285205d
* | | | | | | | am 694d0295: am 6fa20187: Make sure we get to discover that the cache is ↵Andreas Huber2013-10-171-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sufficiently full again * commit '694d0295b986e4ed8f91e71cc5ac8af0341be1de': Make sure we get to discover that the cache is sufficiently full again
| * | | | | | | am 6fa20187: Make sure we get to discover that the cache is sufficiently ↵Andreas Huber2013-10-171-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | full again * commit '6fa20187e4cf9ace5692979a84741484f19e3f57': Make sure we get to discover that the cache is sufficiently full again
| | * | | | | | Make sure we get to discover that the cache is sufficiently full againAndreas Huber2013-10-171-1/+1
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by posting buffering events while in the CACHE_UNDERRUN state. Change-Id: Ic60c8d57f0ae502aa2b6eec7160dc4224b989604 related-to-bug: 11262689
* | | | | | | am b2059ff3: am f8f15b05: Merge "Fix race condition in AudioTrack::pause ↵Glenn Kasten2013-10-162-7/+9
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | followed by start" into klp-dev * commit 'b2059ff384eee8ffb70a7ec8fc5570405201c734': Fix race condition in AudioTrack::pause followed by start
| * | | | | | am f8f15b05: Merge "Fix race condition in AudioTrack::pause followed by ↵Glenn Kasten2013-10-162-7/+9
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | start" into klp-dev * commit 'f8f15b05fe051009945c9042a1a9260280e0feb2': Fix race condition in AudioTrack::pause followed by start
| | * | | | | Merge "Fix race condition in AudioTrack::pause followed by start" into klp-devGlenn Kasten2013-10-172-7/+9
| | |\ \ \ \ \
| | | * | | | | Fix race condition in AudioTrack::pause followed by startGlenn Kasten2013-10-162-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11148722 Change-Id: Iec88f00c8510363d4418e4b8d5b34feb06ecf04d
* | | | | | | | am fc24dc1a: am 787c0d04: merge in klp-release (no-op)Ed Heyl2013-10-160-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fc24dc1a2e2ba8d74bfadfadb01d12a542828561': Camera: Skip AE precapture when possible Cleanup openRecord error handling TimedEventQueue takes a wake lock fix offload audio effect proxy implementation uuid MediaCodecInfo: report supported color formats for non-native-window mode Camera2 API: Hack: Always use async mode with GLConsumer AudioTrack: fix music resume