summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/httplive
Commit message (Collapse)AuthorAgeFilesLines
* M3UParser: check for NULL before setting meta dataRobert Shih2014-07-161-0/+6
| | | | | Bug:16351654 Change-Id: I64e9510f719b220471522b4d78a9b00a98bda772
* Fix M3UParser relative path handling.Lajos Molnar2014-07-161-1/+3
| | | | | Bug: 16017037 Change-Id: Ibfff99387fb5b3e721144a2b3f9174092d785137
* Merge commit '91820d46b5f3065c2fded3cdf65d305715b33bb1' into HEADBill Yi2014-04-296-395/+1286
|\
| * am 333ceb4f: Merge "DO NOT MERGE: PlaylistFetcher: fix infinite loop when ↵Lajos Molnar2014-03-211-0/+12
| |\ | | | | | | | | | | | | | | | | | | parsing ADTS." into klp-dev * commit '333ceb4f66ccf790081026f645474e07d832fbdb': DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS.
| | * DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS.Robert Shih2014-03-211-0/+12
| | | | | | | | | | | | | | | | | | First check for embedded ID3 tag, then bail out if invalid. Bug: 12934795 Change-Id: I74acebed4bfb2c6ca44dfe936166fdba8510233f
| * | 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.
| * \ \ 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 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
| * \ \ \ 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 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 19afb386: Merge "Remove streaming URI from default logs"Marco Nelissen2014-03-132-3/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '19afb3869eb6a3e3733dc1f7420e1d4c3c03d376': Remove streaming URI from default logs
| * \ \ \ \ am 49ea1337: Merge changes ↵Lajos Molnar2014-03-076-253/+790
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 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 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 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
* | | | | | libstagefright: fix 64-bit warningsColin Cross2014-04-142-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | %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. (cherry picked from commit b4a7a2df4c28c3f32b5d877b54831d2cc5d78f81) Change-Id: I76ba94d0b67776fd7abdc83b43d47c61d6c32f4c
* | | | | | warnings be gone (2/4)Mark Salyzyn2014-04-111-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 84333e0475bc911adc16417f4ca327c975cf6c36) (squashed with commit b4a7a2df4c28c3f32b5d877b54831d2cc5d78f81) Change-Id: I048a2c6868515716c7cd7319a3d0abe6311dac4e
* | | | | | warnings be gone.Andreas Huber2014-04-111-1/+1
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 84333e0475bc911adc16417f4ca327c975cf6c36) Modified by Mark Salyzyn <salyzyn@google.com> to keep merge conflicts or errors downstream to a minimum. Change-Id: Ic3b272f9cbf3155001aabd2f79728f1bc31de613
* | | | | libstagefright is no longer 32 bit only.Narayan Kamath2014-03-191-2/+0
| |_|_|/ |/| | | | | | | | | | | Change-Id: I88d5fcfc005a2c2acd0246cdd9c08b6c00b6c39b Signed-off-by: Glenn Kasten <gkasten@android.com>
* | | | More precise 32-bit only for libstagefright/ subdirectoriesGlenn Kasten2014-03-171-0/+2
| |_|/ |/| | | | | | | | Change-Id: Ie4e8f9ccd834b902287d3452cc9fa739809ddb68
* | | Remove streaming URI from default logsDavid Williams2014-03-102-3/+2
| | | | | | | | | | | | | | | | | | Streaming URI should not be visible in default logcat logs Change-Id: I104cc56b5335f8c5621013e4c5be8028f0379833
* | | Merge "LiveSession: Use the actual, possibly redirected url as base in the M3U"Marco Nelissen2014-02-202-4/+13
|\ \ \ | |/ / |/| |
| * | LiveSession: Use the actual, possibly redirected url as base in the M3UMartin Storsjo2014-01-102-4/+13
| |/ | | | | | | | | | | | | This fixes playback of HLS streams where the M3U playlists use relative paths and the main playlist is opened via a redirect. Change-Id: I787e1c050daddc566be4c8e3f84803d3f91eec46
* | M3UParser: Fix typo in 8883a38a308Martin Storsjo2014-02-101-1/+1
| | | | | | | | Change-Id: I09f8deb40b8b34efd4bfcfab6866b7780f8bae96
* | Merge "M3UParser: Skip query strings when looking for the last slash in a URL"Marco Nelissen2014-02-101-12/+22
|\ \
| * | M3UParser: Skip query strings when looking for the last slash in a URLMartin Storsjo2014-02-051-12/+22
| | | | | | | | | | | | Change-Id: I72d3a5e11fef9bbd75b291bc490c9cab1dce58da
* | | frameworks/av: fix errors inside ALOGVColin Cross2014-02-061-3/+0
|/ / | | | | | | | | | | Fix errors exposed by adding compile-time checking to disabled ALOGVs. Change-Id: I9602a4a485dffa3caad732c2a19ec0e41a0ac65b
* | HLS: Fixed rounding error with decimal segment durationOscar Rydhé2013-12-191-1/+1
|/ | | | | | | | | | | If segment duration is specified with decimal value only the integer value will be used, causing the stream duration to be wrong. Reported to Android public issue tracker: https://code.google.com/p/android/issues/detail?id=56223 Change-Id: I34fb7a81af6ad3d9a214228cfe3724636ebf5ab5
* Pass subtitle track properties to getTrackInfoChong Zhang2013-09-111-0/+7
| | | | | | Bug: 10326117 Change-Id: I15fcc49ad02e26d7cc92e82ee670bafca62a09a7
* MediaPlayer: add listener for raw track dataChong Zhang2013-08-197-18/+168
| | | | | | Bug: 10326117 Change-Id: I2c0bdf8adc67b11f8dc633423bee66897548f181
* Fix uninitialized variable error in HLS bandwidth determination.Andreas Huber2013-06-031-1/+1
| | | | Change-Id: I647e79443f2a06e5b1b4f9068c02b424b0e57989
* New HLS implementation supporting independent stream sources, audio-only streamsAndreas Huber2013-05-317-600/+2520
| | | | | | and more. Change-Id: Icfc45a0100243b2f7a14a9e65696be45b67d6495
* Parse the last none-empty line of .m3u8 fileSungsoo Lim2013-04-161-3/+0
| | | | | | | | | If the last sentence of .m3u8 file is not processed, because it is not empty and has no line feed, M3UParser.isComplete() returns false even though it is completed. Change-Id: I01b9f900d44247a3ef40369a2f9198bb7eaf01b7 related-to-bug: 8405824
* Fix seek in response to OnPrepared() for HLS contentAndreas Huber2013-04-011-13/+11
| | | | | Change-Id: I0e52352845398a4db074e939487f6f6de94bd523 related-to-bug: 8225122
* HLS now properly publishes its "seekable" flags after connectionAndreas Huber2013-02-061-9/+44
| | | | | | | has successfully completed and a sufficient amount of data fetched, and only then signals that preparation is completed. Change-Id: I7684a14238b826909f518f2af506966e522dfcfc
* Add support for HLS playlists of type 'event'.Andreas Huber2012-11-272-13/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | related-to-bug: 6870049 Squashed commit of the following: commit eee2f3ba6bb7335f4e285632726db85645669929 Author: Andreas Huber <andih@google.com> Date: Tue Nov 27 15:02:01 2012 -0800 Make everything a lot less verbose by default. Change-Id: I884d7a7901aa1e7d4ff590f065ca57a79d2af8b3 commit 6bbdb837ed5bd88008e45efb8faf595e4051ba26 Author: Andreas Huber <andih@google.com> Date: Tue Nov 27 14:34:46 2012 -0800 HLS now properly signals media time changes at discontinuities including the start of playback (which may not necessarily be at time 0 if the playlist is of type 'event' and hasn't completed yet). Change-Id: I5ab747d024f9b8d0df72a4e06a12ebb29f62802e commit 1555589832b1878a144a976a643e1af4d61f877c Author: Andreas Huber <andih@google.com> Date: Tue Nov 27 14:32:28 2012 -0800 As part of a time discontinuity, clients of IStreamListener can now signal the corresponding media time after the discontinuity, i.e. the first PTS timestamp following the discontinuity will be considered equivalent to the specified media time and media buffers timestamped accordingly. Change-Id: Id7db7679b7faa6efd6270620ff52e34e884f3e92 commit 5c24c605c073a11c426d025b1e7478fc1ad8365a Author: Andreas Huber <andih@google.com> Date: Tue Nov 27 13:00:56 2012 -0800 NuPlayer sources now expose flags() and can announce that duration may change (increase) dynamically, in which case duration will be polled at 1 second intervals and communicated to the upper layers. Change-Id: I45102909b7a19eed0dda576747e3814d742a0eea commit ecb71de8e281e61971a2cd73e7161a97540bc357 Author: Andreas Huber <andih@google.com> Date: Tue Nov 27 12:57:47 2012 -0800 Stop caching duration in MediaPlayer, duration could increase dynamically. Change-Id: I7bb2f16c0abe49debdf45c776d2266aa069d7791 commit 544aec5823e6d7a3e97e15b6b23546616bcd343e Author: Andreas Huber <andih@google.com> Date: Tue Nov 27 08:46:28 2012 -0800 An attempt to add support for "event" style HLS playlists. Change-Id: I3dfb2e801ecaff8f5d8bdb3a4fca1b18aeeb2c60 Change-Id: I48cf7f65a654d33f2f49ded74f8be22aed9e3b98
* Don't log streaming url.James Dong2012-08-171-5/+1
| | | | | | o related-to-bug: 6994761 Change-Id: I79d5549a70b3bde67ddf496cfc6283ac92b1f569
generated by cgit v1.1 at 2024-05-13 20:00:48 +0000