summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix build after merge from AOSPGlenn Kasten2014-02-101-8/+4
* am 5a458ede: am 5930e8eb: Merge "AudioFlinger: Remove code for supporting res...Glenn Kasten2014-02-104-26/+5
|\
| * am 5930e8eb: Merge "AudioFlinger: Remove code for supporting resampling in fa...Glenn Kasten2014-02-104-26/+5
| |\
| | * Merge "AudioFlinger: Remove code for supporting resampling in fast tracks"Glenn Kasten2014-02-104-26/+5
| | |\
| | | * AudioFlinger: Remove code for supporting resampling in fast tracksMartin Storsjo2014-02-054-26/+5
* | | | am 4e12dade: am 4361749d: Merge "AudioTrack: Never try to use the fast path i...Glenn Kasten2014-02-103-5/+6
|\ \ \ \ | |/ / /
| * | | am 4361749d: Merge "AudioTrack: Never try to use the fast path if resampling ...Glenn Kasten2014-02-103-5/+6
| |\ \ \ | | |/ /
| | * | Merge "AudioTrack: Never try to use the fast path if resampling is required"Glenn Kasten2014-02-103-5/+6
| | |\ \ | | | |/
| | | * AudioTrack: Never try to use the fast path if resampling is requiredMartin Storsjo2014-01-313-5/+6
* | | | Merge "Fix regression"Marco Nelissen2014-02-101-1/+1
|\ \ \ \
| * | | | Fix regressionMarco Nelissen2014-02-101-1/+1
* | | | | am af8a3e29: am 7142d10a: Merge "avcenc: Update video port parameters in the ...Lajos Molnar2014-02-101-0/+11
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am 7142d10a: Merge "avcenc: Update video port parameters in the base class"Lajos Molnar2014-02-101-0/+11
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge "avcenc: Update video port parameters in the base class"Lajos Molnar2014-02-101-0/+11
| | |\ \ \
| | | * | | avcenc: Update video port parameters in the base classMartin Storsjo2013-11-211-0/+11
* | | | | | am d2b566f3: (-s ours) am 61bdaaa1: Merge "ChromiumHTTPDataSource: Keep track...Lajos Molnar2014-02-100-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 61bdaaa1: Merge "ChromiumHTTPDataSource: Keep track of the redirected URL"Lajos Molnar2014-02-103-0/+7
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "ChromiumHTTPDataSource: Keep track of the redirected URL"Lajos Molnar2014-02-103-0/+7
| | |\ \ \ \
| | | * | | | ChromiumHTTPDataSource: Keep track of the redirected URLMartin Storsjo2013-11-253-0/+7
* | | | | | | am 25da2f09: am 88e99f9a: Merge "SoftVPXEncoder: Set the frame size on the ou...Lajos Molnar2014-02-101-0/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 88e99f9a: Merge "SoftVPXEncoder: Set the frame size on the output port as ...Lajos Molnar2014-02-101-0/+3
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "SoftVPXEncoder: Set the frame size on the output port as well"Lajos Molnar2014-02-101-0/+3
| | |\ \ \ \ \
| | | * | | | | SoftVPXEncoder: Set the frame size on the output port as wellMartin Storsjo2013-11-251-0/+3
| | | |/ / / /
* | | | | | | am 15f08b1e: am 44f2b8c2: Merge "M3UParser: Fix typo in 8883a38a308"Marco Nelissen2014-02-100-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 44f2b8c2: Merge "M3UParser: Fix typo in 8883a38a308"Marco Nelissen2014-02-101-1/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "M3UParser: Fix typo in 8883a38a308"Marco Nelissen2014-02-101-1/+1
| | |\ \ \ \ \
| | | * | | | | M3UParser: Fix typo in 8883a38a308Martin Storsjo2014-02-101-1/+1
| | |/ / / / /
* | | | | | | Merge "Pretty up audioflinger dumpsys"Marco Nelissen2014-02-108-190/+374
|\ \ \ \ \ \ \
| * | | | | | | Pretty up audioflinger dumpsysMarco Nelissen2014-02-108-190/+374
* | | | | | | | Fix buildMarco Nelissen2014-02-101-1/+1
* | | | | | | | am 7cbaf3be: am 8519b8a1: Merge "M3UParser: Skip query strings when looking f...Marco Nelissen2014-02-101-12/+22
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | / / | |_|_|_|_|/ / |/| | | | | |
| * | | | | | am 8519b8a1: Merge "M3UParser: Skip query strings when looking for the last s...Marco Nelissen2014-02-101-12/+22
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge "M3UParser: Skip query strings when looking for the last slash in a URL"Marco Nelissen2014-02-101-12/+22
| | |\ \ \ \ \
| | | * | | | | M3UParser: Skip query strings when looking for the last slash in a URLMartin Storsjo2014-02-051-12/+22
* | | | | | | | Merge "Use printf format %#x for audio_format_t in logs"Glenn Kasten2014-02-105-19/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | Use printf format %#x for audio_format_t in logsGlenn Kasten2014-02-075-19/+19
* | | | | | | | | am 429f2bf7: am e2307ccb: Merge "frameworks/av: fix errors inside ALOGV"Colin Cross2014-02-103-2/+4
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | am e2307ccb: Merge "frameworks/av: fix errors inside ALOGV"Colin Cross2014-02-074-5/+4
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Merge "frameworks/av: fix errors inside ALOGV"Colin Cross2014-02-074-5/+4
| | |\ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | | * | | | | | frameworks/av: fix errors inside ALOGVColin Cross2014-02-064-5/+4
| | |/ / / / / /
* | | | | | | | Merge "Fix warnings about unused parameters"Glenn Kasten2014-02-072-10/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix warnings about unused parametersGlenn Kasten2014-02-072-10/+16
* | | | | | | | | Merge "Fix whitespace"Glenn Kasten2014-02-076-31/+45
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Fix whitespaceGlenn Kasten2014-02-076-31/+45
* | | | | | | | | Merge "set AAC MPEG version to MPEG-2"Chong Zhang2014-02-071-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | set AAC MPEG version to MPEG-2Chong Zhang2014-02-071-1/+1
* | | | | | | | | | Merge "Change Format_frameBitShift() API for non-power-of-2 sizes"Glenn Kasten2014-02-072-2/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Change Format_frameBitShift() API for non-power-of-2 sizesGlenn Kasten2014-02-032-2/+4
* | | | | | | | | | | Merge "Add FIXMEs about audio_format_t assumption"Glenn Kasten2014-02-072-0/+3
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Add FIXMEs about audio_format_t assumptionGlenn Kasten2014-02-032-0/+3