summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Simplify AudioTrack stream end and fix race"Glenn Kasten2014-03-071-17/+15
|\
| * Simplify AudioTrack stream end and fix raceGlenn Kasten2013-09-291-17/+15
| | | | | | | | | | Bug: 10994052 Change-Id: Ib2e38e7a600bcffef8cbc68c1722e40fbbc7ea67
* | Merge "Remove Format_frameBitShift()"Glenn Kasten2014-03-076-10/+2
|\ \
| * | Remove Format_frameBitShift()Glenn Kasten2014-03-066-10/+2
| | | | | | | | | | | | Change-Id: Iae2e80a7330c5dd0f70a263051aa44c23cfe3541
* | | Merge "Re-implement Format_frameSize(), to support non-power-of-2"Glenn Kasten2014-03-071-2/+1
|\ \ \ | |/ /
| * | Re-implement Format_frameSize(), to support non-power-of-2Glenn Kasten2014-03-061-2/+1
| | | | | | | | | | | | Change-Id: I671bd4f03ce70de685770fd7992e2e023133c9b4
* | | Merge "Split mPacked into 4 separate fields"Glenn Kasten2014-03-062-71/+19
|\ \ \ | |/ /
| * | Split mPacked into 4 separate fieldsGlenn Kasten2014-03-062-71/+19
| | | | | | | | | | | | Change-Id: I940324dce9b51fd8d7e2e362e12ad74b70e658dd
* | | Merge "Add format parameter to Format_from_SR_C"Glenn Kasten2014-03-062-3/+6
|\ \ \ | |/ /
| * | Add format parameter to Format_from_SR_CGlenn Kasten2014-03-062-3/+6
| | | | | | | | | | | | Change-Id: I891138b7754342fe2a4f02de30ee616dbd078474
* | | Merge "Use mFrameSize instead of mBitShift"Glenn Kasten2014-03-0610-20/+20
|\ \ \ | |/ /
| * | Use mFrameSize instead of mBitShiftGlenn Kasten2014-03-0610-20/+20
| | | | | | | | | | | | Change-Id: Idac335ae70cc9300bb3325839fe8ef1e9e097245
* | | Merge "AudioTrack: When paused, return cached playback position"Eric Laurent2014-03-062-3/+23
|\ \ \
| * | | AudioTrack: When paused, return cached playback positionHaynes Mathew George2014-03-062-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An offload output can be re-used between two audio tracks having the same configuration. A timestamp query for a paused track while the other is running would return an incorrect time. To fix this, cache the playback position on a pause() and return this time when requested until the track is resumed. Bug: 12826612. Change-Id: I324112ea9827e52fff53ef44cd8513c8d85a0bc4
* | | | Merge "Add mFrameSize but do not remove mFrameBitShift yet"Glenn Kasten2014-03-065-2/+8
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Add mFrameSize but do not remove mFrameBitShift yetGlenn Kasten2014-03-065-2/+8
| | | | | | | | | | | | Change-Id: Icb1edefeb6a0e659503f6b7a92c9d15784df9865
* | | Merge "audio policy service: clean up type casting."Eric Laurent2014-03-061-6/+8
|\ \ \
| * | | audio policy service: clean up type casting.Eric Laurent2014-03-051-6/+8
| | | | | | | | | | | | | | | | Change-Id: If16d6495c16e0d61a221f81bfd49e7d14bbfdc12
* | | | Merge "Use larger capture pipe since we support resampling by 6:1"Glenn Kasten2014-03-061-3/+3
|\ \ \ \
| * | | | Use larger capture pipe since we support resampling by 6:1Glenn Kasten2014-02-281-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids overruns on the client AudioRecord side, without requiring client to use a large buffer. It should not increase input latency, since a newly started AudioRecord always joins the stream starting at the latest data. Change-Id: Ib2b8de75cc40a6a3d493a1f8b46b41220f69264f
* | | | | Merge "FramebufferNativeWindow.h is obsolete"Andy McFadden2014-03-061-1/+0
|\ \ \ \ \
| * | | | | FramebufferNativeWindow.h is obsoleteAndy McFadden2014-03-051-1/+0
| | |_|/ / | |/| | | | | | | | | | | | | Change-Id: I7d2b06bc711694deb481ae50596080b6bef23f11
* | | | | am fbae2674: am a4aa88b8: am 9e64cd42: am d812fc01: Increase ↵Glenn Kasten2014-03-060-0/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kFastTrackMultiplier from 1 to 2 * commit 'fbae2674688c6dc0a267d4da139061d7abc287fd': Increase kFastTrackMultiplier from 1 to 2
| * \ \ \ \ am a4aa88b8: am 9e64cd42: am d812fc01: Increase kFastTrackMultiplier from 1 to 2Glenn Kasten2014-03-050-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a4aa88b8a9eb4028120363f226f7df6dfc8871a0': Increase kFastTrackMultiplier from 1 to 2
| | * \ \ \ \ am 9e64cd42: am d812fc01: Increase kFastTrackMultiplier from 1 to 2Glenn Kasten2014-03-050-0/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9e64cd42032665c90c52804c1042b3671621cda5': Increase kFastTrackMultiplier from 1 to 2
| | | * \ \ \ \ am d812fc01: Increase kFastTrackMultiplier from 1 to 2Glenn Kasten2014-03-050-0/+0
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd812fc012298470a1b8120e6d60a24b0b1d48047': Increase kFastTrackMultiplier from 1 to 2
| | | | * | | | | Increase kFastTrackMultiplier from 1 to 2Glenn Kasten2014-03-052-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11967381 Change-Id: Iedec06280aa745d9df5d661f4916940cede9c191
* | | | | | | | | am c1e06f69: am 09e45992: am 25a86930: am 88876fb4: AudioTrack: fix ↵Eric Laurent2014-03-060-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | obtainBuffer timeout calculation * commit 'c1e06f692cf16a8c9f5ae921ab4d642f7a082877': AudioTrack: fix obtainBuffer timeout calculation
| * | | | | | | | am 09e45992: am 25a86930: am 88876fb4: AudioTrack: fix obtainBuffer timeout ↵Eric Laurent2014-03-052-2/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | calculation * commit '09e45992067f03a05f82400a6cacf16bb8018f16': AudioTrack: fix obtainBuffer timeout calculation
| | * | | | | | | am 25a86930: am 88876fb4: AudioTrack: fix obtainBuffer timeout calculationEric Laurent2014-03-052-2/+2
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '25a86930ac0ccf4750ad2fb0c2f5a4a122d24ecf': AudioTrack: fix obtainBuffer timeout calculation
| | | * | | | | | am 88876fb4: AudioTrack: fix obtainBuffer timeout calculationEric Laurent2014-03-052-2/+2
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '88876fb4eb8365343f2a9ca0e8f53148ca38b845': AudioTrack: fix obtainBuffer timeout calculation
| | | | * | | | | AudioTrack: fix obtainBuffer timeout calculationEric Laurent2014-03-052-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioTrack::obtainBuffer() passes a pointer to a timeout variable that has gone out of scope when calling ClientProxy::obtainBuffer(). Same fix for AudioRecord. Bug: 11968591. Change-Id: I5b3d0d86ed2bd8c0412eb2432b1ab519d70efce9
* | | | | | | | | am 5d3e310a: am 44130bf5: am 994d9bad: am 145b727b: libstagefright: Delay ↵Haynes Mathew George2014-03-060-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | release of wakelock in TimedEventQueue * commit '5d3e310a847d090b7f79554154d25c70be8fd594': libstagefright: Delay release of wakelock in TimedEventQueue
| * | | | | | | | am 44130bf5: am 994d9bad: am 145b727b: libstagefright: Delay release of ↵Haynes Mathew George2014-03-050-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wakelock in TimedEventQueue * commit '44130bf528842445254537604ed628ad4ac1507b': libstagefright: Delay release of wakelock in TimedEventQueue
| | * | | | | | | am 994d9bad: am 145b727b: libstagefright: Delay release of wakelock in ↵Haynes Mathew George2014-03-050-0/+0
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TimedEventQueue * commit '994d9bad4c545cc8861e971f9dbcb4c061ee19ed': libstagefright: Delay release of wakelock in TimedEventQueue
| | | * | | | | | am 145b727b: libstagefright: Delay release of wakelock in TimedEventQueueHaynes Mathew George2014-03-050-0/+0
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '145b727b4cce8b1b8d161612f30d12bbdfc8d134': libstagefright: Delay release of wakelock in TimedEventQueue
| | | | * | | | | libstagefright: Delay release of wakelock in TimedEventQueueHaynes Mathew George2014-03-052-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delay release of wakelock in the TimedEventQueue to after an event has been processed. This ensures AP shutdown does not happen while an event is ready but hasn't been processed yet. Bug: 11976087. Change-Id: I9bce83b9ff0f2b4d174a53c95e5b0f135b5ccc70
* | | | | | | | | am 40e95fe9: am 5248efb0: am 4f4c9a22: am 281dd4e1: audioflinger: fix static ↵Eric Laurent2014-03-060-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | track end detection * commit '40e95fe9aafc71832ac2878275c3e4eb2a72f1c7': audioflinger: fix static track end detection
| * | | | | | | | am 5248efb0: am 4f4c9a22: am 281dd4e1: audioflinger: fix static track end ↵Eric Laurent2014-03-050-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | detection * commit '5248efb0eecb20b2d5c02aa844c4dc7aeb925c16': audioflinger: fix static track end detection
| | * | | | | | | am 4f4c9a22: am 281dd4e1: audioflinger: fix static track end detectionEric Laurent2014-03-051-9/+2
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4f4c9a22f4676c65bcae77f0805dcd699b3ba475': audioflinger: fix static track end detection
| | | * | | | | | am 281dd4e1: audioflinger: fix static track end detectionEric Laurent2014-03-051-9/+2
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '281dd4e13309973dbb85bce531f884237e0d8fb0': audioflinger: fix static track end detection
| | | | * | | | | audioflinger: fix static track end detectionEric Laurent2014-03-051-9/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a static track is not a fast track, prepareTracks_l() must rely on framesReady() to detect end of buffer and remove the track from the active track list. Failing to do so results in the track staying active but not processed by the mixer because in underrun. This leaves the mix buffer content uninitialized and causes the effect process function to accumulate its output onto undefined data. Bug: 12013676. Change-Id: I4b0819a9d93141ac3307b8786fc6a451dd585220
* | | | | | | | | am 8984577e: am 854e547d: am c7753b12: am abab1c33: AudioMixer: Remove ↵Gaurav Kumar2014-03-060-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tracks from enabledTracks after reseting outTemp * commit '8984577e0f2389a8763bdbcab6c5979d21038b4b': AudioMixer: Remove tracks from enabledTracks after reseting outTemp
| * | | | | | | | am 854e547d: am c7753b12: am abab1c33: AudioMixer: Remove tracks from ↵Gaurav Kumar2014-03-050-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enabledTracks after reseting outTemp * commit '854e547d219ea4c7258d72442052f744dc7fc0f4': AudioMixer: Remove tracks from enabledTracks after reseting outTemp
| | * | | | | | | am c7753b12: am abab1c33: AudioMixer: Remove tracks from enabledTracks after ↵Gaurav Kumar2014-03-050-0/+0
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reseting outTemp * commit 'c7753b12a9c8c1cba69ba75bccc0083c37bc67f1': AudioMixer: Remove tracks from enabledTracks after reseting outTemp
| | | * | | | | | am abab1c33: AudioMixer: Remove tracks from enabledTracks after reseting outTempGaurav Kumar2014-03-050-0/+0
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'abab1c33caf0982c11713e6d64d60105dcbc8ab7': AudioMixer: Remove tracks from enabledTracks after reseting outTemp
| | | | * | | | | AudioMixer: Remove tracks from enabledTracks after reseting outTempGaurav Kumar2014-03-051-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If any track goes through AudioMixer::process__genericNoResampling, and its getnextbuffer returns NULL, Then that track is removed by AudioMixer from enabledTracks. Thus if all tracks getnextbuffer return NULL, Then this function doesn't reset outTemp and last buffer in AudioFlinger's mMixBuffer will be repeated and noise is observed. Remove tracks from enabledTracks after reseting outTemp to zero, so that process__genericNoResampling will reset outTemp and noise won't appear. Bug: 12450065 Change-Id: I28996d425838728955f01eb1a00acf6e6dc2dea1 Signed-off-by: Gaurav Kumar <gaurav.kumar@broadcom.com> Signed-off-by: Pierre Couillaud <pierre@broadcom.com>
* | | | | | | | | am 25bebdf9: am 1de5c060: am ec94f7a6: am d0115d8c: update offloaded audio ↵Eric Laurent2014-03-060-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | track sampling rate * commit '25bebdf9a8d3b6ddb37882994b2800c3e15b60f5': update offloaded audio track sampling rate
| * | | | | | | | am 1de5c060: am ec94f7a6: am d0115d8c: update offloaded audio track sampling ↵Eric Laurent2014-03-050-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rate * commit '1de5c060ea60f2fa982cfb340686deb158c9154a': update offloaded audio track sampling rate
| | * | | | | | | am ec94f7a6: am d0115d8c: update offloaded audio track sampling rateEric Laurent2014-03-050-0/+0
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ec94f7a6eba6f55175c39c3abcd64046ecd413ad': update offloaded audio track sampling rate