Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Print statistics after ctrl-C | Marco Nelissen | 2013-12-05 | 1 | -16/+43 |
* | am 7ecfe4ec: am 92630351: Merge "NuPlayer: Use a software renderer when using... | Marco Nelissen | 2013-12-02 | 4 | -2/+42 |
|\ | |||||
| * | am 92630351: Merge "NuPlayer: Use a software renderer when using software cod... | Marco Nelissen | 2013-11-28 | 4 | -2/+42 |
| |\ | |||||
| | * | Merge "NuPlayer: Use a software renderer when using software codecs" | Marco Nelissen | 2013-11-28 | 4 | -2/+42 |
| | |\ | |||||
| | | * | NuPlayer: Use a software renderer when using software codecs | Martin Storsjo | 2013-09-25 | 4 | -2/+42 |
* | | | | Merge "Code simplification and movement to prepare for mActiveTracks" | Glenn Kasten | 2013-12-02 | 1 | -19/+22 |
|\ \ \ \ | |||||
| * | | | | Code simplification and movement to prepare for mActiveTracks | Glenn Kasten | 2013-11-20 | 1 | -19/+22 |
* | | | | | AudioTrack: fix position callback after restore | Eric Laurent | 2013-11-27 | 1 | -1/+0 |
* | | | | | Merge "camera2/3: Add protection for still capture path" | Zhijun He | 2013-11-27 | 1 | -35/+44 |
|\ \ \ \ \ | |||||
| * | | | | | camera2/3: Add protection for still capture path | Zhijun He | 2013-11-26 | 1 | -35/+44 |
* | | | | | | am 616c2cf1: am 90892d1b: Merge "Fix SIGABRT when playing mp4 file" | Marco Nelissen | 2013-11-26 | 1 | -0/+6 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | am 90892d1b: Merge "Fix SIGABRT when playing mp4 file" | Marco Nelissen | 2013-11-26 | 1 | -0/+6 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | Merge "Fix SIGABRT when playing mp4 file" | Marco Nelissen | 2013-11-26 | 1 | -0/+6 |
| | |\ \ \ \ | |||||
| | | * | | | | Fix SIGABRT when playing mp4 file | Marco Nelissen | 2013-11-25 | 1 | -0/+6 |
| | |/ / / / | |||||
* | | | | | | Merge "Avoid the call to CameraSourceTimeLapse::trySettingVideoSize if initia... | Robert Shih | 2013-11-26 | 2 | -2/+4 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Avoid the call to CameraSourceTimeLapse::trySettingVideoSize if initialization | Robert Shih | 2013-11-22 | 2 | -2/+4 |
* | | | | | | am 97f6618f: am 11e71558: Merge "Fixed data offset at parsing IPMP Descriptors" | Marco Nelissen | 2013-11-25 | 1 | -1/+2 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | am 11e71558: Merge "Fixed data offset at parsing IPMP Descriptors" | Marco Nelissen | 2013-11-25 | 1 | -1/+2 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | Merge "Fixed data offset at parsing IPMP Descriptors" | Marco Nelissen | 2013-11-25 | 1 | -1/+2 |
| | |\ \ \ \ | |||||
| | | * | | | | Fixed data offset at parsing IPMP Descriptors | Ichitaro Kohara | 2013-11-25 | 1 | -1/+2 |
| | |/ / / / | |||||
* | | | | | | am 52716352: am 5bf2560c: Merge commit \'b2059ff384eee8ffb70a7ec8fc5570405201... | The Android Open Source Project | 2013-11-22 | 0 | -0/+0 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | am 5bf2560c: Merge commit \'b2059ff384eee8ffb70a7ec8fc5570405201c734\' into HEAD | The Android Open Source Project | 2013-11-22 | 0 | -0/+0 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge commit 'b2059ff384eee8ffb70a7ec8fc5570405201c734' into HEAD | The Android Open Source Project | 2013-11-22 | 355 | -6227/+22264 |
| | |\ \ \ \ | |||||
* | | \ \ \ \ | Merge "Check all server-provided sp<IMemory>" | Glenn Kasten | 2013-11-22 | 3 | -0/+12 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Check all server-provided sp<IMemory> | Glenn Kasten | 2013-11-20 | 3 | -0/+12 |
* | | | | | | | | Merge "Fix bug in creation of EffectHandle when out of memory" | Glenn Kasten | 2013-11-22 | 3 | -9/+15 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Fix bug in creation of EffectHandle when out of memory | Glenn Kasten | 2013-11-20 | 3 | -9/+15 |
* | | | | | | | | Merge "Consistent error checking for sp<IMemory> and pointer()" | Glenn Kasten | 2013-11-22 | 2 | -5/+15 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Consistent error checking for sp<IMemory> and pointer() | Glenn Kasten | 2013-11-20 | 2 | -5/+15 |
* | | | | | | | | audioflinger: fix offload write buffer offset | Eric Laurent | 2013-11-22 | 1 | -2/+2 |
* | | | | | | | | Merge "update offloaded audio track sampling rate" | Eric Laurent | 2013-11-22 | 9 | -4/+53 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | update offloaded audio track sampling rate | Eric Laurent | 2013-11-22 | 9 | -4/+53 |
* | | | | | | | | | Merge "Camera3: Remove request from InFlightMap for error case" | Zhijun He | 2013-11-21 | 1 | -2/+4 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Camera3: Remove request from InFlightMap for error case | Zhijun He | 2013-11-21 | 1 | -2/+4 |
* | | | | | | | | | Merge "Code simplification for timed allocate" | Glenn Kasten | 2013-11-21 | 1 | -5/+2 |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Code simplification for timed allocate | Glenn Kasten | 2013-11-20 | 1 | -5/+2 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Only send a format change if the buffer has data | Marco Nelissen | 2013-11-20 | 1 | -1/+1 |
* | | | | | | | | Fix the help text | Andy McFadden | 2013-11-19 | 1 | -2/+2 |
|/ / / / / / / | |||||
* | | | | | | | Merge "screenrecord fixes" | Andy McFadden | 2013-11-19 | 5 | -12/+32 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | screenrecord fixes | Andy McFadden | 2013-11-19 | 5 | -12/+32 |
* | | | | | | | | Merge "Camera3: add systraces for hal open/close" | Zhijun He | 2013-11-19 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | Camera3: add systraces for hal open/close | Zhijun He | 2013-11-19 | 1 | -0/+4 |
* | | | | | | | | Merge "The member mRefreshState was removed in commit and the printout causes" | Andreas Huber | 2013-11-19 | 1 | -3/+0 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | The member mRefreshState was removed in commit and the printout causes | Andreas Huber | 2013-11-18 | 1 | -3/+0 |
* | | | | | | | | Merge "Add "--bugreport" option to screenrecord" | Andy McFadden | 2013-11-19 | 12 | -99/+8473 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add "--bugreport" option to screenrecord | Andy McFadden | 2013-11-18 | 12 | -99/+8473 |
* | | | | | | | | | am 72afcd5d: am 5ea5b020: Merge "WA: Queue extra buffers on output port durin... | Lajos Molnar | 2013-11-18 | 2 | -0/+30 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | / / / / / | | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | am 5ea5b020: Merge "WA: Queue extra buffers on output port during reconfig if... | Lajos Molnar | 2013-11-18 | 2 | -0/+30 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge "WA: Queue extra buffers on output port during reconfig if input EOS-ed... | Lajos Molnar | 2013-11-19 | 2 | -0/+30 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | WA: Queue extra buffers on output port during reconfig if input EOS-ed | Lajos Molnar | 2013-11-14 | 2 | -0/+30 |