Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "NuPlayer: Use a software renderer when using software codecs" | Marco Nelissen | 2013-11-28 | 4 | -2/+42 |
|\ | |||||
| * | NuPlayer: Use a software renderer when using software codecs | Martin Storsjo | 2013-09-25 | 4 | -2/+42 |
* | | Merge "Fix SIGABRT when playing mp4 file" | Marco Nelissen | 2013-11-26 | 1 | -0/+6 |
|\ \ | |||||
| * | | Fix SIGABRT when playing mp4 file | Marco Nelissen | 2013-11-25 | 1 | -0/+6 |
|/ / | |||||
* | | Merge "Fixed data offset at parsing IPMP Descriptors" | Marco Nelissen | 2013-11-25 | 1 | -1/+2 |
|\ \ | |||||
| * | | Fixed data offset at parsing IPMP Descriptors | Ichitaro Kohara | 2013-11-25 | 1 | -1/+2 |
|/ / | |||||
* | | Merge commit 'b2059ff384eee8ffb70a7ec8fc5570405201c734' into HEAD | The Android Open Source Project | 2013-11-22 | 355 | -6227/+22264 |
|\ \ | |||||
| * \ | am f8f15b05: Merge "Fix race condition in AudioTrack::pause followed by start... | Glenn Kasten | 2013-10-16 | 2 | -7/+9 |
| |\ \ | |||||
| | * \ | Merge "Fix race condition in AudioTrack::pause followed by start" into klp-dev | Glenn Kasten | 2013-10-17 | 2 | -7/+9 |
| | |\ \ | |||||
| | | * | | Fix race condition in AudioTrack::pause followed by start | Glenn Kasten | 2013-10-16 | 2 | -7/+9 |
| * | | | | am 787c0d04: merge in klp-release (no-op) | Ed Heyl | 2013-10-16 | 0 | -0/+0 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | merge in klp-release (no-op) | Ed Heyl | 2013-10-16 | 0 | -0/+0 |
| | |\ \ \ | |||||
| | | * \ \ | merge in klp-release history after reset to klp-dev | The Android Automerger | 2013-10-15 | 0 | -0/+0 |
| | | |\ \ \ | | | | |/ / | | | |/| | | |||||
| | | | * | | merge in klp-release history after reset to klp-dev | The Android Automerger | 2013-10-13 | 0 | -0/+0 |
| | | | |\ \ | |||||
| | | | | * \ | merge in klp-release history after reset to klp-dev | The Android Automerger | 2013-10-13 | 0 | -0/+0 |
| | | | | |\ \ | |||||
| | | | | | * | | Camera: Skip AE precapture when possible | Zhijun He | 2013-10-11 | 1 | -0/+12 |
| | | | | | * | | merge in klp-release history after reset to klp-dev | The Android Automerger | 2013-10-10 | 0 | -0/+0 |
| | | | | | |\ \ | |||||
| | | | | | | * \ | merge in klp-release history after reset to klp-dev | The Android Automerger | 2013-10-09 | 0 | -0/+0 |
| | | | | | | |\ \ | |||||
| | | | | | | | * | | Cleanup openRecord error handling | Glenn Kasten | 2013-10-07 | 5 | -3/+29 |
| | | | | | | | * | | merge in klp-release history after reset to klp-dev | The Android Automerger | 2013-10-06 | 0 | -0/+0 |
| | | | | | | | |\ \ | |||||
| | | | | | | | | * | | TimedEventQueue takes a wake lock | Eric Laurent | 2013-10-04 | 3 | -3/+99 |
| | | | | | | | | * | | fix offload audio effect proxy implementation uuid | Eric Laurent | 2013-10-04 | 1 | -1/+2 |
| | | | | | | | | * | | merge in klp-release history after reset to klp-dev | The Android Automerger | 2013-10-02 | 0 | -0/+0 |
| | | | | | | | | |\ \ | |||||
| | | | | | | | | | * | | MediaCodecInfo: report supported color formats for non-native-window mode | Lajos Molnar | 2013-10-01 | 1 | -6/+6 |
| | | | | | | | | | * | | merge in klp-release history after reset to klp-dev | The Android Automerger | 2013-10-01 | 0 | -0/+0 |
| | | | | | | | | | |\ \ | |||||
| | | | | | | | | | | * \ | merge in klp-release history after reset to klp-dev | The Android Automerger | 2013-09-29 | 0 | -0/+0 |
| | | | | | | | | | | |\ \ | |||||
| | | | | | | | | | | | * | | Camera2 API: Hack: Always use async mode with GLConsumer | Eino-Ville Talvala | 2013-09-26 | 1 | -1/+18 |
| | | | | | | | | | | | * | | merge in klp-release history after reset to klp-dev | The Android Automerger | 2013-09-26 | 0 | -0/+0 |
| | | | | | | | | | | | |\ \ | |||||
| | | | | | | | | | | | | * \ | merge in klp-release history after reset to klp-dev | The Android Automerger | 2013-09-25 | 0 | -0/+0 |
| | | | | | | | | | | | | |\ \ | |||||
| | | | | | | | | | | | | | * \ | merge in klp-release history after reset to klp-dev | The Android Automerger | 2013-09-24 | 0 | -0/+0 |
| | | | | | | | | | | | | | |\ \ | |||||
| | | | | | | | | | | | | | | * | | AudioTrack: fix music resume | Eric Laurent | 2013-09-23 | 2 | -4/+6 |
| | | | | | | | | | | | | | | * | | merge in klp-release history after reset to klp-dev | The Android Automerger | 2013-09-22 | 0 | -0/+0 |
| | | | | | | | | | | | | | | |\ \ | |||||
| * | | | | | | | | | | | | | | \ \ | am 3defdab8: Merge "Camera: don\'t do hw support check for ZSL" into klp-dev | Zhijun He | 2013-10-16 | 1 | -13/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | | Merge "Camera: don't do hw support check for ZSL" into klp-dev | Zhijun He | 2013-10-16 | 1 | -13/+5 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | | | Camera: don't do hw support check for ZSL | Zhijun He | 2013-10-16 | 1 | -13/+5 |
| | | |/ / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | am 120a8847: Merge "AudioTrack: fix head position after restore" into klp-dev | Eric Laurent | 2013-10-16 | 3 | -1/+26 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | | Merge "AudioTrack: fix head position after restore" into klp-dev | Eric Laurent | 2013-10-16 | 3 | -1/+26 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | | | AudioTrack: fix head position after restore | Eric Laurent | 2013-10-16 | 3 | -1/+26 |
| | | |/ / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | am d5766875: AwesomePlayer: fix concurrent pause and teardown | Eric Laurent | 2013-10-16 | 1 | -0/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | | AwesomePlayer: fix concurrent pause and teardown | Eric Laurent | 2013-10-15 | 1 | -0/+6 |
| | |/ / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | am 014e7fa2: Make Audio wakelock names less unique. | Narayan Kamath | 2013-10-14 | 2 | -2/+23 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | Make Audio wakelock names less unique. | Narayan Kamath | 2013-10-14 | 2 | -2/+23 |
| | |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | am b3cb72a1: SoundPool: handle new audio track event | Eric Laurent | 2013-10-13 | 1 | -2/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | SoundPool: handle new audio track event | Eric Laurent | 2013-10-12 | 1 | -2/+7 |
| | |/ / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | am 15ad2470: Camera: Fix deadlock in Camera3OutputStream | Zhijun He | 2013-10-11 | 1 | -1/+16 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | Camera: Fix deadlock in Camera3OutputStream | Zhijun He | 2013-10-11 | 1 | -1/+16 |
| * | | | | | | | | | | | | | | am d5ed2263: Merge "Camera: Skip AE precapture when possible" into klp-dev | Zhijun He | 2013-10-11 | 1 | -0/+12 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | Merge "Camera: Skip AE precapture when possible" into klp-dev | Zhijun He | 2013-10-11 | 1 | -0/+12 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | Camera: Skip AE precapture when possible | Zhijun He | 2013-10-11 | 1 | -0/+12 |
| | | |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | am 1dd08b30: Merge "Camera2/3: Add more tracing for API1" into klp-dev | Eino-Ville Talvala | 2013-10-11 | 7 | -2/+56 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / |