Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | | | | Support for MPEG2 video | Changwan Ryu | 2014-01-21 | 2 | -0/+4 | |
* | | | | | | | | | Merge "AudioTrack: fix obtainBuffer timeout calculation" | Eric Laurent | 2014-01-28 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | AudioTrack: fix obtainBuffer timeout calculation | Eric Laurent | 2014-01-27 | 2 | -2/+2 | |
* | | | | | | | | | am bb9e396d: am 06f7d151: am 06da69d5: Merge "frameworks/av: convert LOCAL_MO... | Colin Cross | 2014-01-28 | 8 | -10/+10 | |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | ||||||
| * | | | | | | | | am 06f7d151: am 06da69d5: Merge "frameworks/av: convert LOCAL_MODULE_PATH to ... | Colin Cross | 2014-01-28 | 8 | -10/+10 | |
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | ||||||
| | * | | | | | | | am 06da69d5: Merge "frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_... | Colin Cross | 2014-01-28 | 8 | -10/+10 | |
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | | | ||||||
| | | * | | | | | | Merge "frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH" | Colin Cross | 2014-01-28 | 8 | -10/+10 | |
| | | |\ \ \ \ \ \ | ||||||
| | | | * | | | | | | frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH | Colin Cross | 2014-01-27 | 8 | -10/+10 | |
| | | |/ / / / / / | ||||||
* | | | | | | | | | camera3: Delete output stream of bi-directional stream | Zhijun He | 2014-01-27 | 1 | -3/+7 | |
| |_|_|/ / / / / |/| | | | | | | | ||||||
* | | | | | | | | am 1ae4b6ce: am fe6db33a: am 4ef1dc2d: Merge "Only increase the counter when ... | Eric Laurent | 2014-01-27 | 1 | -5/+7 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | am fe6db33a: am 4ef1dc2d: Merge "Only increase the counter when we do take a ... | Eric Laurent | 2014-01-27 | 1 | -5/+7 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | ||||||
| | * | | | | | | am 4ef1dc2d: Merge "Only increase the counter when we do take a wakelock" | Eric Laurent | 2014-01-27 | 1 | -5/+7 | |
| | |\ \ \ \ \ \ | | | |/ / / / / | ||||||
| | | * | | | | | Merge "Only increase the counter when we do take a wakelock" | Eric Laurent | 2014-01-27 | 1 | -5/+7 | |
| | | |\ \ \ \ \ | ||||||
| | | | * | | | | | Only increase the counter when we do take a wakelock | Jimmy Dalqvist | 2014-01-22 | 1 | -5/+7 | |
* | | | | | | | | | am 9f875b27: am 8ba3192f: am d0e7e801: Merge "Do partial reads in MemoryLeakT... | Eric Laurent | 2014-01-27 | 1 | -3/+11 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | ||||||
| * | | | | | | | | am 8ba3192f: am d0e7e801: Merge "Do partial reads in MemoryLeakTrackUtil" | Eric Laurent | 2014-01-27 | 1 | -3/+11 | |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | / / / / | | |_|_|/ / / / | |/| | | | | | | ||||||
| | * | | | | | | am d0e7e801: Merge "Do partial reads in MemoryLeakTrackUtil" | Eric Laurent | 2014-01-27 | 1 | -3/+11 | |
| | |\ \ \ \ \ \ | | | |/ / / / / | ||||||
| | | * | | | | | Merge "Do partial reads in MemoryLeakTrackUtil" | Eric Laurent | 2014-01-27 | 1 | -3/+11 | |
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | | | ||||||
| | | | * | | | | Do partial reads in MemoryLeakTrackUtil | Oscar Rydhé | 2014-01-23 | 1 | -3/+11 | |
| | | |/ / / / | ||||||
* | | | | | | | Merge "Camera: delete preview callback when preview size is changed" | Zhijun He | 2014-01-27 | 1 | -0/+16 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Camera: delete preview callback when preview size is changed | Zhijun He | 2014-01-24 | 1 | -0/+16 | |
* | | | | | | | | Merge "Camera3: Flush device before ZSL reprocess" | Zhijun He | 2014-01-27 | 2 | -1/+17 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | Camera3: Flush device before ZSL reprocess | Zhijun He | 2014-01-23 | 2 | -1/+17 | |
| | |_|_|_|/ / | |/| | | | | | ||||||
* | | | | | | | Merge "Remove the redundant parameters from createTrack_l()" | Glenn Kasten | 2014-01-24 | 2 | -69/+42 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Remove the redundant parameters from createTrack_l() | Glenn Kasten | 2014-01-24 | 2 | -69/+42 | |
* | | | | | | | | Merge "Refactor code related to I/O handles to reduce chance for leaks" | Glenn Kasten | 2014-01-24 | 4 | -53/+72 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | Refactor code related to I/O handles to reduce chance for leaks | Glenn Kasten | 2014-01-24 | 4 | -53/+72 | |
* | | | | | | | | Merge "Camera: delete zsl stream for video mode" | Zhijun He | 2014-01-24 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Camera: delete zsl stream for video mode | Zhijun He | 2013-11-01 | 1 | -0/+2 | |
* | | | | | | | | Merge "Replace control block frameCount_ by explicit in/out parameter" | Glenn Kasten | 2014-01-24 | 11 | -29/+49 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Replace control block frameCount_ by explicit in/out parameter | Glenn Kasten | 2013-12-20 | 11 | -29/+49 | |
* | | | | | | | | camera3: Update sceneMode tag spec. | Ruben Brunk | 2014-01-17 | 2 | -10/+10 | |
* | | | | | | | | Merge "Fix build. Missing vendor_tag header." | Ruben Brunk | 2014-01-17 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix build. Missing vendor_tag header. | Ruben Brunk | 2014-01-17 | 1 | -0/+1 | |
* | | | | | | | | | Merge "Use uint32_t sequence numbers for IAudioRecord" | Glenn Kasten | 2014-01-17 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Use uint32_t sequence numbers for IAudioRecord | Glenn Kasten | 2014-01-16 | 2 | -2/+2 | |
* | | | | | | | | | | am 4f8bb114: am 1526c2e1: am 96a7b5a9: Merge "Long mp3 metadata displays as c... | Marco Nelissen | 2014-01-17 | 3 | -18/+26 | |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | ||||||
| * | | | | | | | | | am 1526c2e1: am 96a7b5a9: Merge "Long mp3 metadata displays as corrupted file... | Marco Nelissen | 2014-01-17 | 3 | -18/+26 | |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | | ||||||
| | * | | | | | | | | am 96a7b5a9: Merge "Long mp3 metadata displays as corrupted file after transfer" | Marco Nelissen | 2014-01-17 | 3 | -18/+26 | |
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | | | ||||||
| | | * | | | | | | | Merge "Long mp3 metadata displays as corrupted file after transfer" | Marco Nelissen | 2014-01-17 | 3 | -18/+26 | |
| | | |\ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | Long mp3 metadata displays as corrupted file after transfer | Yin Liu | 2013-12-20 | 3 | -18/+26 | |
* | | | | | | | | | | | Merge "Document the reference count rules for I/O handles" | Glenn Kasten | 2014-01-17 | 2 | -0/+15 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Document the reference count rules for I/O handles | Glenn Kasten | 2014-01-16 | 2 | -0/+15 | |
* | | | | | | | | | | | | Merge "Make copy of audio_offload_info_t for future use" | Glenn Kasten | 2014-01-17 | 2 | -0/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | Make copy of audio_offload_info_t for future use | Glenn Kasten | 2014-01-16 | 2 | -0/+13 | |
* | | | | | | | | | | | | am 6146f60c: am 319c5640: am 07a017d3: Merge "Added support for ID3v2 meta da... | Marco Nelissen | 2014-01-17 | 6 | -9/+91 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | am 319c5640: am 07a017d3: Merge "Added support for ID3v2 meta data in 3gp files" | Marco Nelissen | 2014-01-17 | 6 | -9/+91 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | ||||||
| | * | | | | | | | | | | am 07a017d3: Merge "Added support for ID3v2 meta data in 3gp files" | Marco Nelissen | 2014-01-17 | 6 | -9/+91 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | ||||||
| | | * | | | | | | | | | Merge "Added support for ID3v2 meta data in 3gp files" | Marco Nelissen | 2014-01-17 | 6 | -9/+91 | |
| | | |\ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | Added support for ID3v2 meta data in 3gp files | Oscar Rydhé | 2014-01-16 | 6 | -9/+91 |