summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Print statistics after ctrl-CMarco Nelissen2013-12-051-16/+43
* am 7ecfe4ec: am 92630351: Merge "NuPlayer: Use a software renderer when using...Marco Nelissen2013-12-024-2/+42
|\
| * am 92630351: Merge "NuPlayer: Use a software renderer when using software cod...Marco Nelissen2013-11-284-2/+42
| |\
| | * Merge "NuPlayer: Use a software renderer when using software codecs"Marco Nelissen2013-11-284-2/+42
| | |\
| | | * NuPlayer: Use a software renderer when using software codecsMartin Storsjo2013-09-254-2/+42
* | | | Merge "Code simplification and movement to prepare for mActiveTracks"Glenn Kasten2013-12-021-19/+22
|\ \ \ \
| * | | | Code simplification and movement to prepare for mActiveTracksGlenn Kasten2013-11-201-19/+22
* | | | | AudioTrack: fix position callback after restoreEric Laurent2013-11-271-1/+0
* | | | | Merge "camera2/3: Add protection for still capture path"Zhijun He2013-11-271-35/+44
|\ \ \ \ \
| * | | | | camera2/3: Add protection for still capture pathZhijun He2013-11-261-35/+44
* | | | | | am 616c2cf1: am 90892d1b: Merge "Fix SIGABRT when playing mp4 file"Marco Nelissen2013-11-261-0/+6
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | am 90892d1b: Merge "Fix SIGABRT when playing mp4 file"Marco Nelissen2013-11-261-0/+6
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge "Fix SIGABRT when playing mp4 file"Marco Nelissen2013-11-261-0/+6
| | |\ \ \ \
| | | * | | | Fix SIGABRT when playing mp4 fileMarco Nelissen2013-11-251-0/+6
| | |/ / / /
* | | | | | Merge "Avoid the call to CameraSourceTimeLapse::trySettingVideoSize if initia...Robert Shih2013-11-262-2/+4
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Avoid the call to CameraSourceTimeLapse::trySettingVideoSize if initializationRobert Shih2013-11-222-2/+4
* | | | | | am 97f6618f: am 11e71558: Merge "Fixed data offset at parsing IPMP Descriptors"Marco Nelissen2013-11-251-1/+2
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am 11e71558: Merge "Fixed data offset at parsing IPMP Descriptors"Marco Nelissen2013-11-251-1/+2
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge "Fixed data offset at parsing IPMP Descriptors"Marco Nelissen2013-11-251-1/+2
| | |\ \ \ \
| | | * | | | Fixed data offset at parsing IPMP DescriptorsIchitaro Kohara2013-11-251-1/+2
| | |/ / / /
* | | | | | am 52716352: am 5bf2560c: Merge commit \'b2059ff384eee8ffb70a7ec8fc5570405201...The Android Open Source Project2013-11-220-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 5bf2560c: Merge commit \'b2059ff384eee8ffb70a7ec8fc5570405201c734\' into HEADThe Android Open Source Project2013-11-220-0/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge commit 'b2059ff384eee8ffb70a7ec8fc5570405201c734' into HEADThe Android Open Source Project2013-11-22355-6227/+22264
| | |\ \ \ \
* | | \ \ \ \ Merge "Check all server-provided sp<IMemory>"Glenn Kasten2013-11-223-0/+12
|\ \ \ \ \ \ \
| * | | | | | | Check all server-provided sp<IMemory>Glenn Kasten2013-11-203-0/+12
* | | | | | | | Merge "Fix bug in creation of EffectHandle when out of memory"Glenn Kasten2013-11-223-9/+15
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Fix bug in creation of EffectHandle when out of memoryGlenn Kasten2013-11-203-9/+15
* | | | | | | | Merge "Consistent error checking for sp<IMemory> and pointer()"Glenn Kasten2013-11-222-5/+15
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Consistent error checking for sp<IMemory> and pointer()Glenn Kasten2013-11-202-5/+15
* | | | | | | | audioflinger: fix offload write buffer offsetEric Laurent2013-11-221-2/+2
* | | | | | | | Merge "update offloaded audio track sampling rate"Eric Laurent2013-11-229-4/+53
|\ \ \ \ \ \ \ \
| * | | | | | | | update offloaded audio track sampling rateEric Laurent2013-11-229-4/+53
* | | | | | | | | Merge "Camera3: Remove request from InFlightMap for error case"Zhijun He2013-11-211-2/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Camera3: Remove request from InFlightMap for error caseZhijun He2013-11-211-2/+4
* | | | | | | | | Merge "Code simplification for timed allocate"Glenn Kasten2013-11-211-5/+2
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Code simplification for timed allocateGlenn Kasten2013-11-201-5/+2
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Only send a format change if the buffer has dataMarco Nelissen2013-11-201-1/+1
* | | | | | | | Fix the help textAndy McFadden2013-11-191-2/+2
|/ / / / / / /
* | | | | | | Merge "screenrecord fixes"Andy McFadden2013-11-195-12/+32
|\ \ \ \ \ \ \
| * | | | | | | screenrecord fixesAndy McFadden2013-11-195-12/+32
* | | | | | | | Merge "Camera3: add systraces for hal open/close"Zhijun He2013-11-191-0/+4
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Camera3: add systraces for hal open/closeZhijun He2013-11-191-0/+4
* | | | | | | | Merge "The member mRefreshState was removed in commit and the printout causes"Andreas Huber2013-11-191-3/+0
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | The member mRefreshState was removed in commit and the printout causesAndreas Huber2013-11-181-3/+0
* | | | | | | | Merge "Add "--bugreport" option to screenrecord"Andy McFadden2013-11-1912-99/+8473
|\ \ \ \ \ \ \ \
| * | | | | | | | Add "--bugreport" option to screenrecordAndy McFadden2013-11-1812-99/+8473
* | | | | | | | | am 72afcd5d: am 5ea5b020: Merge "WA: Queue extra buffers on output port durin...Lajos Molnar2013-11-182-0/+30
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | / / / / / | | |_|/ / / / / | |/| | | | | |
| * | | | | | | am 5ea5b020: Merge "WA: Queue extra buffers on output port during reconfig if...Lajos Molnar2013-11-182-0/+30
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge "WA: Queue extra buffers on output port during reconfig if input EOS-ed...Lajos Molnar2013-11-192-0/+30
| | |\ \ \ \ \ \ \
| | | * | | | | | | WA: Queue extra buffers on output port during reconfig if input EOS-edLajos Molnar2013-11-142-0/+30