summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Replace control block frameCount_ by explicit in/out parameterGlenn Kasten2013-12-204-11/+30
* am 5c474238: am 5893736d: am a67c7653: Merge "Increase kFastTrackMultiplier f...Glenn Kasten2013-12-171-4/+7
|\
| * am a67c7653: Merge "Increase kFastTrackMultiplier from 1 to 2"Glenn Kasten2013-12-171-4/+7
| |\
| | * Merge "Increase kFastTrackMultiplier from 1 to 2"Glenn Kasten2013-12-171-4/+7
| | |\
| | | * Increase kFastTrackMultiplier from 1 to 2Glenn Kasten2013-12-041-4/+7
| | * | Merge commit '2381f06f374ee0cb8bca0edf5388394432b00e6d' into HEADThe Android Open Source Project2013-12-0524-125/+338
| | |\ \ | | | |/ | | |/|
* | | | stagefright: Fix bugs in playlist fetcher logicLajos Molnar2013-12-162-29/+105
* | | | Merge "Better character set encoding detection"Marco Nelissen2013-12-128-1155/+2570
|\ \ \ \
| * | | | Better character set encoding detectionMarco Nelissen2013-12-118-1155/+2570
* | | | | libstagefright: Delay release of wakelock in TimedEventQueueHaynes Mathew George2013-12-102-6/+9
* | | | | Revert "stagefright: fix TimedEventQueue wakelock"Eric Laurent2013-12-102-15/+8
|/ / / /
* | | | stagefright: fix TimedEventQueue wakelockEric Laurent2013-12-062-8/+15
* | | | Add RecordThread media.log and deferred deallocationGlenn Kasten2013-12-051-1/+1
* | | | 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
* | | | | AudioTrack: fix position callback after restoreEric Laurent2013-11-271-1/+0
* | | | | 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
| |\ \ \ \ | | |/ / /
| | * | | Fix SIGABRT when playing mp4 fileMarco Nelissen2013-11-251-0/+6
* | | | | Merge "Avoid the call to CameraSourceTimeLapse::trySettingVideoSize if initia...Robert Shih2013-11-261-1/+2
|\ \ \ \ \
| * | | | | Avoid the call to CameraSourceTimeLapse::trySettingVideoSize if initializationRobert Shih2013-11-221-1/+2
* | | | | | 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
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Fixed data offset at parsing IPMP DescriptorsIchitaro Kohara2013-11-251-1/+2
| | * | | | Merge commit 'b2059ff384eee8ffb70a7ec8fc5570405201c734' into HEADThe Android Open Source Project2013-11-22178-4065/+13126
| | |\ \ \ \
* | | \ \ \ \ 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
* | | | | | | | update offloaded audio track sampling rateEric Laurent2013-11-224-2/+42
* | | | | | | | Only send a format change if the buffer has dataMarco Nelissen2013-11-201-1/+1
|/ / / / / / /
* | | | | | | 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
* | | | | | | | am 72afcd5d: am 5ea5b020: Merge "WA: Queue extra buffers on output port durin...Lajos Molnar2013-11-181-0/+28
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / /
| * | | | | | am 5ea5b020: Merge "WA: Queue extra buffers on output port during reconfig if...Lajos Molnar2013-11-181-0/+28
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Merge "WA: Queue extra buffers on output port during reconfig if input EOS-ed...Lajos Molnar2013-11-191-0/+28
| | |\ \ \ \ \
| | | * | | | | WA: Queue extra buffers on output port during reconfig if input EOS-edLajos Molnar2013-11-141-0/+28
* | | | | | | | am 2381f06f: am 24605338: Merge "Fix metadata access" into klp-devMarco Nelissen2013-11-152-3/+9
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 24605338: Merge "Fix metadata access" into klp-devMarco Nelissen2013-11-152-3/+9
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Fix metadata access" into klp-devMarco Nelissen2013-11-152-3/+9
| | |\ \ \ \ \ \
| | | * | | | | | Fix metadata accessMarco Nelissen2013-11-152-3/+9
| | | |/ / / / /
* | | | | | | | am 576e89b5: am 7dae71d6: Merge "AwesomePlayer: correct stream type for offlo...Eric Laurent2013-11-153-4/+17
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 7dae71d6: Merge "AwesomePlayer: correct stream type for offload" into klp-devEric Laurent2013-11-153-4/+17
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | AwesomePlayer: correct stream type for offloadEric Laurent2013-11-143-4/+17
| | |/ / / / /
* | | | | | | Merge "Fixed StagefrightRecorder::setupVideoEncoder to use the clipped bitrat...Robert Shih2013-11-152-28/+12
|\ \ \ \ \ \ \
| * | | | | | | Fixed StagefrightRecorder::setupVideoEncoder to use the clipped bitrate valueRobert Shih2013-11-112-28/+12
| | |_|_|_|/ / | |/| | | | |
* | | | | | | am ec89a75e: am 92092b39: Merge "stagefright: limit default max-input-size fo...Lajos Molnar2013-11-131-7/+18
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | am 92092b39: Merge "stagefright: limit default max-input-size for AVC" into k...Lajos Molnar2013-11-131-7/+18
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge "stagefright: limit default max-input-size for AVC" into klp-devLajos Molnar2013-11-131-7/+18
| | |\ \ \ \ \
| | | * | | | | stagefright: limit default max-input-size for AVCLajos Molnar2013-11-131-7/+18