summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am a9b82160: Merge "LP64 fixes for media/libeffects"Narayan Kamath2014-03-0714-61/+62
|\
| * Merge "LP64 fixes for media/libeffects"Narayan Kamath2014-03-0714-61/+62
| |\
| | * LP64 fixes for media/libeffectsAshok Bhat2014-02-2014-61/+62
* | | resolved conflicts for merge of 8d1caa02 to klp-modular-dev-plus-aospNarayan Kamath2014-03-079-252/+853
|\ \ \
| * \ \ am 49ea1337: Merge changes I787e1c05,I72d3a5e1,I0a5cc65f,I75fc2a25,I2c2be08d,...Lajos Molnar2014-03-0712-266/+893
| |\ \ \
| | * \ \ 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 04352de2: am e0c3058a: Merge "AnotherPacketSource support to get latest bu...Lajos Molnar2014-03-072-2/+25
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 72d09f62: am 2613347d: Merge "Added support to query ACodec whether adapti...Lajos Molnar2014-03-072-0/+8
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 2613347d: Merge "Added support to query ACodec whether adaptive playback i...Lajos Molnar2014-03-072-0/+8
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Added support to query ACodec whether adaptive playback is enabled." i...Lajos Molnar2014-03-072-0/+8
| | |\ \ \ \ | | | |/ / /
| | | * | | Added support to query ACodec whether adaptive playback is enabled.Robert Shih2014-03-062-0/+8
* | | | | | am d7c4da3c: am 909498b7: Merge "stagefright: use CODECS field in EXT-X_STREA...Lajos Molnar2014-03-072-7/+157
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 4dbd814d: am 2338782d: Merge "Fixed misplaced bracket for switch-case bloc...Lajos Molnar2014-03-071-4/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 e389b1bd: am ad21a81a: Merge "stagefright: Fix issue with tracking media f...Lajos Molnar2014-03-072-13/+44
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 3bd0270c: am b74b2098: Merge "stagefright: Fix bugs in playlist fetcher lo...Lajos Molnar2014-03-072-29/+105
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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
* | | | | | am 47ef192f: am a11111f9: Merge changes Id28b35fd,Ie4e64977,I2950f31e into kl...Eino-Ville Talvala2014-03-073-55/+66
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am a11111f9: Merge changes Id28b35fd,Ie4e64977,I2950f31e into klp-devEino-Ville Talvala2014-03-073-55/+66
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge changes Id28b35fd,Ie4e64977,I2950f31e into klp-devEino-Ville Talvala2014-03-073-55/+66
| | |\ \ \ \
| | | * | | | DO NOT MERGE: Camera: fix focusArea wrong indexing issueZhijun He2014-03-051-14/+14
| | | * | | | DO NOT MERGE: camera2: Fix race with stream deletion during disconnect.Ruben Brunk2014-03-051-6/+8
| | | * | | | DO NOT MERGE: camera2/3: Add protection for still capture pathZhijun He2014-03-051-35/+44
* | | | | | | am bfc26066: am ed4d8b28: Merge "stagefright: do not offload LD-AAC decoding"...Eric Laurent2014-03-070-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am ed4d8b28: Merge "stagefright: do not offload LD-AAC decoding" into klp-devEric Laurent2014-03-070-0/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "stagefright: do not offload LD-AAC decoding" into klp-devEric Laurent2014-03-073-0/+15
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | stagefright: do not offload LD-AAC decodingEric Laurent2014-03-063-0/+15
* | | | | | | am 4ed0b0b6: am 880413f7: Merge "stagefright: fix offloading HE-AAC sampling ...Eric Laurent2014-03-060-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 880413f7: Merge "stagefright: fix offloading HE-AAC sampling rate." into k...Eric Laurent2014-03-060-0/+0
| |\ \ \ \ \ \ | | |/ / / / /