summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | | | | | | | | | | | | | | | | | | | | | | * | | | | | merge in lmp-mr1-release history after reset to a67ced9746e6f0d4e03ff80076820...The Android Automerger2014-09-280-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | |/ / / / / / /
| | | | | | | | | | | | | | | | | | | | | | | | * | | | | | merge in lmp-mr1-release history after reset to a8a4eeb95988e6bb73f7a742c8dd2...The Android Automerger2014-09-270-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ merge in lmp-mr1-release history after reset to 846202f5483c30ff380fc997c7d44...The Android Automerger2014-09-250-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ merge in lmp-mr1-release history after reset to fc55783d0886d5dbaa234f85a4313...The Android Automerger2014-09-240-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ merge in lmp-mr1-release history after reset to 3cdd6b8c82f2c71054bdd767782fc...The Android Automerger2014-09-230-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ merge in lmp-mr1-release history after reset to 5110d6a00db5973881d06c39c60e4...The Android Automerger2014-09-230-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ merge in lmp-mr1-release history after reset to 8d6ae6d9e9f2740f88928fae52e81...The Android Automerger2014-09-220-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ merge in lmp-mr1-release history after reset to 8d6ae6d9e9f2740f88928fae52e81...The Android Automerger2014-09-220-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/ / / / / / /
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | | | | | merge in lmp-mr1-release history after reset to 8d6ae6d9e9f2740f88928fae52e81...The Android Automerger2014-09-220-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/ / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "AnotherPacketSource: need reset some members before returning from que...Wei Jia2014-11-131-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AnotherPacketSource: need reset some members before returning from queueDisco...Wei Jia2014-11-131-4/+4
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "mediaplayer: make frame-accurate avsync configurable"" into lm...Lajos Molnar2014-11-131-20/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "mediaplayer: make frame-accurate avsync configurable"Lajos Molnar2014-11-071-20/+0
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "PlaylistFetcher: check ts program streams before disabling a/v" into l...Robert Shih2014-11-133-6/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PlaylistFetcher: check ts program streams before disabling a/vRobert Shih2014-11-123-6/+32
| | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "MTP: add strict bounds checking for all incoming packets" into lmp-mr1...Mike Lockwood2014-11-1319-189/+386
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MTP: add strict bounds checking for all incoming packetsMike Lockwood2014-11-1219-189/+386
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix Ogg Vorbis packet timestamps" into lmp-mr1-devMarco Nelissen2014-11-121-14/+61
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Ogg Vorbis packet timestampsMarco Nelissen2014-11-111-14/+61
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Camera2Device: fix camera metadata leaks" into lmp-mr1-devChien-Yu Chen2014-11-122-15/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Camera2Device: fix camera metadata leaksChien-Yu Chen2014-11-102-15/+5
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix looping sound playback" into lmp-mr1-devMarco Nelissen2014-11-121-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix looping sound playbackMarco Nelissen2014-11-111-0/+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
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 8e2b445f: am ae6965ae: am 3aef3560: am e360f0f6: IAudioPolicyService: boun...Eric Laurent2014-11-110-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 8e2b445f: am ae6965ae: am 3aef3560: am e360f0f6: IAudioPolicyService: boun...Eric Laurent2014-11-110-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ae6965ae: am 3aef3560: am e360f0f6: IAudioPolicyService: bound array size ...Eric Laurent2014-11-110-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ae6965ae: am 3aef3560: am e360f0f6: IAudioPolicyService: bound array size ...Eric Laurent2014-11-112-5/+13
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 17c2c87c: am 6d60079e: am 99370d2d: am ae6965ae: am 3aef3560: am e360f0f6:...Eric Laurent2014-11-100-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 6d60079e: am 99370d2d: am ae6965ae: am 3aef3560: am e360f0f6: IAudioPolicy...Eric Laurent2014-11-102-5/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 99370d2d: am ae6965ae: am 3aef3560: am e360f0f6: IAudioPolicyService: boun...Eric Laurent2014-11-102-5/+13
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am ae6965ae: am 3aef3560: am e360f0f6: IAudioPolicyService: bound array size ...Eric Laurent2014-11-102-5/+13
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 3aef3560: am e360f0f6: IAudioPolicyService: bound array size in queryDefau...Eric Laurent2014-11-102-5/+13
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e360f0f6: IAudioPolicyService: bound array size in queryDefaultPreProcessingEric Laurent2014-11-102-5/+13
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IAudioPolicyService: bound array size in queryDefaultPreProcessingEric Laurent2014-11-102-5/+13
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix short sound playback" into lmp-mr1-devMarco Nelissen2014-11-101-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix short sound playbackMarco Nelissen2014-11-051-0/+4
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "GenericSource: add mVideoLastDequeueTimeUs/mAudioLastDequeueTimeUs" in...Robert Shih2014-11-102-11/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GenericSource: add mVideoLastDequeueTimeUs/mAudioLastDequeueTimeUsRobert Shih2014-11-102-11/+18
| | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 2dca6f68: am 995599cb: audioflinger: fix duplicating thread output buffers...Eric Laurent2014-11-100-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 995599cb: audioflinger: fix duplicating thread output buffers clearEric Laurent2014-11-101-1/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | audioflinger: fix duplicating thread output buffers clearEric Laurent2014-11-101-1/+5
| | | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | audioflinger: fix duplicating thread output buffers clearEric Laurent2014-11-071-1/+5
| |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |