summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* NBAIO::Format_from_SR_C requires audio_format_t parameterGlenn Kasten2014-03-074-6/+5
* Merge "Remove checks for specific sample rates and channel counts"Glenn Kasten2014-03-071-18/+0
|\
| * Remove checks for specific sample rates and channel countsGlenn Kasten2014-03-061-18/+0
* | Merge "Remove restriction for HAL streams of AUDIO_FORMAT_PCM_16_BIT"Glenn Kasten2014-03-072-14/+10
|\ \ | |/
| * Remove restriction for HAL streams of AUDIO_FORMAT_PCM_16_BITGlenn Kasten2014-03-062-14/+10
* | am 40659dea: am 47ef192f: am a11111f9: Merge changes Id28b35fd,Ie4e64977,I295...Eino-Ville Talvala2014-03-070-0/+0
|\ \
| * \ am 47ef192f: am a11111f9: Merge changes Id28b35fd,Ie4e64977,I2950f31e into kl...Eino-Ville Talvala2014-03-073-55/+66
| |\ \
| | * \ am a11111f9: Merge changes Id28b35fd,Ie4e64977,I2950f31e into klp-devEino-Ville Talvala2014-03-073-55/+66
| | |\ \
| | | * \ Merge changes Id28b35fd,Ie4e64977,I2950f31e into klp-devEino-Ville Talvala2014-03-073-55/+66
| | | |\ \
| | | | * | DO NOT MERGE: Camera: fix focusArea wrong indexing issueZhijun He2014-03-051-14/+14
| | | | * | DO NOT MERGE: camera2: Fix race with stream deletion during disconnect.Ruben Brunk2014-03-051-6/+8
| | | | * | DO NOT MERGE: camera2/3: Add protection for still capture pathZhijun He2014-03-051-35/+44
* | | | | | am 51b7125b: am bfc26066: am ed4d8b28: Merge "stagefright: do not offload LD-...Eric Laurent2014-03-070-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am bfc26066: am ed4d8b28: Merge "stagefright: do not offload LD-AAC decoding"...Eric Laurent2014-03-070-0/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | am ed4d8b28: Merge "stagefright: do not offload LD-AAC decoding" into klp-devEric Laurent2014-03-070-0/+0
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge "stagefright: do not offload LD-AAC decoding" into klp-devEric Laurent2014-03-073-0/+15
| | | |\ \ \
| | | | * | | stagefright: do not offload LD-AAC decodingEric Laurent2014-03-063-0/+15
* | | | | | | am 8f379f63: am 4ed0b0b6: am 880413f7: Merge "stagefright: fix offloading HE-...Eric Laurent2014-03-070-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 4ed0b0b6: am 880413f7: Merge "stagefright: fix offloading HE-AAC sampling ...Eric Laurent2014-03-060-0/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 880413f7: Merge "stagefright: fix offloading HE-AAC sampling rate." into k...Eric Laurent2014-03-060-0/+0
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge "stagefright: fix offloading HE-AAC sampling rate." into klp-devEric Laurent2014-03-061-17/+23
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | stagefright: fix offloading HE-AAC sampling rate.Eric Laurent2014-03-051-17/+23
* | | | | | | am afa5263f: am 395c2fc0: Merge "audioflinger: Fix for a deadlock in track cr...Glenn Kasten2014-03-070-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 395c2fc0: Merge "audioflinger: Fix for a deadlock in track creation"Glenn Kasten2014-03-060-0/+0
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge "audioflinger: Fix for a deadlock in track creation"Glenn Kasten2014-03-062-2/+5
| | |\ \ \ \ \ \
| | | * | | | | | audioflinger: Fix for a deadlock in track creationHaynes Mathew George2014-03-062-2/+5
| | |/ / / / / /
* | | | | | | | am eff98dde: am 2b6191fd: am 3b7ddf83: set AAC MPEG version to MPEG-2Chong Zhang2014-03-070-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 2b6191fd: am 3b7ddf83: set AAC MPEG version to MPEG-2Chong Zhang2014-03-061-1/+1
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | am 3b7ddf83: set AAC MPEG version to MPEG-2Chong Zhang2014-03-061-1/+1
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | set AAC MPEG version to MPEG-2Chong Zhang2014-03-061-1/+1
| | | | |/ / / | | | |/| | |
* | | | | | | 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
* | | | | | | | Merge "Remove Format_frameBitShift()"Glenn Kasten2014-03-076-10/+2
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Remove Format_frameBitShift()Glenn Kasten2014-03-066-10/+2
* | | | | | | | 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
* | | | | | | | Merge "Split mPacked into 4 separate fields"Glenn Kasten2014-03-062-71/+19
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Split mPacked into 4 separate fieldsGlenn Kasten2014-03-062-71/+19
* | | | | | | | 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
* | | | | | | | Merge "Use mFrameSize instead of mBitShift"Glenn Kasten2014-03-0610-20/+20
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Use mFrameSize instead of mBitShiftGlenn Kasten2014-03-0610-20/+20
* | | | | | | | 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
* | | | | | | | | 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
* | | | | | | | 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
* | | | | | | | | 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