summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 6db20dcb: Merge "AudioTrack: When paused, return cached playback position"...Eric Laurent2014-03-081-3/+22
|\
| * Merge "AudioTrack: When paused, return cached playback position" into klp-devEric Laurent2014-03-081-3/+22
| |\
| | * AudioTrack: When paused, return cached playback positionHaynes Mathew George2014-03-061-3/+22
* | | am 2f55c2c0: Merge "Simplify AudioTrack stream end and fix race" into klp-devGlenn Kasten2014-03-081-17/+15
|\ \ \ | |/ /
| * | Merge "Simplify AudioTrack stream end and fix race" into klp-devGlenn Kasten2014-03-071-17/+15
| |\ \
| | * | Simplify AudioTrack stream end and fix raceGlenn Kasten2014-03-071-17/+15
* | | | am 5874615f: Allow for larger codec private dataMarco Nelissen2014-03-081-30/+50
|\ \ \ \ | |/ / /
| * | | Allow for larger codec private dataMarco Nelissen2014-03-071-30/+50
| |/ /
| * | Merge "Fix SIGABRT when playing mp4 file" into klp-devMarco Nelissen2014-03-071-0/+6
| |\ \
| | * | Fix SIGABRT when playing mp4 fileMarco Nelissen2014-03-061-0/+6
* | | | am 80b72e6f: Merge "libeffects: don\'t set module path"Colin Cross2014-03-071-1/+0
|\ \ \ \
| * | | | libeffects: don't set module pathColin Cross2014-02-131-1/+0
* | | | | am 49ea1337: Merge changes I787e1c05,I72d3a5e1,I0a5cc65f,I75fc2a25,I2c2be08d,...Lajos Molnar2014-03-079-254/+864
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge changes I787e1c05,I72d3a5e1,I0a5cc65f,I75fc2a25,I2c2be08d, ... into klp...Lajos Molnar2014-03-0712-266/+893
| |\ \ \ \
| | * | | | LiveSession: Use the actual, possibly redirected url as base in the M3UMartin Storsjo2014-03-062-4/+13
| | * | | | M3UParser: Skip query strings when looking for the last slash in a URLMartin Storsjo2014-03-061-12/+22
| | * | | | ChromiumHTTPDataSource: Keep track of the redirected URLMartin Storsjo2014-03-063-0/+7
| | * | | | Initial HLS seamless switch implementation.Robert Shih2014-03-064-48/+541
| | * | | | NuPlayer side support for seamless format switch.Robert Shih2014-03-063-1/+74
| | * | | | LiveSession refactorRobert Shih2014-03-064-140/+92
| | * | | | PlaylistFetcher: Add support for block-by-block decryption.Robert Shih2014-03-062-37/+75
| | * | | | LiveSession: Add support for block-by-block fetchFile.Robert Shih2014-03-062-35/+80
* | | | | | am e0c3058a: Merge "AnotherPacketSource support to get latest buffered MetaDa...Lajos Molnar2014-03-072-2/+25
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "AnotherPacketSource support to get latest buffered MetaData." into klp...Lajos Molnar2014-03-072-2/+25
| |\ \ \ \ \ | | |/ / / /
| | * | | | AnotherPacketSource support to get latest buffered MetaData.Robert Shih2014-03-062-2/+25
* | | | | | am 2613347d: Merge "Added support to query ACodec whether adaptive playback i...Lajos Molnar2014-03-071-0/+5
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Added support to query ACodec whether adaptive playback is enabled." i...Lajos Molnar2014-03-071-0/+5
| |\ \ \ \ \ | | |/ / / /
| | * | | | Added support to query ACodec whether adaptive playback is enabled.Robert Shih2014-03-061-0/+5
* | | | | | am 909498b7: Merge "stagefright: use CODECS field in EXT-X_STREAM-INF as fall...Lajos Molnar2014-03-072-7/+157
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "stagefright: use CODECS field in EXT-X_STREAM-INF as fallback" into kl...Lajos Molnar2014-03-072-7/+157
| |\ \ \ \ \ | | |/ / / /
| | * | | | stagefright: use CODECS field in EXT-X_STREAM-INF as fallbackRobert Shih2014-03-062-7/+157
* | | | | | am 2338782d: Merge "Fixed misplaced bracket for switch-case block." into klp-devLajos Molnar2014-03-071-4/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Fixed misplaced bracket for switch-case block." into klp-devLajos Molnar2014-03-071-4/+4
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fixed misplaced bracket for switch-case block.Robert Shih2014-03-061-4/+4
* | | | | | am ad21a81a: Merge "stagefright: Fix issue with tracking media format in pack...Lajos Molnar2014-03-072-13/+44
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "stagefright: Fix issue with tracking media format in packet source" in...Lajos Molnar2014-03-072-13/+44
| |\ \ \ \ \ | | |/ / / /
| | * | | | stagefright: Fix issue with tracking media format in packet sourceLajos Molnar2014-03-062-13/+44
* | | | | | am b74b2098: Merge "stagefright: Fix bugs in playlist fetcher logic" into klp...Lajos Molnar2014-03-072-29/+105
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "stagefright: Fix bugs in playlist fetcher logic" into klp-devLajos Molnar2014-03-072-29/+105
| |\ \ \ \ \ | | |/ / / / | | | | | / | | |_|_|/ | |/| | |
| | * | | stagefright: Fix bugs in playlist fetcher logicLajos Molnar2014-03-062-29/+105
| | | |/ | | |/|
| * | | Merge "stagefright: do not offload LD-AAC decoding" into klp-devEric Laurent2014-03-072-0/+14
| |\ \ \ | | |/ / | |/| |
| | * | stagefright: do not offload LD-AAC decodingEric Laurent2014-03-062-0/+14
| * | | Merge "stagefright: fix offloading HE-AAC sampling rate." into klp-devEric Laurent2014-03-061-17/+23
| |\ \ \ | | |/ /
| | * | stagefright: fix offloading HE-AAC sampling rate.Eric Laurent2014-03-051-17/+23
* | | | am af191eb4: Merge "Replace size_t in shared memory by uint32_t"Glenn Kasten2014-03-071-6/+13
|\ \ \ \ | | |_|/ | |/| |
| * | | Replace size_t in shared memory by uint32_tGlenn Kasten2014-02-131-6/+13
* | | | am 7eacea11: Merge "avcenc: Only do startcode escaping if the next byte requi...Lajos Molnar2014-03-071-6/+9
|\ \ \ \ | |/ / /
| * | | Merge "avcenc: Only do startcode escaping if the next byte requires it"Lajos Molnar2014-02-111-6/+9
| |\ \ \
| | * | | avcenc: Only do startcode escaping if the next byte requires itMartin Storsjo2014-02-111-6/+9
* | | | | am 3c9130a8: Merge "Make frameworks/av 64-bit compatible"Narayan Kamath2014-03-0730-95/+105
|\ \ \ \ \ | |/ / / /