summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Enable loading of 64 bit effect librariesEric Laurent2014-08-081-4/+20
* am 71fb0565: am 0893eaf7: Merge "httplive: timestamp reporting, track selecti...Robert Shih2014-08-0610-180/+546
|\
| * am 0893eaf7: Merge "httplive: timestamp reporting, track selection" into lmp-devRobert Shih2014-08-0610-180/+546
| |\
| | * Merge "httplive: timestamp reporting, track selection" into lmp-devRobert Shih2014-08-0610-180/+546
| | |\
| | | * httplive: timestamp reporting, track selectionRobert Shih2014-08-0510-180/+546
* | | | am 25d9b3df: am 29e09664: Merge "some fixes for crash when extractor creation...Chong Zhang2014-08-065-55/+152
|\ \ \ \ | |/ / /
| * | | am 29e09664: Merge "some fixes for crash when extractor creation fails" into ...Chong Zhang2014-08-065-55/+152
| |\ \ \ | | |/ /
| | * | Merge "some fixes for crash when extractor creation fails" into lmp-devChong Zhang2014-08-065-55/+152
| | |\ \
| | | * | some fixes for crash when extractor creation failsChong Zhang2014-08-065-55/+152
* | | | | am 3cb022c4: am 0a0e5f02: Merge "AudioSystem: add API to query audio HW sync ...Eric Laurent2014-08-062-1/+25
|\ \ \ \ \ | |/ / / /
| * | | | am 0a0e5f02: Merge "AudioSystem: add API to query audio HW sync source" into ...Eric Laurent2014-08-062-1/+25
| |\ \ \ \ | | |/ / /
| | * | | AudioSystem: add API to query audio HW sync sourceEric Laurent2014-08-062-1/+25
| | |/ /
* | | | am 6b2400bc: am 3c9879b9: Merge "AAC encoder: add support for SBR mode select...Jean-Michel Trivi2014-08-063-5/+110
|\ \ \ \ | |/ / /
| * | | am 3c9879b9: Merge "AAC encoder: add support for SBR mode selection" into lmp...Jean-Michel Trivi2014-08-053-5/+110
| |\ \ \ | | |/ /
| | * | Merge "AAC encoder: add support for SBR mode selection" into lmp-devJean-Michel Trivi2014-08-053-5/+110
| | |\ \
| | | * | AAC encoder: add support for SBR mode selectionJean-Michel Trivi2014-08-053-5/+110
* | | | | am df024a6a: am e4671134: Merge "NuPlayer: don\'t feed decoder input data dur...Wei Jia2014-08-061-5/+5
|\ \ \ \ \ | |/ / / /
| * | | | am e4671134: Merge "NuPlayer: don\'t feed decoder input data during flushing....Wei Jia2014-08-051-5/+5
| |\ \ \ \ | | |/ / /
| | * | | Merge "NuPlayer: don't feed decoder input data during flushing." into lmp-devWei Jia2014-08-051-5/+5
| | |\ \ \
| | | * | | NuPlayer: don't feed decoder input data during flushing.Wei Jia2014-08-051-5/+5
* | | | | | am 96b7af16: am b15486f9: Merge "set secure flag for secure file playback" in...Chong Zhang2014-08-062-2/+15
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am b15486f9: Merge "set secure flag for secure file playback" into lmp-devChong Zhang2014-08-052-2/+15
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "set secure flag for secure file playback" into lmp-devChong Zhang2014-08-052-2/+15
| | |\ \ \ \
| | | * | | | set secure flag for secure file playbackChong Zhang2014-08-052-2/+15
| | | |/ / /
* | | | | | am 1bfc5464: am 85c37730: Merge "Add sound trigger control by audio policy" i...Eric Laurent2014-08-062-1/+81
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 85c37730: Merge "Add sound trigger control by audio policy" into lmp-devEric Laurent2014-08-052-1/+81
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Add sound trigger control by audio policy" into lmp-devEric Laurent2014-08-052-1/+81
| | |\ \ \ \
| | | * | | | Add sound trigger control by audio policyEric Laurent2014-08-052-1/+81
| | | |/ / /
* | | | | | am dd49ca9c: am ccad786f: stagefright: Pass audio aac subformats in offloadinfoaarti jadhav-gaikwad2014-08-052-0/+14
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am ccad786f: stagefright: Pass audio aac subformats in offloadinfoaarti jadhav-gaikwad2014-08-052-0/+14
| |\ \ \ \ \ | | |/ / / /
| | * | | | stagefright: Pass audio aac subformats in offloadinfoaarti jadhav-gaikwad2014-08-052-0/+14
| | |/ / /
* | | | | am 11a4d099: am ca61a8f0: Merge "MediaCodecSource: stop puller from caller\'s...Chong Zhang2014-08-042-34/+44
|\ \ \ \ \ | |/ / / /
| * | | | am ca61a8f0: Merge "MediaCodecSource: stop puller from caller\'s thread inste...Chong Zhang2014-08-042-34/+44
| |\ \ \ \ | | |/ / /
| | * | | Merge "MediaCodecSource: stop puller from caller's thread instead of looper" ...Chong Zhang2014-08-012-34/+44
| | |\ \ \
| | | * | | MediaCodecSource: stop puller from caller's thread instead of looperChong Zhang2014-08-042-34/+44
* | | | | | am e2209ffe: am b63d63b8: Merge "Allow device to be unprovisioned" into lmp-devJeff Tinker2014-08-043-1/+38
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am b63d63b8: Merge "Allow device to be unprovisioned" into lmp-devJeff Tinker2014-08-043-1/+38
| |\ \ \ \ \ | | |/ / / /
| | * | | | Allow device to be unprovisionedJeff Tinker2014-08-013-1/+38
| | |/ / /
* | | | | am e6d334f4: am 25644c50: Merge "GenericSource: timed text support" into lmp-devLajos Molnar2014-08-012-77/+199
|\ \ \ \ \ | |/ / / /
| * | | | am 25644c50: Merge "GenericSource: timed text support" into lmp-devLajos Molnar2014-08-012-77/+199
| |\ \ \ \ | | |/ / /
| | * | | Merge "GenericSource: timed text support" into lmp-devLajos Molnar2014-07-312-77/+199
| | |\ \ \ | | | |/ / | | |/| |
| | | * | GenericSource: timed text supportLajos Molnar2014-07-312-77/+199
| | | |/
* | | | am a2ad5bdc: am 3c6fac2c: Merge "stagefright: propagate error in MPEG4Extract...Lajos Molnar2014-08-011-3/+4
|\ \ \ \ | |/ / /
| * | | am 3c6fac2c: Merge "stagefright: propagate error in MPEG4Extractor::readMetaD...Lajos Molnar2014-08-011-3/+4
| |\ \ \ | | |/ /
| | * | Merge "stagefright: propagate error in MPEG4Extractor::readMetaData" into lmp...Lajos Molnar2014-07-301-3/+4
| | |\ \
| | | * | stagefright: propagate error in MPEG4Extractor::readMetaDataLajos Molnar2014-07-311-3/+4
* | | | | resolved conflicts for merge of e1009a0f to masterLajos Molnar2014-08-012-6/+28
|\ \ \ \ \ | |/ / / /
| * | | | am a2e14302: mediaplayer: add looping support to NuPlayerLajos Molnar2014-08-012-4/+27
| |\ \ \ \ | | |/ / /
| | * | | mediaplayer: add looping support to NuPlayerLajos Molnar2014-07-312-4/+27
| | |/ /
* | | | am f4ba6193: am a2981013: NuPlayer: fix av discontinuity raceRobert Shih2014-08-011-7/+8
|\ \ \ \ | |/ / /