summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* move audio policy service to a separate libraryEric Laurent2014-03-111-0/+2
* M3UParser: trim spaces when parsing comma separated codecs.Robert Shih2014-03-101-0/+1
* Merge "MPEG4Writer: replace timestamp asserts in threadEntry w err return."Robert Shih2014-03-101-10/+42
|\
| * MPEG4Writer: replace timestamp asserts in threadEntry w err return.Robert Shih2014-02-241-10/+42
* | Merge "Stagefright: added WebM muxer."Robert Shih2014-03-1015-4/+2280
|\ \
| * | Stagefright: added WebM muxer.Robert Shih2014-03-0615-4/+2280
* | | Fix freeze on pauseMarco Nelissen2014-03-101-1/+1
* | | Merge "httplive: clear access units before returning from seekTo."Robert Shih2014-03-084-15/+42
|\ \ \
| * | | httplive: clear access units before returning from seekTo.Robert Shih2014-03-074-15/+42
* | | | Merge "Miscellaneous cleanup for NBAIO"Glenn Kasten2014-03-071-10/+0
|\ \ \ \
| * | | | Miscellaneous cleanup for NBAIOGlenn Kasten2014-03-071-10/+0
* | | | | am 9219bfc4: am 2ad7af29: Merge "Check for ARCH_ARM_HAVE_NEON flag only for A...Narayan Kamath2014-03-072-4/+7
|\ \ \ \ \
| * \ \ \ \ am 2ad7af29: Merge "Check for ARCH_ARM_HAVE_NEON flag only for ARM arch"Narayan Kamath2014-03-072-4/+7
| |\ \ \ \ \
| | * \ \ \ \ Merge "Check for ARCH_ARM_HAVE_NEON flag only for ARM arch"Narayan Kamath2014-03-072-4/+7
| | |\ \ \ \ \
| | | * | | | | Check for ARCH_ARM_HAVE_NEON flag only for ARM archAshok Bhat2014-03-032-4/+7
* | | | | | | | am 3a46b975: am a9b82160: Merge "LP64 fixes for media/libeffects"Narayan Kamath2014-03-0714-61/+62
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | / / / / | |_|_|/ / / / |/| | | | | |
| * | | | | | 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-071-0/+5
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | 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 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