summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | | Merge "Change NBAIO_Format from typedef to struct"Glenn Kasten2014-02-072-7/+12
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Change NBAIO_Format from typedef to structGlenn Kasten2014-02-032-7/+12
* | | | | | | Merge "Use Format_isValid() and Format_isEqual() instead of direct comparison"Glenn Kasten2014-02-077-12/+12
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Use Format_isValid() and Format_isEqual() instead of direct comparisonGlenn Kasten2014-02-037-12/+12
* | | | | | | Merge "Add Format_isValid() and Format_isEqual() to NBAIO"Glenn Kasten2014-02-072-0/+16
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | |
| * | | | | Add Format_isValid() and Format_isEqual() to NBAIOGlenn Kasten2014-02-032-0/+16
* | | | | | Merge "AudioFlinger: Offload track transition fix"Eric Laurent2014-02-072-5/+21
|\ \ \ \ \ \
| * | | | | | AudioFlinger: Offload track transition fixHaynes Mathew George2014-02-062-5/+21
* | | | | | | Merge "AudioFlinger: Modify flush handling for offload path"Eric Laurent2014-02-074-15/+31
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | AudioFlinger: Modify flush handling for offload pathHaynes Mathew George2014-02-064-15/+31
* | | | | | | Merge "audioflinger: OffloadThread state fix"Eric Laurent2014-02-071-3/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | audioflinger: OffloadThread state fixHaynes Mathew George2014-02-061-3/+2
| | |/ / / / | |/| | | |
* | | | | | Merge "Fix IoConfigEvent constructor initializer list"Glenn Kasten2014-02-071-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fix IoConfigEvent constructor initializer listGlenn Kasten2014-02-031-1/+1
* | | | | | Merge "Remove libstagefright_http_support from the PDK build."Andreas Huber2014-02-061-0/+4
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Remove libstagefright_http_support from the PDK build.Andreas Huber2014-02-061-0/+4
* | | | | | Merge "Change StagefrightRecorder to use MediaCodec"Chong Zhang2014-02-0614-197/+1290
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Change StagefrightRecorder to use MediaCodecChong Zhang2014-02-0514-197/+1290
* | | | | | Merge "Fix restart after EOS for mp3"Marco Nelissen2014-02-061-0/+3
|\ \ \ \ \ \
| * | | | | | Fix restart after EOS for mp3Marco Nelissen2014-02-051-0/+3
* | | | | | | Merge "Remove no longer needed http proxy handling code, it's obsolete now"Andreas Huber2014-02-0630-1666/+14
|\ \ \ \ \ \ \
| * | | | | | | Remove no longer needed http proxy handling code, it's obsolete nowAndreas Huber2014-02-0530-1666/+14
| | |/ / / / / | |/| | | | |
* | | | | | | Merge "Add AudioRecord::mReqFrameCount similar to AudioTrack"Glenn Kasten2014-02-052-8/+21
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Add AudioRecord::mReqFrameCount similar to AudioTrackGlenn Kasten2014-02-052-8/+21
* | | | | | | Merge "FINAL ATTEMPT: HTTP services are now provided from JAVA and made avail...Andreas Huber2014-02-0580-130/+1065
|\ \ \ \ \ \ \
| * | | | | | | FINAL ATTEMPT: HTTP services are now provided from JAVA and made available to...Andreas Huber2014-02-0480-130/+1065
* | | | | | | | am 5ef74dce: am d66cd743: Merge "audioflinger: conform inline ASM to UAL"Glenn Kasten2014-02-051-2/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | / / | | |_|_|_|/ / | |/| | | | |
| * | | | | | am d66cd743: Merge "audioflinger: conform inline ASM to UAL"Glenn Kasten2014-02-051-2/+2
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Merge "audioflinger: conform inline ASM to UAL"Glenn Kasten2014-02-051-2/+2
| | |\ \ \ \ \
| | | * | | | | audioflinger: conform inline ASM to UALsynergy dev2014-02-041-2/+2
| | |/ / / / /
* | | | | | | Merge "audioflinger: Fix for a deadlock in track creation"Glenn Kasten2014-02-052-4/+4
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | audioflinger: Fix for a deadlock in track creationHaynes Mathew George2014-01-302-4/+4
* | | | | | | Merge "Fix unused parameter warnings in audio"Glenn Kasten2014-02-0412-48/+52
|\ \ \ \ \ \ \
| * | | | | | | Fix unused parameter warnings in audioGlenn Kasten2014-02-0312-48/+52
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge "Change Format_Invalid from enum to global const"Glenn Kasten2014-02-042-3/+4
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Change Format_Invalid from enum to global constGlenn Kasten2014-02-032-3/+4