summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge "Fix missing loop count for static tracks." into lmp-mr1-devGlenn Kasten2014-11-202-23/+46
|\ \ \ \ \
| * | | | | Fix missing loop count for static tracks.Andy Hung2014-11-182-23/+46
* | | | | | Merge "When aggregating buffers, make sure we don't lose data" into lmp-mr1-devMarco Nelissen2014-11-201-0/+6
|\ \ \ \ \ \
| * | | | | | When aggregating buffers, make sure we don't lose dataMarco Nelissen2014-11-191-0/+6
| | |_|_|/ / | |/| | | |
* | | | | | Merge "AudioSystem: fix cross deadlock" into lmp-mr1-devEric Laurent2014-11-204-53/+71
|\ \ \ \ \ \
| * | | | | | AudioSystem: fix cross deadlockEric Laurent2014-11-204-53/+71
| | |_|_|_|/ | |/| | | |
* | | | | | Merge "mediaplayer: request auto-frc for high quality avsync" into lmp-mr1-devLajos Molnar2014-11-201-0/+13
|\ \ \ \ \ \
| * | | | | | mediaplayer: request auto-frc for high quality avsyncLajos Molnar2014-11-191-0/+13
| |/ / / / /
* | | | | | stagefright: add (temporary) support for automatic video frcLajos Molnar2014-11-191-0/+18
|/ / / / /
* | | | | Merge "NuPlayer: open audio sink in offload mode when resuming from timeout t...Ronghua Wu2014-11-193-5/+36
|\ \ \ \ \
| * | | | | NuPlayer: open audio sink in offload mode when resuming from timeout teardown.Ronghua Wu2014-11-183-5/+36
| |/ / / /
* | | | | Merge "Camera2Client: remove recording stream if necessary" into lmp-mr1-devYin-Chia Yeh2014-11-193-7/+56
|\ \ \ \ \
| * | | | | Camera2Client: remove recording stream if necessaryYin-Chia Yeh2014-11-183-7/+56
| | |_|_|/ | |/| | |
* | | | | Merge "AudioSystem: Add mutex for output cache" into lmp-mr1-devEric Laurent2014-11-192-41/+52
|\ \ \ \ \
| * | | | | AudioSystem: Add mutex for output cacheEric Laurent2014-11-192-41/+52
| | |/ / / | |/| | |
* | | | | Merge "HLS: fix live lock after missing the boat during configuration change"...Robert Shih2014-11-191-0/+20
|\ \ \ \ \
| * | | | | HLS: fix live lock after missing the boat during configuration changeRobert Shih2014-11-181-0/+20
* | | | | | Merge "Don't autoloop notifications" into lmp-mr1-devMarco Nelissen2014-11-192-0/+20
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Don't autoloop notificationsMarco Nelissen2014-11-182-0/+20
| |/ / / /
* | | | | Merge "NuPlayer: pass media time to selectTrack for responsiveness" into lmp-...Robert Shih2014-11-198-13/+39
|\ \ \ \ \
| * | | | | NuPlayer: pass media time to selectTrack for responsivenessRobert Shih2014-11-198-13/+39
| |/ / / /
* | | | | Merge "audio policy: do not prevent routing to A2DP when suspended." into lmp...Eric Laurent2014-11-182-4/+17
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | audio policy: do not prevent routing to A2DP when suspended.Eric Laurent2014-11-172-4/+17
* | | | | Merge "Fix missing mutex lock in Drm::binderDied" into lmp-mr1-devJeff Tinker2014-11-181-1/+5
|\ \ \ \ \
| * | | | | Fix missing mutex lock in Drm::binderDiedJeff Tinker2014-11-161-1/+5
* | | | | | Merge "Prevent stopped audio tracks from mixing data" into lmp-mr1-devAndy Hung2014-11-181-8/+9
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Prevent stopped audio tracks from mixing dataAndy Hung2014-11-171-8/+9
| | |_|/ / | |/| | |
* | | | | Merge "Fix race condition in signaling completion for decode." into lmp-mr1-devAndy Hung2014-11-171-0/+1
|\ \ \ \ \
| * | | | | Fix race condition in signaling completion for decode.Andy Hung2014-11-171-0/+1
| |/ / / /
* | | | | Merge "NuPlayer HTTPLiveSource: impl getSelectedTrack" into lmp-mr1-devRobert Shih2014-11-176-0/+56
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | NuPlayer HTTPLiveSource: impl getSelectedTrackRobert Shih2014-11-066-0/+56
* | | | | Merge "audiopolicy: Update input device check in checkInputsForDevice" into l...Eric Laurent2014-11-171-3/+6
|\ \ \ \ \
| * | | | | audiopolicy: Update input device check in checkInputsForDeviceEric Laurent2014-11-171-3/+6
* | | | | | Merge "CameraService: normalize face rectangles properly" into lmp-mr1-devChien-Yu Chen2014-11-173-73/+90
|\ \ \ \ \ \
| * | | | | | CameraService: normalize face rectangles properlyChien-Yu Chen2014-11-133-73/+90
* | | | | | | Merge "NuPlayer: tunnel decoder with renderer for data buffer passing." into ...Wei Jia2014-11-157-124/+205
|\ \ \ \ \ \ \
| * | | | | | | NuPlayer: tunnel decoder with renderer for data buffer passing.Wei Jia2014-11-147-124/+205
* | | | | | | | Merge "PlaylistFetcher: handle sporadic fetch erros" into lmp-mr1-devRobert Shih2014-11-151-27/+37
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | PlaylistFetcher: handle sporadic fetch errosRobert Shih2014-11-131-27/+37
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge "remove AudioSystem::getOutputSamplingRateForAttr()" into lmp-mr1-devEric Laurent2014-11-143-30/+15
|\ \ \ \ \ \ \
| * | | | | | | remove AudioSystem::getOutputSamplingRateForAttr()Eric Laurent2014-11-123-30/+15
* | | | | | | | Merge "stagefright: add runtime debug support" into lmp-mr1-devLajos Molnar2014-11-1411-440/+830
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | stagefright: add runtime debug supportLajos Molnar2014-11-1211-440/+830
* | | | | | | | Merge "Stagefright: use MediaCodec in async mode for recording" into lmp-mr1-devChong Zhang2014-11-132-168/+105
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Stagefright: use MediaCodec in async mode for recordingPraveen Chavan2014-11-122-168/+105
| * | | | | | | merge in lmp-mr1-release history after reset to 1cf9ad1abb599ce4057189e0db154...The Android Automerger2014-11-060-0/+0
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | merge in lmp-mr1-release history after reset to ed1e55c5276a1c031e9b2f016387c...The Android Automerger2014-11-050-0/+0
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ merge in lmp-mr1-release history after reset to ed1e55c5276a1c031e9b2f016387c...The Android Automerger2014-11-040-0/+0
| | | |\ \ \ \ \ \ | | |/ / / / / / /
| | | * | | | | | merge in lmp-mr1-release history after reset to 151b3f41ffcdf187580542ba0c0d3...The Android Automerger2014-11-030-0/+0
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ merge in lmp-mr1-release history after reset to 151b3f41ffcdf187580542ba0c0d3...The Android Automerger2014-11-020-0/+0
| | | | |\ \ \ \ \ \ | | | |/ / / / / / /