summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | Merge "stagefright: Fix issue with tracking media format in packet source" in...Lajos Molnar2014-03-072-13/+44
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | stagefright: Fix issue with tracking media format in packet sourceLajos Molnar2014-03-062-13/+44
* | | | | | | | | | | | | | am b74b2098: Merge "stagefright: Fix bugs in playlist fetcher logic" into klp...Lajos Molnar2014-03-072-29/+105
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge "stagefright: Fix bugs in playlist fetcher logic" into klp-devLajos Molnar2014-03-072-29/+105
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | | | | / / / / / / / / / / | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | stagefright: Fix bugs in playlist fetcher logicLajos Molnar2014-03-062-29/+105
| | |/ / / / / / / / / /
* | | | | | | | | | | | 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 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 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 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
| |/ / / / / / / / / / /
* | | | | | | | | | | | am 9e64cd42: am d812fc01: Increase kFastTrackMultiplier from 1 to 2Glenn Kasten2014-03-050-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ am d812fc01: Increase kFastTrackMultiplier from 1 to 2Glenn Kasten2014-03-050-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Increase kFastTrackMultiplier from 1 to 2Glenn Kasten2014-03-052-11/+14
* | | | | | | | | | | | | am 25a86930: am 88876fb4: AudioTrack: fix obtainBuffer timeout calculationEric Laurent2014-03-052-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am 88876fb4: AudioTrack: fix obtainBuffer timeout calculationEric Laurent2014-03-052-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | AudioTrack: fix obtainBuffer timeout calculationEric Laurent2014-03-052-2/+2
* | | | | | | | | | | | | am 994d9bad: am 145b727b: libstagefright: Delay release of wakelock in TimedE...Haynes Mathew George2014-03-050-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am 145b727b: libstagefright: Delay release of wakelock in TimedEventQueueHaynes Mathew George2014-03-050-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | libstagefright: Delay release of wakelock in TimedEventQueueHaynes Mathew George2014-03-052-6/+9
* | | | | | | | | | | | | am 4f4c9a22: am 281dd4e1: audioflinger: fix static track end detectionEric Laurent2014-03-051-9/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am 281dd4e1: audioflinger: fix static track end detectionEric Laurent2014-03-051-9/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | audioflinger: fix static track end detectionEric Laurent2014-03-051-9/+2
* | | | | | | | | | | | | am c7753b12: am abab1c33: AudioMixer: Remove tracks from enabledTracks after ...Gaurav Kumar2014-03-050-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am abab1c33: AudioMixer: Remove tracks from enabledTracks after reseting outTempGaurav Kumar2014-03-050-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | AudioMixer: Remove tracks from enabledTracks after reseting outTempGaurav Kumar2014-03-051-4/+7
* | | | | | | | | | | | | am ec94f7a6: am d0115d8c: update offloaded audio track sampling rateEric Laurent2014-03-050-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am d0115d8c: update offloaded audio track sampling rateEric Laurent2014-03-050-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | update offloaded audio track sampling rateEric Laurent2014-03-059-4/+53
* | | | | | | | | | | | | am 7028a2c8: am 7e92abea: audioflinger: fix offload write buffer offsetEric Laurent2014-03-051-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am 7e92abea: audioflinger: fix offload write buffer offsetEric Laurent2014-03-051-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | audioflinger: fix offload write buffer offsetEric Laurent2014-03-051-2/+2
| | |/ / / / / / / / / /
* | | | | | | | | | | | am 6b260425: am 85b3013e: fix deadlock issues that arise when there are simul...jpadmana2014-03-056-55/+88
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am 85b3013e: fix deadlock issues that arise when there are simultaneous effec...jpadmana2014-03-056-55/+88
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | fix deadlock issues that arise when there are simultaneousjpadmana2014-03-046-55/+88
* | | | | | | | | | | | am fc04776a: am 50c3157c: audioflinger: check for condition before waitingHaynes Mathew George2014-03-050-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am 50c3157c: audioflinger: check for condition before waitingHaynes Mathew George2014-03-050-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | audioflinger: check for condition before waitingHaynes Mathew George2014-03-041-1/+6
* | | | | | | | | | | | am 7c206e5b: am e0cd1051: audioflinger: update track ready conditionHaynes Mathew George2014-03-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am e0cd1051: audioflinger: update track ready conditionHaynes Mathew George2014-03-051-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | audioflinger: update track ready conditionHaynes Mathew George2014-03-041-1/+1
* | | | | | | | | | | | am 21e81bca: am e010f65e: audioflinger: Fix for a deadlock in track creationHaynes Mathew George2014-03-052-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am e010f65e: audioflinger: Fix for a deadlock in track creationHaynes Mathew George2014-03-052-2/+6
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /