Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix build after merge from AOSP | Glenn Kasten | 2014-02-10 | 1 | -8/+4 |
* | am 5a458ede: am 5930e8eb: Merge "AudioFlinger: Remove code for supporting res... | Glenn Kasten | 2014-02-10 | 4 | -26/+5 |
|\ | |||||
| * | am 5930e8eb: Merge "AudioFlinger: Remove code for supporting resampling in fa... | Glenn Kasten | 2014-02-10 | 4 | -26/+5 |
| |\ | |||||
| | * | Merge "AudioFlinger: Remove code for supporting resampling in fast tracks" | Glenn Kasten | 2014-02-10 | 4 | -26/+5 |
| | |\ | |||||
| | | * | AudioFlinger: Remove code for supporting resampling in fast tracks | Martin Storsjo | 2014-02-05 | 4 | -26/+5 |
* | | | | am 4e12dade: am 4361749d: Merge "AudioTrack: Never try to use the fast path i... | Glenn Kasten | 2014-02-10 | 3 | -5/+6 |
|\ \ \ \ | |/ / / | |||||
| * | | | am 4361749d: Merge "AudioTrack: Never try to use the fast path if resampling ... | Glenn Kasten | 2014-02-10 | 3 | -5/+6 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge "AudioTrack: Never try to use the fast path if resampling is required" | Glenn Kasten | 2014-02-10 | 3 | -5/+6 |
| | |\ \ | | | |/ | |||||
| | | * | AudioTrack: Never try to use the fast path if resampling is required | Martin Storsjo | 2014-01-31 | 3 | -5/+6 |
* | | | | Merge "Fix regression" | Marco Nelissen | 2014-02-10 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Fix regression | Marco Nelissen | 2014-02-10 | 1 | -1/+1 |
* | | | | | am af8a3e29: am 7142d10a: Merge "avcenc: Update video port parameters in the ... | Lajos Molnar | 2014-02-10 | 1 | -0/+11 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | am 7142d10a: Merge "avcenc: Update video port parameters in the base class" | Lajos Molnar | 2014-02-10 | 1 | -0/+11 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Merge "avcenc: Update video port parameters in the base class" | Lajos Molnar | 2014-02-10 | 1 | -0/+11 |
| | |\ \ \ | |||||
| | | * | | | avcenc: Update video port parameters in the base class | Martin Storsjo | 2013-11-21 | 1 | -0/+11 |
* | | | | | | am d2b566f3: (-s ours) am 61bdaaa1: Merge "ChromiumHTTPDataSource: Keep track... | Lajos Molnar | 2014-02-10 | 0 | -0/+0 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | am 61bdaaa1: Merge "ChromiumHTTPDataSource: Keep track of the redirected URL" | Lajos Molnar | 2014-02-10 | 3 | -0/+7 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge "ChromiumHTTPDataSource: Keep track of the redirected URL" | Lajos Molnar | 2014-02-10 | 3 | -0/+7 |
| | |\ \ \ \ | |||||
| | | * | | | | ChromiumHTTPDataSource: Keep track of the redirected URL | Martin Storsjo | 2013-11-25 | 3 | -0/+7 |
* | | | | | | | am 25da2f09: am 88e99f9a: Merge "SoftVPXEncoder: Set the frame size on the ou... | Lajos Molnar | 2014-02-10 | 1 | -0/+3 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am 88e99f9a: Merge "SoftVPXEncoder: Set the frame size on the output port as ... | Lajos Molnar | 2014-02-10 | 1 | -0/+3 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Merge "SoftVPXEncoder: Set the frame size on the output port as well" | Lajos Molnar | 2014-02-10 | 1 | -0/+3 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | SoftVPXEncoder: Set the frame size on the output port as well | Martin Storsjo | 2013-11-25 | 1 | -0/+3 |
| | | |/ / / / | |||||
* | | | | | | | am 15f08b1e: am 44f2b8c2: Merge "M3UParser: Fix typo in 8883a38a308" | Marco Nelissen | 2014-02-10 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am 44f2b8c2: Merge "M3UParser: Fix typo in 8883a38a308" | Marco Nelissen | 2014-02-10 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Merge "M3UParser: Fix typo in 8883a38a308" | Marco Nelissen | 2014-02-10 | 1 | -1/+1 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | M3UParser: Fix typo in 8883a38a308 | Martin Storsjo | 2014-02-10 | 1 | -1/+1 |
| | |/ / / / / | |||||
* | | | | | | | Merge "Pretty up audioflinger dumpsys" | Marco Nelissen | 2014-02-10 | 8 | -190/+374 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Pretty up audioflinger dumpsys | Marco Nelissen | 2014-02-10 | 8 | -190/+374 |
* | | | | | | | | Fix build | Marco Nelissen | 2014-02-10 | 1 | -1/+1 |
* | | | | | | | | am 7cbaf3be: am 8519b8a1: Merge "M3UParser: Skip query strings when looking f... | Marco Nelissen | 2014-02-10 | 1 | -12/+22 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | / / | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | am 8519b8a1: Merge "M3UParser: Skip query strings when looking for the last s... | Marco Nelissen | 2014-02-10 | 1 | -12/+22 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | * | | | | | Merge "M3UParser: Skip query strings when looking for the last slash in a URL" | Marco Nelissen | 2014-02-10 | 1 | -12/+22 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | M3UParser: Skip query strings when looking for the last slash in a URL | Martin Storsjo | 2014-02-05 | 1 | -12/+22 |
* | | | | | | | | Merge "Use printf format %#x for audio_format_t in logs" | Glenn Kasten | 2014-02-10 | 5 | -19/+19 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Use printf format %#x for audio_format_t in logs | Glenn Kasten | 2014-02-07 | 5 | -19/+19 |
* | | | | | | | | | am 429f2bf7: am e2307ccb: Merge "frameworks/av: fix errors inside ALOGV" | Colin Cross | 2014-02-10 | 3 | -2/+4 |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | am e2307ccb: Merge "frameworks/av: fix errors inside ALOGV" | Colin Cross | 2014-02-07 | 4 | -5/+4 |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||||
| | * | | | | | | | Merge "frameworks/av: fix errors inside ALOGV" | Colin Cross | 2014-02-07 | 4 | -5/+4 |
| | |\ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | |||||
| | | * | | | | | | frameworks/av: fix errors inside ALOGV | Colin Cross | 2014-02-06 | 4 | -5/+4 |
| | |/ / / / / / | |||||
* | | | | | | | | Merge "Fix warnings about unused parameters" | Glenn Kasten | 2014-02-07 | 2 | -10/+16 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix warnings about unused parameters | Glenn Kasten | 2014-02-07 | 2 | -10/+16 |
* | | | | | | | | | Merge "Fix whitespace" | Glenn Kasten | 2014-02-07 | 6 | -31/+45 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | |||||
| * | | | | | | | | Fix whitespace | Glenn Kasten | 2014-02-07 | 6 | -31/+45 |
* | | | | | | | | | Merge "set AAC MPEG version to MPEG-2" | Chong Zhang | 2014-02-07 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | set AAC MPEG version to MPEG-2 | Chong Zhang | 2014-02-07 | 1 | -1/+1 |
* | | | | | | | | | | Merge "Change Format_frameBitShift() API for non-power-of-2 sizes" | Glenn Kasten | 2014-02-07 | 2 | -2/+4 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Change Format_frameBitShift() API for non-power-of-2 sizes | Glenn Kasten | 2014-02-03 | 2 | -2/+4 |
* | | | | | | | | | | | Merge "Add FIXMEs about audio_format_t assumption" | Glenn Kasten | 2014-02-07 | 2 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Add FIXMEs about audio_format_t assumption | Glenn Kasten | 2014-02-03 | 2 | -0/+3 |