summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Adjust to asBinder()'s new behaviorMarco Nelissen2014-11-121-3/+3
* am 745602d8: Merge "MediaCodec: Prevent stop() in the UNINITIALIZED state" in...Andy Hung2014-11-121-2/+5
|\
| * am 745602d8: Merge "MediaCodec: Prevent stop() in the UNINITIALIZED state" in...Andy Hung2014-11-121-2/+5
| |\
| | * Merge "MediaCodec: Prevent stop() in the UNINITIALIZED state" into lmp-mr1-devAndy Hung2014-11-111-2/+5
| | |\
| | | * MediaCodec: Prevent stop() in the UNINITIALIZED stateAndy Hung2014-11-041-2/+5
* | | | am 7382b352: am e71da1f7: Merge "MatroskaExtractor: use GetTrackByNumber inst...Robert Shih2014-11-112-4/+6
|\ \ \ \ | |/ / /
| * | | am e71da1f7: Merge "MatroskaExtractor: use GetTrackByNumber instead of GetTra...Robert Shih2014-11-112-4/+6
| |\ \ \ | | |/ /
| | * | Merge "MatroskaExtractor: use GetTrackByNumber instead of GetTrackByIndex" in...Robert Shih2014-11-111-4/+5
| | |\ \
| | | * | MatroskaExtractor: use GetTrackByNumber instead of GetTrackByIndexRobert Shih2014-11-081-4/+5
| | * | | Merge "PlaylistFetcher: clear mStartup for .aac playlists after seek" into lm...Robert Shih2014-11-111-0/+1
| | |\ \ \
| | | * | | PlaylistFetcher: clear mStartup for .aac playlists after seekRobert Shih2014-11-071-0/+1
| | | |/ /
* | | | | am aa97f709: am 48cb6d7c: Merge "Fix short sound playback" into lmp-mr1-dev a...Marco Nelissen2014-11-111-0/+4
|\ \ \ \ \ | |/ / / /
| * | | | am 48cb6d7c: Merge "Fix short sound playback" into lmp-mr1-devMarco Nelissen2014-11-111-0/+4
| |\ \ \ \ | | |/ / /
| | * | | Merge "Fix short sound playback" into lmp-mr1-devMarco Nelissen2014-11-101-0/+4
| | |\ \ \
| | | * | | Fix short sound playbackMarco Nelissen2014-11-051-0/+4
* | | | | | am 63f2701a: am 21efaad1: Merge "GenericSource: add mVideoLastDequeueTimeUs/m...Robert Shih2014-11-112-11/+18
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 21efaad1: Merge "GenericSource: add mVideoLastDequeueTimeUs/mAudioLastDequ...Robert Shih2014-11-102-11/+18
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "GenericSource: add mVideoLastDequeueTimeUs/mAudioLastDequeueTimeUs" in...Robert Shih2014-11-102-11/+18
| | |\ \ \ \
| | | * | | | GenericSource: add mVideoLastDequeueTimeUs/mAudioLastDequeueTimeUsRobert Shih2014-11-102-11/+18
| | | | |/ / | | | |/| |
* | | | | | am d6549e9f: am eb0827f3: am c5160b34: Merge "Remove the executable bit from ...Glenn Kasten2014-11-1091-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am eb0827f3: am c5160b34: Merge "Remove the executable bit from source files"Glenn Kasten2014-11-1091-0/+0
| |\ \ \ \ \
| | * \ \ \ \ am c5160b34: Merge "Remove the executable bit from source files"Glenn Kasten2014-11-1091-0/+0
| | |\ \ \ \ \
| | | * | | | | Remove the executable bit from source filesMartin Storsjo2014-11-0791-0/+0
| | | * | | | | Resolve conflictThe Android Open Source Project2014-11-06358-10568/+34032
| | | |\ \ \ \ \
* | | | \ \ \ \ \ am 1dda4012: am 53fea876: Merge "HTTPLiveSource: NULL check in getFormat" int...Robert Shih2014-11-101-0/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 53fea876: Merge "HTTPLiveSource: NULL check in getFormat" into lmp-mr1-dev...Robert Shih2014-11-101-0/+4
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | Merge "HTTPLiveSource: NULL check in getFormat" into lmp-mr1-devRobert Shih2014-11-101-0/+4
| | |\ \ \ \ \ \ \
| | | * | | | | | | HTTPLiveSource: NULL check in getFormatRobert Shih2014-11-081-0/+4
| | | | |_|_|/ / / | | | |/| | | | |
* | | | | | | | | Merge "Add BufferItem argument to onFrameAvailable"Dan Stoza2014-11-072-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add BufferItem argument to onFrameAvailableDan Stoza2014-11-072-2/+2
* | | | | | | | | | am 5239bad2: am b177468b: Merge "Improve AudioTrack recovery from mediaserver...Glenn Kasten2014-11-072-19/+31
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| / / / / / / / / | |/ / / / / / / /
| * | | | | | | | am b177468b: Merge "Improve AudioTrack recovery from mediaserver death" into ...Glenn Kasten2014-11-072-19/+31
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "Improve AudioTrack recovery from mediaserver death" into lmp-mr1-devGlenn Kasten2014-11-072-19/+31
| | |\ \ \ \ \ \ \
| | | * | | | | | | Improve AudioTrack recovery from mediaserver deathGlenn Kasten2014-11-052-19/+31
| | | |/ / / / / /
* | | | | | | | | am f8d051fe: am 034d6747: am 1609e451: Merge "Add a BufferItem parameter to o...Dan Stoza2014-11-073-3/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 034d6747: am 1609e451: Merge "Add a BufferItem parameter to onFrameAvailab...Dan Stoza2014-11-073-3/+3
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-devDan Stoza2014-11-073-3/+3
| | |\ \ \ \ \ \ \
| | | * | | | | | | Add a BufferItem parameter to onFrameAvailableDan Stoza2014-11-043-3/+3
* | | | | | | | | | am caf27abc: am 7e88fac0: Merge "AudioSystem: remove obsolete method." into l...Eric Laurent2014-11-071-15/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 7e88fac0: Merge "AudioSystem: remove obsolete method." into lmp-mr1-dev au...Eric Laurent2014-11-071-15/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge "AudioSystem: remove obsolete method." into lmp-mr1-devEric Laurent2014-11-071-15/+0
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | AudioSystem: remove obsolete method.Eric Laurent2014-11-061-15/+0
* | | | | | | | | | | am 989af5d7: am 113adbbc: resolved conflicts for merge of bcf093bf to stage-a...Narayan Kamath2014-11-071-1/+13
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 113adbbc: resolved conflicts for merge of bcf093bf to stage-aosp-masterNarayan Kamath2014-11-071-1/+13
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | |
| | * | | | | | | | | resolved conflicts for merge of bcf093bf to stage-aosp-masterNarayan Kamath2014-11-071-1/+13
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / | | | |/| | | | / / / | | | |_|_|_|_|/ / / | | |/| | | | | | |
| | | * | | | | | | Fix definining of ANDROID_SMP.Ian Rogers2014-11-061-1/+14
| * | | | | | | | | am d11895bc: am 62fe78b6: Merge "Fix memory leak" into lmp-mr1-devGlenn Kasten2014-11-071-3/+3
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge "Fix memory leak" into lmp-mr1-devGlenn Kasten2014-11-071-3/+3
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Fix memory leakGlenn Kasten2014-11-061-3/+3
* | | | | | | | | | | am 6200e7f4: am 5cccfce1: Merge "AnotherPacketSource.cpp: Do not queue discon...Wei Jia2014-11-079-57/+55
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /