summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/httplive/LiveSession.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '91820d46b5f3065c2fded3cdf65d305715b33bb1' into HEADBill Yi2014-04-291-185/+396
|\
| * am 43ca783e: httplive: block-by-block fetch, decrypt, and parse ts files.Robert Shih2014-03-191-4/+6
| |\ | | | | | | | | | | | | * 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-191-4/+6
| | | | | | | | | | | | Bug: 12060952 Change-Id: I695345081fe23961b9d0ef6db264885f914703ec
| * | am 70cc5bdc: Merge changes Ic46e3069,Idc92716b into klp-devLajos Molnar2014-03-141-1/+1
| |\ \ | | |/ | | | | | | | | | | | | * 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
| * | am 67a10c52: Merge "httplive: clear access units before returning from ↵Lajos Molnar2014-03-141-7/+19
| |\ \ | | |/ | | | | | | | | | | | | | | | 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-111-7/+19
| | | | | | | | | | | | | | | Bug: 12060952 Change-Id: I6a69a718c082501003ee9b78a948a2f8bbfbb14e
| * | am 19afb386: Merge "Remove streaming URI from default logs"Marco Nelissen2014-03-131-1/+1
| |\ \ | | | | | | | | | | | | | | | | * commit '19afb3869eb6a3e3733dc1f7420e1d4c3c03d376': Remove streaming URI from default logs
| * \ \ am 49ea1337: Merge changes ↵Lajos Molnar2014-03-071-176/+381
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-061-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | Initial HLS seamless switch implementation.Robert Shih2014-03-061-30/+250
| | | | | | | | | | | | | | | | | | | | Bug: 11854054 Change-Id: I75fc2a258111295039ac13cc37e407df25891dd2
| | * | LiveSession refactorRobert Shih2014-03-061-119/+67
| | | | | | | | | | | | | | | | | | | | Bug: 11854054 Change-Id: Ia91dce109835e042f72934376d4838b4cc72cb10
| | * | LiveSession: Add support for block-by-block fetchFile.Robert Shih2014-03-061-34/+63
| | | | | | | | | | | | | | | | | | | | Bug: 11854054 Change-Id: I4025ba7fab8fab2e0c720f73894e908fd98a43d8
* | | | libstagefright: fix 64-bit warningsColin Cross2014-04-141-4/+5
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | %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
* | | Remove streaming URI from default logsDavid Williams2014-03-101-1/+1
| | | | | | | | | | | | | | | | | | 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-201-3/+11
|\ \ \ | |/ / |/| |
| * | LiveSession: Use the actual, possibly redirected url as base in the M3UMartin Storsjo2014-01-101-3/+11
| |/ | | | | | | | | | | | | 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
* | 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
* MediaPlayer: add listener for raw track dataChong Zhang2013-08-191-10/+49
| | | | | | 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-311-575/+641
| | | | | | and more. Change-Id: Icfc45a0100243b2f7a14a9e65696be45b67d6495
* 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-271-12/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-081-13/+13
| | | | | | | See https://android-git.corp.google.com/g/#/c/157220 Bug: 5449033 Change-Id: Ic9c19d30693bd56755f55906127cd6bd7126096c
* Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGESteve Block2012-01-041-8/+8
| | | | | | | See https://android-git.corp.google.com/g/156801 Bug: 5449033 Change-Id: Ib08fe86d23db91ee153e9f91a99a35c42b9208ea
* Support new HLS byte-range extensionsAndreas Huber2011-10-311-5/+36
| | | | Change-Id: Ic767ddea93ffcb87d83b8fbc20837486648da3d7
* Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGESteve Block2011-10-261-5/+5
| | | | | | | See https://android-git.corp.google.com/g/#/c/143865 Bug: 5449033 Change-Id: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a
* Restart HLS streaming from the bottom of the playlist if we miss the boat on theAndreas Huber2011-08-041-13/+22
| | | | | | | | | | next segment. This can happen if for whatever reason we playback video slower than it is served. Also removed some unnecessary verbosity from ChromiumHTTPDataSource. Change-Id: I6e870879310c9efe4d50d7dc0883c08405442d79 related-to-bug: 5120425
* Start playing live streaming HLS content from the first segment.Andreas Huber2011-08-011-11/+10
| | | | | | | | Also properly signal a "hard" discontinuity, i.e. a possible format change when a discontinuity is signalled explicitly as part of the playlist. Change-Id: Ic347d3d11d39b0411c3726a7c723bcf13092b8bc related-to-bug: 5103155, 5103013
* More HLS fixesAndreas Huber2011-07-191-1/+4
| | | | | | | properly expand URLs where the "new" URL is an absolute path. properly include any extra headers even when fetching the key files. Change-Id: I7cd8879015ea8e3d3e2334f4e7e16b8c1a5d48e9
* Always consider playlists corresponding to different bandwidths different.Andreas Huber2011-07-151-0/+6
| | | | Change-Id: I07bb3023af5046db93b4f8785eb90c6a4fb15b95
* Refetch playlists according to the HLS specs, varying delay if playlists ↵Andreas Huber2011-07-151-12/+111
| | | | | | | | | unchanged since the previous fetch. Change-Id: I75e167a650c65a23e284381db5203beba7be7420 related-to-bug: 4983546
* Charge network traffic to the uid of the process using the MediaPlayer.Andreas Huber2011-07-011-1/+10
| | | | | Change-Id: I2bcb54b8232afd3fc7ee16289f37c7a7b3f23067 related-to-bug: 4517282
* Seeking/duration in HLS content is based on the individual segments' durationAndreas Huber2011-06-301-13/+32
| | | | | | | not target-duration. Change-Id: I294097daa84c25e4084a6fc4ea80e39a543f3d10 related-to-bug: 4983285
* Parse the individual segment's duration as a floating point number which is nowAndreas Huber2011-06-211-0/+2
| | | | | | | allowed in later HLS specs. Change-Id: I7c8296acb4e9b0f80022f3057769de0eea9ee0c6 related-to-bug: 4779022
* Add extra headers specified in the media player's setDataSource callAndreas Huber2011-04-201-2/+21
| | | | | | | to all http requests made by the http live implementation. Change-Id: I9dd78bb261bc678ea98c82009ca2634b74f3cd58 related-to-bug: 4315346
* An HTTP datasource for stagefright using the chromium code.Andreas Huber2011-03-091-4/+9
| | | | | | | | Use of this new datasource is now the default unless overwritten by adb shell setprop media.stagefright.use-chromium false Change-Id: I156a8eb9a1fff1cb537b4aec6cf3e8e6052be81e
* Suppress the logging of URLs when in incognito mode.Andreas Huber2011-02-241-4/+13
| | | | | Change-Id: Ib951b495eae15669e160ef54686eab0eeb9b366a related-to-bug: 3336575
* Experimental support for https transfers in stagefright.Andreas Huber2011-02-171-1/+2
| | | | Change-Id: If1bd0f265dda136c7c34b53317f64383023b53a3
* Remove legacy, AwesomePlayer-based http live implementation.Andreas Huber2011-02-161-12/+0
| | | | Change-Id: I455d0faa5612dcd4d2bb6f2b3c7b64a1caaabf69
* Disconnect HTTP live sessions as soon as the request comes in.Andreas Huber2011-01-311-1/+24
| | | | | | | Instead of waiting until pending events have been processed. Change-Id: Id758f5508a514561e18aade82175d69e9156965e related-to-bug: 3409681
* Some tweaks to HTTP live / nuplayer behaviourAndreas Huber2011-01-211-2/+15
| | | | | | | | | | - play audio-only streams again - workaround for malformed streams that switch PIDs across bandwidths - attempt to pick a different bandwidth stream if the previously chosen one appears to be malformed/unsupported. Change-Id: I426d0a40dc725aa242f619d4c9d048b69aca55c9 related-to-bug: 2368598
* Always revert to the previous bandwidth if the required sequence number ↵Andreas Huber2011-01-191-2/+1
| | | | | | cannot be found Change-Id: I098dba37f4a70fc703c9ce65346907c3e10f27f6
* Return a runtime error if decryption fails instead of asserting.Andreas Huber2011-01-191-2/+8
| | | | Change-Id: Ibab7f2cae3ff7a2e19bc3f31005d5059775a664a
* Fix typo.Andreas Huber2011-01-061-1/+1
| | | | Change-Id: I2d7796425ea746432964ce48959b6c227d31df11
* If the stream for the new bandwidth doesn't have the segment we're looking ↵Andreas Huber2011-01-061-0/+13
| | | | | | | | for... go back to the previous bandwidth' stream. Change-Id: I3477cb6932102883509a7cbe9fb2b3bb02dac8c6
* Use NuPlayer for HTTP live streaming playback by default.Andreas Huber2011-01-061-2/+2
| | | | | | Reversed the property logic, set media.httplive.disable-nuplayer to true to revert Change-Id: I1057940667aaab56bb75c9ea15c2cdcab736f3c6
* Some more fixes regarding HTTP live in NuPlayer.Andreas Huber2011-01-051-3/+17
| | | | Change-Id: I9e29615fa8ee6c7bd4189373a75c20caef3fd2b1