summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* audio policy: fix regression in incall notification managementEric Laurent2015-07-021-2/+5
* Merge "stagefright: prevent allocating stale buffers for OMX decoders" into m...Lajos Molnar2015-07-014-12/+33
|\
| * stagefright: prevent allocating stale buffers for OMX decodersLajos Molnar2015-07-014-12/+33
* | stagefright: fix deadlock and NPE in GraphicBufferSourceLajos Molnar2015-07-013-10/+15
* | am 907d0c52: (-s ours) am 9cc01515: am 4e2a1310: am fc9c5e60: am d5d23f64: am...Eric Laurent2015-07-010-0/+0
|\ \
| * \ am 9cc01515: am 4e2a1310: am fc9c5e60: am d5d23f64: am 36d73eab: am 0e35e4f9:...Eric Laurent2015-06-300-0/+0
| |\ \
| | * \ am 4e2a1310: am fc9c5e60: am d5d23f64: am 36d73eab: am 0e35e4f9: am c655561b:...Eric Laurent2015-06-300-0/+0
| | |\ \
| | | * \ am fc9c5e60: am d5d23f64: am 36d73eab: am 0e35e4f9: am c655561b: (-s ours) am...Eric Laurent2015-06-300-0/+0
| | | |\ \
| | | | * \ am d5d23f64: am 36d73eab: am 0e35e4f9: am c655561b: (-s ours) am 29b83cbb: DO...Eric Laurent2015-06-300-0/+0
| | | | |\ \
| | | | | * \ am 36d73eab: am 0e35e4f9: am c655561b: (-s ours) am 29b83cbb: DO NOT MERGE - ...Eric Laurent2015-06-300-0/+0
| | | | | |\ \
| | | | | | * \ am 0e35e4f9: am c655561b: (-s ours) am 29b83cbb: DO NOT MERGE - audio effects...Eric Laurent2015-06-300-0/+0
| | | | | | |\ \
| | | | | | | * \ am c655561b: (-s ours) am 29b83cbb: DO NOT MERGE - audio effects: fix heap ov...Eric Laurent2015-06-300-0/+0
| | | | | | | |\ \
| | | | | | | | * \ am 29b83cbb: DO NOT MERGE - audio effects: fix heap overflowEric Laurent2015-06-236-154/+103
| | | | | | | | |\ \
| | | | | | | | | * | DO NOT MERGE - audio effects: fix heap overflowEric Laurent2015-06-236-154/+103
* | | | | | | | | | | resolved conflicts for merge of ca12af3f to mnc-devWei Jia2015-07-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 2d80c0a1: am a549658b: am 7397892d: am 402eaab9: am 370290f4: am bcd5edf9:...Wei Jia2015-06-301-0/+4
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | am a549658b: am 7397892d: am 402eaab9: am 370290f4: am bcd5edf9: am 13c925ca:...Wei Jia2015-06-301-0/+4
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | am 7397892d: am 402eaab9: am 370290f4: am bcd5edf9: am 13c925ca: am 6ff53b96:...Wei Jia2015-06-301-0/+4
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / /
| | | | * | | | | | | am 402eaab9: am 370290f4: am bcd5edf9: am 13c925ca: am 6ff53b96: Merge "Preve...Wei Jia2015-06-301-0/+4
| | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / /
| | | | | * | | | | | am 370290f4: am bcd5edf9: am 13c925ca: am 6ff53b96: Merge "Prevent integer ov...Wei Jia2015-06-301-0/+4
| | | | | |\ \ \ \ \ \ | | | | | | |/ / / / /
| | | | | | * | | | | am bcd5edf9: am 13c925ca: am 6ff53b96: Merge "Prevent integer overflow when p...Wei Jia2015-06-301-0/+4
| | | | | | |\ \ \ \ \ | | | | | | | |/ / / /
| | | | | | | * | | | am 13c925ca: am 6ff53b96: Merge "Prevent integer overflow when processing cov...Wei Jia2015-06-301-0/+4
| | | | | | | |\ \ \ \ | | | | | | | | |/ / /
| | | | | | | | * | | am 6ff53b96: Merge "Prevent integer overflow when processing covr MPEG4 atoms...Wei Jia2015-06-051-0/+4
| | | | | | | | |\ \ \ | | | | | | | | | |/ /
| | | | | | | | | * | Merge "Prevent integer overflow when processing covr MPEG4 atoms" into klp-devWei Jia2015-06-051-0/+4
| | | | | | | | | |\ \
| | | | | | | | | | * | Prevent integer overflow when processing covr MPEG4 atomsJoshua J. Drake2015-06-031-0/+4
* | | | | | | | | | | | Merge "Camera3-Device: Fix AE lock available" into mnc-devChien-Yu Chen2015-07-012-16/+16
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Camera3-Device: Fix AE lock availableChien-Yu Chen2015-06-302-16/+16
* | | | | | | | | | | | | Merge "libstagefright: parse /etc/media_codecs_performance.xml for performanc...Ronghua Wu2015-07-011-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | libstagefright: parse /etc/media_codecs_performance.xml for performance data.Ronghua Wu2015-06-121-1/+2
* | | | | | | | | | | | | | Merge "Fix SoftMP3 divide by 0" into mnc-devAndy Hung2015-07-011-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix SoftMP3 divide by 0Andy Hung2015-06-301-2/+6
* | | | | | | | | | | | | | | Merge "ignore buffers that's already removed" into mnc-devChong Zhang2015-06-301-4/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | ignore buffers that's already removedChong Zhang2015-06-291-4/+19
| * | | | | | | | | | | | | | merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-240-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-230-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | stagefright: allow state change while handling OMX message listLajos Molnar2015-06-222-1/+11
| | | * | | | | | | | | | | | | | stagefright: handle removal of a tracked buffer in ACodecLajos Molnar2015-06-223-14/+27
| | | * | | | | | | | | | | | | | Fix clamp issue with AudioMixer with float input and int16 outputAndy Hung2015-06-191-3/+2
| | | * | | | | | | | | | | | | | fix buffer leak due to unreleased last repeat frameChong Zhang2015-06-182-56/+56
| | | * | | | | | | | | | | | | | merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-180-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-170-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-160-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | | | Revert "stagefright: relax check of OMX buffer header"Rachad Alao2015-06-151-12/+8
| | | | | | * | | | | | | | | | | | | | merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-150-0/+0
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | * | | | | | | | | | | | | | Revert "stagefright: relax check of OMX buffer header"Rachad Alao2015-06-151-12/+8
| | | | | | | * | | | | | | | | | | | | | merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-130-0/+0
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / / / / / / / / | | | | | | |/| | | | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | | | | stagefright: relax check of OMX buffer headerLajos Molnar2015-06-121-8/+12
| | | | | | * | | | | | | | | | | | | | | merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-110-0/+0
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | * | | | | | | | | | | | | | | stagefright: fix legacy support for CameraSourceLajos Molnar2015-06-102-19/+24
| | | | | | | * | | | | | | | | | | | | | | merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-100-0/+0
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \