Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am 903871da: am 83790fcc: am bdf33c98: Merge "Fix compilation warning: incorr... | Glenn Kasten | 2013-06-28 | 1 | -1/+1 |
|\ | |||||
| * | am 83790fcc: am bdf33c98: Merge "Fix compilation warning: incorrect format sp... | Glenn Kasten | 2013-06-28 | 1 | -1/+1 |
| |\ | |||||
| | * | am bdf33c98: Merge "Fix compilation warning: incorrect format specifier for t... | Glenn Kasten | 2013-06-28 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Merge "Fix compilation warning: incorrect format specifier for type 'ssize_t'." | Glenn Kasten | 2013-06-28 | 1 | -1/+1 |
| | | |\ | |||||
| | | | * | Fix compilation warning: incorrect format specifier for type 'ssize_t'. | Scott Fan | 2013-06-27 | 1 | -1/+1 |
| | | |/ | |||||
* | | | | Merge "Public API changes for audio offload support." | Eric Laurent | 2013-06-28 | 29 | -65/+281 |
|\ \ \ \ | |||||
| * | | | | Public API changes for audio offload support. | Richard Fitzgerald | 2013-06-27 | 29 | -65/+281 |
* | | | | | resolved conflicts for merge of 364a2677 to master | Eino-Ville Talvala | 2013-06-28 | 2 | -32/+84 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| * | | | am a691ff3c: Camera2/3: Don\'t allow recording and callbacks to coexist. | Eino-Ville Talvala | 2013-06-28 | 2 | -29/+85 |
| |\ \ \ | |||||
| | * | | | Camera2/3: Don't allow recording and callbacks to coexist. | Eino-Ville Talvala | 2013-06-27 | 2 | -29/+85 |
* | | | | | am bdebd481: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge | The Android Open Source Project | 2013-06-25 | 0 | -0/+0 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Reconcile with jb-mr2-zeroday-release - do not merge | The Android Open Source Project | 2013-06-25 | 0 | -0/+0 |
| |\ \ \ \ | |||||
| | * \ \ \ | merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev | The Android Automerger | 2013-06-24 | 0 | -0/+0 |
| | |\ \ \ \ | | | |/ / / | | |/| | | | |||||
| | | * | | | Merge remote-tracking branch 'origin/jb-mr2-zeroday-release' into HEAD | The Android Automerger | 2013-06-24 | 0 | -0/+0 |
| | | |\ \ \ | |||||
* | | | \ \ \ | am 1aee0be6: am 3a4ff0b8: am d74a9ee8: Merge "libstagefright: fix the duratio... | Jean-Baptiste Queru | 2013-06-25 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am 3a4ff0b8: am d74a9ee8: Merge "libstagefright: fix the duration "00:00" for... | Jean-Baptiste Queru | 2013-06-25 | 0 | -0/+0 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | am d74a9ee8: Merge "libstagefright: fix the duration "00:00" for some httpliv... | Jean-Baptiste Queru | 2013-06-25 | 0 | -0/+0 |
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | |||||
| | | * | | | | Merge "libstagefright: fix the duration "00:00" for some httplive link" | Jean-Baptiste Queru | 2013-06-25 | 1 | -3/+0 |
| | | |\ \ \ \ | |||||
| | | | * | | | | libstagefright: fix the duration "00:00" for some httplive link | ywan171 | 2012-08-24 | 1 | -3/+0 |
* | | | | | | | | Merge "Adds VP9 decoding support for stagefright." | Lajos Molnar | 2013-06-25 | 12 | -25/+60 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Adds VP9 decoding support for stagefright. | hkuang | 2013-06-24 | 12 | -25/+60 |
* | | | | | | | | | Merge "Workaround AudioRecord bug for large buffer sizes" | Glenn Kasten | 2013-06-25 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Workaround AudioRecord bug for large buffer sizes | Glenn Kasten | 2013-06-24 | 1 | -1/+2 |
* | | | | | | | | | | Merge "Use mFutex as an event flag rather than semaphore" | Glenn Kasten | 2013-06-25 | 2 | -7/+7 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Use mFutex as an event flag rather than semaphore | Glenn Kasten | 2013-06-24 | 2 | -7/+7 |
* | | | | | | | | | | Merge changes I5b2eeab2,I71568560 | Igor Murashkin | 2013-06-25 | 23 | -164/+1915 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Make android.hardware.photography.Camera work on HAL3+ devices | Igor Murashkin | 2013-06-20 | 7 | -19/+129 |
| * | | | | | | | | | | Initial implementation of android.hardware.photography.CameraDevice (service) | Igor Murashkin | 2013-06-20 | 20 | -145/+1786 |
* | | | | | | | | | | | Merge "stagefright: support for video decoder metadata mode" | Lajos Molnar | 2013-06-24 | 2 | -15/+195 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | stagefright: support for video decoder metadata mode | Lajos Molnar | 2013-06-21 | 2 | -15/+195 |
* | | | | | | | | | | | am e6105c26: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge | The Android Open Source Project | 2013-06-21 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | / / / / / / / | | |_|/ / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Reconcile with jb-mr2-zeroday-release - do not merge | The Android Open Source Project | 2013-06-21 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||||
| | * | | | | | | | | merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev | The Android Automerger | 2013-06-21 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | / | | | | |_|_|_|_|/ | | | |/| | | | | | |||||
* | | | | | | | | | am 455479bc: am 209bbbcf: Apply EQ and bass boost first in effect chain | Jean-Michel Trivi | 2013-06-20 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | am 209bbbcf: Apply EQ and bass boost first in effect chain | Jean-Michel Trivi | 2013-06-20 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | Apply EQ and bass boost first in effect chain | Jean-Michel Trivi | 2013-06-20 | 1 | -2/+2 |
* | | | | | | | | | camera2/3: Warn on missing active array size parameters | Alex Ray | 2013-06-20 | 1 | -0/+2 |
* | | | | | | | | | am d3ac2fc0: am f3e21c30: am 60f3f102: Merge "Prevent AudioCommands being fre... | Glenn Kasten | 2013-06-20 | 1 | -6/+8 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | / / / / / | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | am f3e21c30: am 60f3f102: Merge "Prevent AudioCommands being freed before read" | Glenn Kasten | 2013-06-20 | 1 | -6/+8 |
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | |||||
| | * | | | | | | am 60f3f102: Merge "Prevent AudioCommands being freed before read" | Glenn Kasten | 2013-06-20 | 1 | -6/+8 |
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | | |||||
| | | * | | | | | Merge "Prevent AudioCommands being freed before read" | Glenn Kasten | 2013-06-20 | 1 | -6/+8 |
| | | |\ \ \ \ \ | |||||
| | | | * | | | | | Prevent AudioCommands being freed before read | Christer Fletcher | 2013-06-20 | 1 | -6/+8 |
* | | | | | | | | | am 9c8714da: am e6478de7: Camera2/3: Avoid shutdown race in callback processor. | Eino-Ville Talvala | 2013-06-19 | 1 | -1/+4 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | / / | |_|_|_|_|_|/ / |/| | | | | | | | |||||
| * | | | | | | | am e6478de7: Camera2/3: Avoid shutdown race in callback processor. | Eino-Ville Talvala | 2013-06-19 | 1 | -1/+4 |
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | |||||
| | * | | | | | | Camera2/3: Avoid shutdown race in callback processor. | Eino-Ville Talvala | 2013-06-19 | 1 | -1/+4 |
* | | | | | | | | am bda5d1f2: am 241b5279: Camera3: Power: Properly shut down unused thread. | Eino-Ville Talvala | 2013-06-17 | 1 | -2/+3 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | am 241b5279: Camera3: Power: Properly shut down unused thread. | Eino-Ville Talvala | 2013-06-17 | 1 | -2/+3 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Camera3: Power: Properly shut down unused thread. | Eino-Ville Talvala | 2013-06-17 | 1 | -2/+3 |
* | | | | | | | | Merge "Speed up id3v2 unsynchronization" | Marco Nelissen | 2013-06-17 | 1 | -5/+10 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Speed up id3v2 unsynchronization | Marco Nelissen | 2013-06-17 | 1 | -5/+10 |