summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/httplive
Commit message (Collapse)AuthorAgeFilesLines
* Merge "PlaylistFetcher: start queueing AUs after the 1st IDR nalu"Robert Shih2014-05-092-0/+21
|\
| * PlaylistFetcher: start queueing AUs after the 1st IDR naluRobert Shih2014-04-252-0/+21
| | | | | | | | | | Bug: 14159556 Change-Id: I4fc16dda9357e1251d2909571a79215d13d0104b
* | Allow BOM and space in WebVTT filesLajos Molnar2014-05-082-1/+28
| | | | | | | | | | Bug: 10900755 Change-Id: I47a7a33f749ea2470ce7d9d36d33c7484637d61c
* | PlaylistFetcher: clear mTSParser on bad starting seq # hintRobert Shih2014-04-251-0/+1
|/ | | | | Bug: 14159556 Change-Id: If25187477066282d5980da3c4d8a76dcfcf54d27
* stagefright: log uri protocols, and opt-in to log full uriLajos Molnar2014-04-042-7/+5
| | | | | | | | | | | Added property media.stagefright.log-uri. Set it to true or 1 to log uris by AwesomePlayer. Added utility function to get uri debug string based on incognito and log opt-in status. Change-Id: I5ccc23079ddfb120dd9703a3ed651a162ed5acec Related-Bug: 6994761
* libstagefright: fix 64-bit warningsColin Cross2014-03-193-18/+20
| | | | | | | | | %lld -> %" PRId64 " for int64_t %d -> %zu for size_t Also fixes some casts from void* to integer types, and some comparisons between signed and unsigned. Change-Id: I9c52f76240e39399da252c66459042a6fc626a90
* Merge commit 'c250980f' into manualmergeGlenn Kasten2014-03-191-2/+0
|\ | | | | | | Change-Id: I254d456e8cb6c580dd77d602b391bed09110454e
| * am 24e1bd71: Merge "libstagefright is no longer 32 bit only."Glenn Kasten2014-03-191-2/+0
| |\ | | | | | | | | | | | | * commit '24e1bd71ac6850d9062b3bd803b37c0e92f69c7a': libstagefright is no longer 32 bit only.
| | * libstagefright is no longer 32 bit only.Narayan Kamath2014-03-191-2/+0
| | | | | | | | | | | | Change-Id: I88d5fcfc005a2c2acd0246cdd9c08b6c00b6c39b Signed-off-by: Glenn Kasten <gkasten@android.com>
* | | am 49b2e310: am a1f0c62c: am 43ca783e: httplive: block-by-block fetch, ↵Robert Shih2014-03-194-186/+282
|\ \ \ | |/ / | | | | | | | | | | | | | | | decrypt, and parse ts files. * commit '49b2e310f62c590a1af9f921cd8a134cdf589263': httplive: block-by-block fetch, decrypt, and parse ts files.
| * | am a1f0c62c: am 43ca783e: httplive: block-by-block fetch, decrypt, and parse ↵Robert Shih2014-03-194-186/+282
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | ts files. * commit 'a1f0c62c189f2d162cca4af736c3d440f1eff53c': httplive: block-by-block fetch, decrypt, and parse ts files.
| | * \ am 43ca783e: httplive: block-by-block fetch, decrypt, and parse ts files.Robert Shih2014-03-194-186/+282
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit '43ca783effd99bba0e6e2dd6fe177a8888578ef8': httplive: block-by-block fetch, decrypt, and parse ts files.
| | | * | httplive: block-by-block fetch, decrypt, and parse ts files.Robert Shih2014-03-194-186/+282
| | | | | | | | | | | | | | | | | | | | Bug: 12060952 Change-Id: I695345081fe23961b9d0ef6db264885f914703ec
* | | | | am 098b28fc: am 64727dd7: Merge "More precise 32-bit only for ↵Glenn Kasten2014-03-181-0/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | libstagefright/ subdirectories" * commit '098b28fc88b3d96eada2f9db318d9c38c70cf674': More precise 32-bit only for libstagefright/ subdirectories
| * | | | am 64727dd7: Merge "More precise 32-bit only for libstagefright/ subdirectories"Glenn Kasten2014-03-181-0/+2
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | * commit '64727dd7c8513b6c9ddcce2f4b305618bb76121c': More precise 32-bit only for libstagefright/ subdirectories
| | * | | More precise 32-bit only for libstagefright/ subdirectoriesGlenn Kasten2014-03-171-0/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie4e8f9ccd834b902287d3452cc9fa739809ddb68
| * | | | am 466786b2: am 70cc5bdc: Merge changes Ic46e3069,Idc92716b into klp-devLajos Molnar2014-03-142-1/+2
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | * commit '466786b25b262f4f6e5737b3a88e8d7f6916e45c': LiveSession: fix incorrect stream key (subtitle"s") M3UParser: trim spaces when parsing comma separated codecs.
| | * | | am 70cc5bdc: Merge changes Ic46e3069,Idc92716b into klp-devLajos Molnar2014-03-142-1/+2
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | * commit '70cc5bdc0fca3f67f3602f04152c29323cad99df': LiveSession: fix incorrect stream key (subtitle"s") M3UParser: trim spaces when parsing comma separated codecs.
| | | * | LiveSession: fix incorrect stream key (subtitle"s")Robert Shih2014-03-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13402087 Change-Id: Ic46e3069c6e41f90ead47cae84cbe0123d11002a
| | | * | M3UParser: trim spaces when parsing comma separated codecs.Robert Shih2014-03-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13402087 Change-Id: Idc92716bfefd6d1b0cb371d0d97d990d53288090
| * | | | am 5b297ba7: am 67a10c52: Merge "httplive: clear access units before ↵Lajos Molnar2014-03-144-15/+42
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | returning from seekTo." into klp-dev * commit '5b297ba76271e8554758cbd569e73720bc914af6': httplive: clear access units before returning from seekTo.
| | * | | am 67a10c52: Merge "httplive: clear access units before returning from ↵Lajos Molnar2014-03-144-15/+42
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | seekTo." into klp-dev * commit '67a10c522898d8223f5a2d389a846b7e2327148a': httplive: clear access units before returning from seekTo.
| | | * | httplive: clear access units before returning from seekTo.Robert Shih2014-03-114-15/+42
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 12060952 Change-Id: I6a69a718c082501003ee9b78a948a2f8bbfbb14e
* | | | | am f4431278: am 19afb386: Merge "Remove streaming URI from default logs"Marco Nelissen2014-03-122-3/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'f4431278a9613f55ecd944ab2e3eb615b372f269': Remove streaming URI from default logs
| * | | | am 19afb386: Merge "Remove streaming URI from default logs"Marco Nelissen2014-03-122-3/+2
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | * commit '19afb3869eb6a3e3733dc1f7420e1d4c3c03d376': Remove streaming URI from default logs
| | * | | Remove streaming URI from default logsDavid Williams2014-03-102-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Streaming URI should not be visible in default logcat logs Change-Id: I104cc56b5335f8c5621013e4c5be8028f0379833
| * | | | resolved conflicts for merge of 8d1caa02 to klp-modular-dev-plus-aospNarayan Kamath2014-03-076-251/+779
| |\ \ \ \ | | | |/ / | | |/| | | | | | | Change-Id: Ibcb60d0d3bbc8beb54440951ffe8a14b946ccc85
| | * | | am 49ea1337: Merge changes ↵Lajos Molnar2014-03-076-265/+812
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I787e1c05,I72d3a5e1,I0a5cc65f,I75fc2a25,I2c2be08d, ... into klp-dev * commit '49ea13379fb15ddb73183ebafa3a377342ef932f': LiveSession: Use the actual, possibly redirected url as base in the M3U M3UParser: Skip query strings when looking for the last slash in a URL ChromiumHTTPDataSource: Keep track of the redirected URL Initial HLS seamless switch implementation. NuPlayer side support for seamless format switch. LiveSession refactor PlaylistFetcher: Add support for block-by-block decryption. LiveSession: Add support for block-by-block fetchFile.
| | | * | LiveSession: Use the actual, possibly redirected url as base in the M3UMartin Storsjo2014-03-062-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes playback of HLS streams where the M3U playlists use relative paths and the main playlist is opened via a redirect. Bug: 13174301 Change-Id: I787e1c050daddc566be4c8e3f84803d3f91eec46
| | | * | M3UParser: Skip query strings when looking for the last slash in a URLMartin Storsjo2014-03-061-12/+22
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 13174301 Change-Id: I72d3a5e11fef9bbd75b291bc490c9cab1dce58da
| | | * | Initial HLS seamless switch implementation.Robert Shih2014-03-064-48/+541
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11854054 Change-Id: I75fc2a258111295039ac13cc37e407df25891dd2
| | | * | LiveSession refactorRobert Shih2014-03-064-140/+92
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11854054 Change-Id: Ia91dce109835e042f72934376d4838b4cc72cb10
| | | * | PlaylistFetcher: Add support for block-by-block decryption.Robert Shih2014-03-062-37/+75
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11854054 Change-Id: Ifd3f3369275889e716b360087b5b60d01635b578
| | | * | LiveSession: Add support for block-by-block fetchFile.Robert Shih2014-03-062-35/+80
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11854054 Change-Id: I4025ba7fab8fab2e0c720f73894e908fd98a43d8
| * | | | am d7c4da3c: am 909498b7: Merge "stagefright: use CODECS field in ↵Lajos Molnar2014-03-072-7/+157
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | EXT-X_STREAM-INF as fallback" into klp-dev * commit 'd7c4da3c1c33b5219d7d87ba698cd7d9c8750c41': stagefright: use CODECS field in EXT-X_STREAM-INF as fallback
| | * | | am 909498b7: Merge "stagefright: use CODECS field in EXT-X_STREAM-INF as ↵Lajos Molnar2014-03-072-7/+157
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | fallback" into klp-dev * commit '909498b72d740e3151561fd4435ad0a329ec9c6e': stagefright: use CODECS field in EXT-X_STREAM-INF as fallback
| | | * | stagefright: use CODECS field in EXT-X_STREAM-INF as fallbackRobert Shih2014-03-062-7/+157
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the CODECS field in EXT-X-STREAM-INF as a viable fallback for identifying available streams in a variant playlist. Bug: 11854054 Change-Id: I5011809dc7c56220b023eb1a16f2d6a392ddd6f1
| * | | | am e389b1bd: am ad21a81a: Merge "stagefright: Fix issue with tracking media ↵Lajos Molnar2014-03-071-4/+5
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | format in packet source" into klp-dev * commit 'e389b1bdd13e768baa2532f537236b2c5e6243fa': stagefright: Fix issue with tracking media format in packet source
| | * | | am ad21a81a: Merge "stagefright: Fix issue with tracking media format in ↵Lajos Molnar2014-03-071-4/+5
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | packet source" into klp-dev * commit 'ad21a81af3e7d6b58002c9dce9c3278b6323e4a9': stagefright: Fix issue with tracking media format in packet source
| | | * | stagefright: Fix issue with tracking media format in packet sourceLajos Molnar2014-03-061-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Media format in AnotherPacketSource is now tracked across discontinuities. This fixes a bug where format was set on queueAccessUnit and cleared on dequeueAccessUnit, thereby allowing it to remain cleared. Change-Id: I20975a630443f4a223a2b4344e8244f34b9560b9 Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 12060952
| * | | | am 3bd0270c: am b74b2098: Merge "stagefright: Fix bugs in playlist fetcher ↵Lajos Molnar2014-03-072-29/+105
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| | | | | | | | | | logic" into klp-dev * commit '3bd0270c2106241674b1d8cb4951e5c5a7bc98d2': stagefright: Fix bugs in playlist fetcher logic
| | * | am b74b2098: Merge "stagefright: Fix bugs in playlist fetcher logic" into ↵Lajos Molnar2014-03-072-29/+105
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | klp-dev * commit 'b74b209862cbcbab6053cf4a43bbc16940aaafd2': stagefright: Fix bugs in playlist fetcher logic
| | | * stagefright: Fix bugs in playlist fetcher logicLajos Molnar2014-03-062-29/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Improve start time: start playback as soon as the target duration or 10s was buffered. 2. Select playlist monitor time based on target duration to avoid continuously missing the boat. 3. If "we miss the boat" we still must request a safe sequence number (last - 3) Change-Id: Ie99c360ac67b152ad9af19e9c6e520016f67e4e3 Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 12060952
* | | | LiveSession: fix incorrect stream key (subtitle"s")Robert Shih2014-03-101-1/+1
| | | | | | | | | | | | | | | | | | | | Bug: 13402087 Change-Id: Ic46e3069c6e41f90ead47cae84cbe0123d11002a
* | | | M3UParser: trim spaces when parsing comma separated codecs.Robert Shih2014-03-101-0/+1
| | | | | | | | | | | | | | | | | | | | Bug: 13402087 Change-Id: Idc92716bfefd6d1b0cb371d0d97d990d53288090
* | | | 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
| | | | | | | | | | | | | | | | | | | | Change-Id: I6a69a718c082501003ee9b78a948a2f8bbfbb14e
* | | | | PlaylistFetcher: fix infinite loop when parsing ADTS.Robert Shih2014-03-041-0/+12
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | First check for embedded ID3 tag, then bail out if invalid. Bug: 12934795 Change-Id: I74acebed4bfb2c6ca44dfe936166fdba8510233f
* | | | Initial HLS seamless switch implementation.Robert Shih2014-02-284-48/+541
| | | | | | | | | | | | | | | | | | | | Bug: 11854054 Change-Id: I75fc2a258111295039ac13cc37e407df25891dd2
* | | | LiveSession refactor: reverted loop indice change.Robert Shih2014-02-241-2/+1
| | | | | | | | | | | | | | | | Change-Id: I465746b206e2253ad44aae0c59317473bc93f73e