summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | am 902dc42d: am 07715ac3: Merge "C++11 compatibility."Dan Albert2014-11-201-4/+4
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| * | | | | | | | | Merge "C++11 compatibility."Dan Albert2014-11-201-4/+4
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | C++11 compatibility.Dan Albert2014-11-201-4/+4
| | | |_|_|_|_|_|/ / | | |/| | | | | | |
* | | | | | | | | | am 8ed5afa3: Merge "mediaplayer: request auto-frc for high quality avsync" in...Lajos Molnar2014-11-201-0/+13
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | 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
| | | |_|/ / / / / / | | |/| | | | | | |
* | | | | | | | | | am 6597c00f: stagefright: add (temporary) support for automatic video frcLajos Molnar2014-11-201-0/+18
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | stagefright: add (temporary) support for automatic video frcLajos Molnar2014-11-191-0/+18
| |/ / / / / / / /
* | | | | | | | | am d6048672: am 9d2e0dae: Merge "Remove extraneous parentheses"Chih-hung Hsieh2014-11-201-1/+1
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Remove extraneous parenthesesBernhard Rosenkränzer2014-11-201-1/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | am 0c999060: am 18899808: Merge "NuPlayer: open audio sink in offload mode wh...Ronghua Wu2014-11-193-5/+36
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | 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
| | | |/ / / / / | | |/| | | | |
* | | | | | | | am cd370c79: am de14fae7: Merge "Use standard syntax to initialize fields."Glenn Kasten2014-11-191-712/+712
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge "Use standard syntax to initialize fields."Glenn Kasten2014-11-191-712/+712
| |\ \ \ \ \ \ \
| | * | | | | | | Use standard syntax to initialize fields.Chih-Hung Hsieh2014-11-141-712/+712
* | | | | | | | | am 4fd641be: am bbda5ce4: Merge "AudioSystem: Add mutex for output cache" int...Eric Laurent2014-11-191-37/+47
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge "AudioSystem: Add mutex for output cache" into lmp-mr1-devEric Laurent2014-11-191-37/+47
| |\ \ \ \ \ \ \ \
| | * | | | | | | | AudioSystem: Add mutex for output cacheEric Laurent2014-11-191-37/+47
| | | |_|/ / / / / | | |/| | | | | |
* | | | | | | | | am 2bbc61fe: am 408dba5f: Merge "HLS: fix live lock after missing the boat du...Robert Shih2014-11-191-0/+20
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | 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
* | | | | | | | | | am db95b7db: am ba0790bf: Merge "Don\'t autoloop notifications" into lmp-mr1-devMarco Nelissen2014-11-192-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
| | |/ / / / / / /
* | | | | | | | | am 2f65ada8: am 993d57ec: Merge "NuPlayer: pass media time to selectTrack for...Robert Shih2014-11-198-13/+39
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | 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
| | |/ / / / / / /
* | | | | | | | | am bfa77b5c: am 8cd37d67: Merge "audio policy: do not prevent routing to A2DP...Eric Laurent2014-11-181-0/+5
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "audio policy: do not prevent routing to A2DP when suspended." into lmp...Eric Laurent2014-11-181-0/+5
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | audio policy: do not prevent routing to A2DP when suspended.Eric Laurent2014-11-171-0/+5
* | | | | | | | | am 5f3eef9a: am 7a200235: Merge "Remove extraneous parentheses"Chih-hung Hsieh2014-11-182-2/+2
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge "Remove extraneous parentheses"Chih-hung Hsieh2014-11-182-2/+2
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Remove extraneous parenthesesBernhard Rosenkränzer2014-11-182-2/+2
| | | |_|_|_|_|_|/ | | |/| | | | | |
* | | | | | | | | am dd9d3e50: am 48b447fe: Merge "Fix uninitialized variable"Chih-hung Hsieh2014-11-181-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Fix uninitialized variableBernhard Rosenkränzer2014-11-181-1/+1
| |/ / / / / / /
* | | | | | | | am efd33e8d: am 35b0f709: Merge "Fix missing mutex lock in Drm::binderDied" i...Jeff Tinker2014-11-181-1/+5
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | 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
* | | | | | | | am 1c764234: am 88ec9e99: Merge "Fix race condition in signaling completion f...Andy Hung2014-11-181-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | 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
| | | |_|_|/ / / | | |/| | | | |
* | | | | | | | am 811a92f6: am 39b109a1: Merge "NuPlayer HTTPLiveSource: impl getSelectedTra...Robert Shih2014-11-186-0/+56
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "NuPlayer HTTPLiveSource: impl getSelectedTrack" into lmp-mr1-devRobert Shih2014-11-176-0/+56
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | NuPlayer HTTPLiveSource: impl getSelectedTrackRobert Shih2014-11-066-0/+56
* | | | | | | | am 26d92768: am 34c55e3e: Merge "No need to #include atomic-inline.h if you h...Elliott Hughes2014-11-171-1/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | No need to #include atomic-inline.h if you have atomic.h.Elliott Hughes2014-11-171-1/+0
* | | | | | | | am d86450b9: am c80b9b83: Merge "Fix struct vs. class mismatches"Chih-hung Hsieh2014-11-1711-13/+12
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Fix struct vs. class mismatches"Chih-hung Hsieh2014-11-1711-13/+12
| |\ \ \ \ \ \ \
| | * | | | | | | Fix struct vs. class mismatchesBernhard Rosenkränzer2014-11-1711-13/+12