Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Adjust to asBinder()'s new behavior | Marco Nelissen | 2014-11-12 | 1 | -3/+3 |
* | am 745602d8: Merge "MediaCodec: Prevent stop() in the UNINITIALIZED state" in... | Andy Hung | 2014-11-12 | 1 | -2/+5 |
|\ | |||||
| * | am 745602d8: Merge "MediaCodec: Prevent stop() in the UNINITIALIZED state" in... | Andy Hung | 2014-11-12 | 1 | -2/+5 |
| |\ | |||||
| | * | Merge "MediaCodec: Prevent stop() in the UNINITIALIZED state" into lmp-mr1-dev | Andy Hung | 2014-11-11 | 1 | -2/+5 |
| | |\ | |||||
| | | * | MediaCodec: Prevent stop() in the UNINITIALIZED state | Andy Hung | 2014-11-04 | 1 | -2/+5 |
* | | | | am 7382b352: am e71da1f7: Merge "MatroskaExtractor: use GetTrackByNumber inst... | Robert Shih | 2014-11-11 | 2 | -4/+6 |
|\ \ \ \ | |/ / / | |||||
| * | | | am e71da1f7: Merge "MatroskaExtractor: use GetTrackByNumber instead of GetTra... | Robert Shih | 2014-11-11 | 2 | -4/+6 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge "MatroskaExtractor: use GetTrackByNumber instead of GetTrackByIndex" in... | Robert Shih | 2014-11-11 | 1 | -4/+5 |
| | |\ \ | |||||
| | | * | | MatroskaExtractor: use GetTrackByNumber instead of GetTrackByIndex | Robert Shih | 2014-11-08 | 1 | -4/+5 |
| | * | | | Merge "PlaylistFetcher: clear mStartup for .aac playlists after seek" into lm... | Robert Shih | 2014-11-11 | 1 | -0/+1 |
| | |\ \ \ | |||||
| | | * | | | PlaylistFetcher: clear mStartup for .aac playlists after seek | Robert Shih | 2014-11-07 | 1 | -0/+1 |
| | | |/ / | |||||
* | | | | | am aa97f709: am 48cb6d7c: Merge "Fix short sound playback" into lmp-mr1-dev a... | Marco Nelissen | 2014-11-11 | 1 | -0/+4 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | am 48cb6d7c: Merge "Fix short sound playback" into lmp-mr1-dev | Marco Nelissen | 2014-11-11 | 1 | -0/+4 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge "Fix short sound playback" into lmp-mr1-dev | Marco Nelissen | 2014-11-10 | 1 | -0/+4 |
| | |\ \ \ | |||||
| | | * | | | Fix short sound playback | Marco Nelissen | 2014-11-05 | 1 | -0/+4 |
* | | | | | | am 63f2701a: am 21efaad1: Merge "GenericSource: add mVideoLastDequeueTimeUs/m... | Robert Shih | 2014-11-11 | 2 | -11/+18 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | am 21efaad1: Merge "GenericSource: add mVideoLastDequeueTimeUs/mAudioLastDequ... | Robert Shih | 2014-11-10 | 2 | -11/+18 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge "GenericSource: add mVideoLastDequeueTimeUs/mAudioLastDequeueTimeUs" in... | Robert Shih | 2014-11-10 | 2 | -11/+18 |
| | |\ \ \ \ | |||||
| | | * | | | | GenericSource: add mVideoLastDequeueTimeUs/mAudioLastDequeueTimeUs | Robert Shih | 2014-11-10 | 2 | -11/+18 |
| | | | |/ / | | | |/| | | |||||
* | | | | | | am d6549e9f: am eb0827f3: am c5160b34: Merge "Remove the executable bit from ... | Glenn Kasten | 2014-11-10 | 91 | -0/+0 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | am eb0827f3: am c5160b34: Merge "Remove the executable bit from source files" | Glenn Kasten | 2014-11-10 | 91 | -0/+0 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | am c5160b34: Merge "Remove the executable bit from source files" | Glenn Kasten | 2014-11-10 | 91 | -0/+0 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Remove the executable bit from source files | Martin Storsjo | 2014-11-07 | 91 | -0/+0 |
| | | * | | | | | Resolve conflict | The Android Open Source Project | 2014-11-06 | 358 | -10568/+34032 |
| | | |\ \ \ \ \ | |||||
* | | | \ \ \ \ \ | am 1dda4012: am 53fea876: Merge "HTTPLiveSource: NULL check in getFormat" int... | Robert Shih | 2014-11-10 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | am 53fea876: Merge "HTTPLiveSource: NULL check in getFormat" into lmp-mr1-dev... | Robert Shih | 2014-11-10 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | |||||
| | * | | | | | | | Merge "HTTPLiveSource: NULL check in getFormat" into lmp-mr1-dev | Robert Shih | 2014-11-10 | 1 | -0/+4 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | HTTPLiveSource: NULL check in getFormat | Robert Shih | 2014-11-08 | 1 | -0/+4 |
| | | | |_|_|/ / / | | | |/| | | | | | |||||
* | | | | | | | | | Merge "Add BufferItem argument to onFrameAvailable" | Dan Stoza | 2014-11-07 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add BufferItem argument to onFrameAvailable | Dan Stoza | 2014-11-07 | 2 | -2/+2 |
* | | | | | | | | | | am 5239bad2: am b177468b: Merge "Improve AudioTrack recovery from mediaserver... | Glenn Kasten | 2014-11-07 | 2 | -19/+31 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| / / / / / / / / | |/ / / / / / / / | |||||
| * | | | | | | | | am b177468b: Merge "Improve AudioTrack recovery from mediaserver death" into ... | Glenn Kasten | 2014-11-07 | 2 | -19/+31 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | Merge "Improve AudioTrack recovery from mediaserver death" into lmp-mr1-dev | Glenn Kasten | 2014-11-07 | 2 | -19/+31 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | Improve AudioTrack recovery from mediaserver death | Glenn Kasten | 2014-11-05 | 2 | -19/+31 |
| | | |/ / / / / / | |||||
* | | | | | | | | | am f8d051fe: am 034d6747: am 1609e451: Merge "Add a BufferItem parameter to o... | Dan Stoza | 2014-11-07 | 3 | -3/+3 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | am 034d6747: am 1609e451: Merge "Add a BufferItem parameter to onFrameAvailab... | Dan Stoza | 2014-11-07 | 3 | -3/+3 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev | Dan Stoza | 2014-11-07 | 3 | -3/+3 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | Add a BufferItem parameter to onFrameAvailable | Dan Stoza | 2014-11-04 | 3 | -3/+3 |
* | | | | | | | | | | am caf27abc: am 7e88fac0: Merge "AudioSystem: remove obsolete method." into l... | Eric Laurent | 2014-11-07 | 1 | -15/+0 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | am 7e88fac0: Merge "AudioSystem: remove obsolete method." into lmp-mr1-dev au... | Eric Laurent | 2014-11-07 | 1 | -15/+0 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| | * | | | | | | | | Merge "AudioSystem: remove obsolete method." into lmp-mr1-dev | Eric Laurent | 2014-11-07 | 1 | -15/+0 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | AudioSystem: remove obsolete method. | Eric Laurent | 2014-11-06 | 1 | -15/+0 |
* | | | | | | | | | | | am 989af5d7: am 113adbbc: resolved conflicts for merge of bcf093bf to stage-a... | Narayan Kamath | 2014-11-07 | 1 | -1/+13 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | am 113adbbc: resolved conflicts for merge of bcf093bf to stage-aosp-master | Narayan Kamath | 2014-11-07 | 1 | -1/+13 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | | | |||||
| | * | | | | | | | | | resolved conflicts for merge of bcf093bf to stage-aosp-master | Narayan Kamath | 2014-11-07 | 1 | -1/+13 |
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / | | | |/| | | | / / / | | | |_|_|_|_|/ / / | | |/| | | | | | | | |||||
| | | * | | | | | | | Fix definining of ANDROID_SMP. | Ian Rogers | 2014-11-06 | 1 | -1/+14 |
| * | | | | | | | | | am d11895bc: am 62fe78b6: Merge "Fix memory leak" into lmp-mr1-dev | Glenn Kasten | 2014-11-07 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | |||||
| | * | | | | | | | | Merge "Fix memory leak" into lmp-mr1-dev | Glenn Kasten | 2014-11-07 | 1 | -3/+3 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | Fix memory leak | Glenn Kasten | 2014-11-06 | 1 | -3/+3 |
* | | | | | | | | | | | am 6200e7f4: am 5cccfce1: Merge "AnotherPacketSource.cpp: Do not queue discon... | Wei Jia | 2014-11-07 | 9 | -57/+55 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |