Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
* | | | | | | | Merge "Change NBAIO_Format from typedef to struct" | Glenn Kasten | 2014-02-07 | 2 | -7/+12 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Change NBAIO_Format from typedef to struct | Glenn Kasten | 2014-02-03 | 2 | -7/+12 |
* | | | | | | | Merge "Use Format_isValid() and Format_isEqual() instead of direct comparison" | Glenn Kasten | 2014-02-07 | 7 | -12/+12 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Use Format_isValid() and Format_isEqual() instead of direct comparison | Glenn Kasten | 2014-02-03 | 7 | -12/+12 |
* | | | | | | | Merge "Add Format_isValid() and Format_isEqual() to NBAIO" | Glenn Kasten | 2014-02-07 | 2 | -0/+16 |
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | | | |||||
| * | | | | | Add Format_isValid() and Format_isEqual() to NBAIO | Glenn Kasten | 2014-02-03 | 2 | -0/+16 |
* | | | | | | Merge "AudioFlinger: Offload track transition fix" | Eric Laurent | 2014-02-07 | 2 | -5/+21 |
|\ \ \ \ \ \ | |||||
| * | | | | | | AudioFlinger: Offload track transition fix | Haynes Mathew George | 2014-02-06 | 2 | -5/+21 |
* | | | | | | | Merge "AudioFlinger: Modify flush handling for offload path" | Eric Laurent | 2014-02-07 | 4 | -15/+31 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | AudioFlinger: Modify flush handling for offload path | Haynes Mathew George | 2014-02-06 | 4 | -15/+31 |
* | | | | | | | Merge "audioflinger: OffloadThread state fix" | Eric Laurent | 2014-02-07 | 1 | -3/+2 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | audioflinger: OffloadThread state fix | Haynes Mathew George | 2014-02-06 | 1 | -3/+2 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge "Fix IoConfigEvent constructor initializer list" | Glenn Kasten | 2014-02-07 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Fix IoConfigEvent constructor initializer list | Glenn Kasten | 2014-02-03 | 1 | -1/+1 |
* | | | | | | Merge "Remove libstagefright_http_support from the PDK build." | Andreas Huber | 2014-02-06 | 1 | -0/+4 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Remove libstagefright_http_support from the PDK build. | Andreas Huber | 2014-02-06 | 1 | -0/+4 |
* | | | | | | Merge "Change StagefrightRecorder to use MediaCodec" | Chong Zhang | 2014-02-06 | 14 | -197/+1290 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Change StagefrightRecorder to use MediaCodec | Chong Zhang | 2014-02-05 | 14 | -197/+1290 |
* | | | | | | Merge "Fix restart after EOS for mp3" | Marco Nelissen | 2014-02-06 | 1 | -0/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix restart after EOS for mp3 | Marco Nelissen | 2014-02-05 | 1 | -0/+3 |
* | | | | | | | Merge "Remove no longer needed http proxy handling code, it's obsolete now" | Andreas Huber | 2014-02-06 | 30 | -1666/+14 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Remove no longer needed http proxy handling code, it's obsolete now | Andreas Huber | 2014-02-05 | 30 | -1666/+14 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge "Add AudioRecord::mReqFrameCount similar to AudioTrack" | Glenn Kasten | 2014-02-05 | 2 | -8/+21 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Add AudioRecord::mReqFrameCount similar to AudioTrack | Glenn Kasten | 2014-02-05 | 2 | -8/+21 |
* | | | | | | | Merge "FINAL ATTEMPT: HTTP services are now provided from JAVA and made avail... | Andreas Huber | 2014-02-05 | 80 | -130/+1065 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | FINAL ATTEMPT: HTTP services are now provided from JAVA and made available to... | Andreas Huber | 2014-02-04 | 80 | -130/+1065 |
* | | | | | | | | am 5ef74dce: am d66cd743: Merge "audioflinger: conform inline ASM to UAL" | Glenn Kasten | 2014-02-05 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | / / | | |_|_|_|/ / | |/| | | | | | |||||
| * | | | | | | am d66cd743: Merge "audioflinger: conform inline ASM to UAL" | Glenn Kasten | 2014-02-05 | 1 | -2/+2 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| | * | | | | | Merge "audioflinger: conform inline ASM to UAL" | Glenn Kasten | 2014-02-05 | 1 | -2/+2 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | audioflinger: conform inline ASM to UAL | synergy dev | 2014-02-04 | 1 | -2/+2 |
| | |/ / / / / | |||||
* | | | | | | | Merge "audioflinger: Fix for a deadlock in track creation" | Glenn Kasten | 2014-02-05 | 2 | -4/+4 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | audioflinger: Fix for a deadlock in track creation | Haynes Mathew George | 2014-01-30 | 2 | -4/+4 |
* | | | | | | | Merge "Fix unused parameter warnings in audio" | Glenn Kasten | 2014-02-04 | 12 | -48/+52 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix unused parameter warnings in audio | Glenn Kasten | 2014-02-03 | 12 | -48/+52 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge "Change Format_Invalid from enum to global const" | Glenn Kasten | 2014-02-04 | 2 | -3/+4 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | Change Format_Invalid from enum to global const | Glenn Kasten | 2014-02-03 | 2 | -3/+4 |