Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | audio policy: fix regression in incall notification management | Eric Laurent | 2015-07-02 | 1 | -2/+5 |
* | Merge "stagefright: prevent allocating stale buffers for OMX decoders" into m... | Lajos Molnar | 2015-07-01 | 4 | -12/+33 |
|\ | |||||
| * | stagefright: prevent allocating stale buffers for OMX decoders | Lajos Molnar | 2015-07-01 | 4 | -12/+33 |
* | | stagefright: fix deadlock and NPE in GraphicBufferSource | Lajos Molnar | 2015-07-01 | 3 | -10/+15 |
* | | am 907d0c52: (-s ours) am 9cc01515: am 4e2a1310: am fc9c5e60: am d5d23f64: am... | Eric Laurent | 2015-07-01 | 0 | -0/+0 |
|\ \ | |||||
| * \ | am 9cc01515: am 4e2a1310: am fc9c5e60: am d5d23f64: am 36d73eab: am 0e35e4f9:... | Eric Laurent | 2015-06-30 | 0 | -0/+0 |
| |\ \ | |||||
| | * \ | am 4e2a1310: am fc9c5e60: am d5d23f64: am 36d73eab: am 0e35e4f9: am c655561b:... | Eric Laurent | 2015-06-30 | 0 | -0/+0 |
| | |\ \ | |||||
| | | * \ | am fc9c5e60: am d5d23f64: am 36d73eab: am 0e35e4f9: am c655561b: (-s ours) am... | Eric Laurent | 2015-06-30 | 0 | -0/+0 |
| | | |\ \ | |||||
| | | | * \ | am d5d23f64: am 36d73eab: am 0e35e4f9: am c655561b: (-s ours) am 29b83cbb: DO... | Eric Laurent | 2015-06-30 | 0 | -0/+0 |
| | | | |\ \ | |||||
| | | | | * \ | am 36d73eab: am 0e35e4f9: am c655561b: (-s ours) am 29b83cbb: DO NOT MERGE - ... | Eric Laurent | 2015-06-30 | 0 | -0/+0 |
| | | | | |\ \ | |||||
| | | | | | * \ | am 0e35e4f9: am c655561b: (-s ours) am 29b83cbb: DO NOT MERGE - audio effects... | Eric Laurent | 2015-06-30 | 0 | -0/+0 |
| | | | | | |\ \ | |||||
| | | | | | | * \ | am c655561b: (-s ours) am 29b83cbb: DO NOT MERGE - audio effects: fix heap ov... | Eric Laurent | 2015-06-30 | 0 | -0/+0 |
| | | | | | | |\ \ | |||||
| | | | | | | | * \ | am 29b83cbb: DO NOT MERGE - audio effects: fix heap overflow | Eric Laurent | 2015-06-23 | 6 | -154/+103 |
| | | | | | | | |\ \ | |||||
| | | | | | | | | * | | DO NOT MERGE - audio effects: fix heap overflow | Eric Laurent | 2015-06-23 | 6 | -154/+103 |
* | | | | | | | | | | | resolved conflicts for merge of ca12af3f to mnc-dev | Wei Jia | 2015-07-01 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | am 2d80c0a1: am a549658b: am 7397892d: am 402eaab9: am 370290f4: am bcd5edf9:... | Wei Jia | 2015-06-30 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |||||
| | * | | | | | | | | | am a549658b: am 7397892d: am 402eaab9: am 370290f4: am bcd5edf9: am 13c925ca:... | Wei Jia | 2015-06-30 | 1 | -0/+4 |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | |||||
| | | * | | | | | | | | am 7397892d: am 402eaab9: am 370290f4: am bcd5edf9: am 13c925ca: am 6ff53b96:... | Wei Jia | 2015-06-30 | 1 | -0/+4 |
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | |||||
| | | | * | | | | | | | am 402eaab9: am 370290f4: am bcd5edf9: am 13c925ca: am 6ff53b96: Merge "Preve... | Wei Jia | 2015-06-30 | 1 | -0/+4 |
| | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / / | |||||
| | | | | * | | | | | | am 370290f4: am bcd5edf9: am 13c925ca: am 6ff53b96: Merge "Prevent integer ov... | Wei Jia | 2015-06-30 | 1 | -0/+4 |
| | | | | |\ \ \ \ \ \ | | | | | | |/ / / / / | |||||
| | | | | | * | | | | | am bcd5edf9: am 13c925ca: am 6ff53b96: Merge "Prevent integer overflow when p... | Wei Jia | 2015-06-30 | 1 | -0/+4 |
| | | | | | |\ \ \ \ \ | | | | | | | |/ / / / | |||||
| | | | | | | * | | | | am 13c925ca: am 6ff53b96: Merge "Prevent integer overflow when processing cov... | Wei Jia | 2015-06-30 | 1 | -0/+4 |
| | | | | | | |\ \ \ \ | | | | | | | | |/ / / | |||||
| | | | | | | | * | | | am 6ff53b96: Merge "Prevent integer overflow when processing covr MPEG4 atoms... | Wei Jia | 2015-06-05 | 1 | -0/+4 |
| | | | | | | | |\ \ \ | | | | | | | | | |/ / | |||||
| | | | | | | | | * | | Merge "Prevent integer overflow when processing covr MPEG4 atoms" into klp-dev | Wei Jia | 2015-06-05 | 1 | -0/+4 |
| | | | | | | | | |\ \ | |||||
| | | | | | | | | | * | | Prevent integer overflow when processing covr MPEG4 atoms | Joshua J. Drake | 2015-06-03 | 1 | -0/+4 |
* | | | | | | | | | | | | Merge "Camera3-Device: Fix AE lock available" into mnc-dev | Chien-Yu Chen | 2015-07-01 | 2 | -16/+16 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Camera3-Device: Fix AE lock available | Chien-Yu Chen | 2015-06-30 | 2 | -16/+16 |
* | | | | | | | | | | | | | Merge "libstagefright: parse /etc/media_codecs_performance.xml for performanc... | Ronghua Wu | 2015-07-01 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | libstagefright: parse /etc/media_codecs_performance.xml for performance data. | Ronghua Wu | 2015-06-12 | 1 | -1/+2 |
* | | | | | | | | | | | | | | Merge "Fix SoftMP3 divide by 0" into mnc-dev | Andy Hung | 2015-07-01 | 1 | -2/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Fix SoftMP3 divide by 0 | Andy Hung | 2015-06-30 | 1 | -2/+6 |
* | | | | | | | | | | | | | | | Merge "ignore buffers that's already removed" into mnc-dev | Chong Zhang | 2015-06-30 | 1 | -4/+19 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | ignore buffers that's already removed | Chong Zhang | 2015-06-29 | 1 | -4/+19 |
| * | | | | | | | | | | | | | | merge in mnc-release history after reset to mnc-dev | The Android Automerger | 2015-06-24 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | merge in mnc-release history after reset to mnc-dev | The Android Automerger | 2015-06-23 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | stagefright: allow state change while handling OMX message list | Lajos Molnar | 2015-06-22 | 2 | -1/+11 |
| | | * | | | | | | | | | | | | | | stagefright: handle removal of a tracked buffer in ACodec | Lajos Molnar | 2015-06-22 | 3 | -14/+27 |
| | | * | | | | | | | | | | | | | | Fix clamp issue with AudioMixer with float input and int16 output | Andy Hung | 2015-06-19 | 1 | -3/+2 |
| | | * | | | | | | | | | | | | | | fix buffer leak due to unreleased last repeat frame | Chong Zhang | 2015-06-18 | 2 | -56/+56 |
| | | * | | | | | | | | | | | | | | merge in mnc-release history after reset to mnc-dev | The Android Automerger | 2015-06-18 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | merge in mnc-release history after reset to mnc-dev | The Android Automerger | 2015-06-17 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | merge in mnc-release history after reset to mnc-dev | The Android Automerger | 2015-06-16 | 0 | -0/+0 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | | * | | | | | | | | | | | | | | Revert "stagefright: relax check of OMX buffer header" | Rachad Alao | 2015-06-15 | 1 | -12/+8 |
| | | | | | * | | | | | | | | | | | | | | merge in mnc-release history after reset to mnc-dev | The Android Automerger | 2015-06-15 | 0 | -0/+0 |
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | | | * | | | | | | | | | | | | | | Revert "stagefright: relax check of OMX buffer header" | Rachad Alao | 2015-06-15 | 1 | -12/+8 |
| | | | | | | * | | | | | | | | | | | | | | merge in mnc-release history after reset to mnc-dev | The Android Automerger | 2015-06-13 | 0 | -0/+0 |
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / / / / / / / / | | | | | | |/| | | | | | | | | | | | | | | |||||
| | | | | | * | | | | | | | | | | | | | | | stagefright: relax check of OMX buffer header | Lajos Molnar | 2015-06-12 | 1 | -8/+12 |
| | | | | | * | | | | | | | | | | | | | | | merge in mnc-release history after reset to mnc-dev | The Android Automerger | 2015-06-11 | 0 | -0/+0 |
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | | | * | | | | | | | | | | | | | | | stagefright: fix legacy support for CameraSource | Lajos Molnar | 2015-06-10 | 2 | -19/+24 |
| | | | | | | * | | | | | | | | | | | | | | | merge in mnc-release history after reset to mnc-dev | The Android Automerger | 2015-06-10 | 0 | -0/+0 |
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |