summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/httplive
Commit message (Collapse)AuthorAgeFilesLines
* Fix struct vs. class mismatchesBernhard Rosenkränzer2014-11-171-1/+1
| | | | | | | | | | Fix something being declared a struct and forward-declared a class and vice versa. gcc doesn't care, clang complains about the mismatch. Change-Id: I7a7a8e9040e3c86fa1d73eb112631ea140861657 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* Check if info for uri is availableMarco Nelissen2014-09-301-0/+4
| | | | | | | before retrieving it. Bug: 17683986 Change-Id: I7a44cd06faf11c22be2ed5ace8ab6e2a5513b66c
* Merge "LiveSession: do not drop seek request" into lmp-devRobert Shih2014-09-251-10/+17
|\
| * LiveSession: do not drop seek requestRobert Shih2014-09-181-10/+17
| | | | | | | | | | Bug: 17538727 Change-Id: I28658b2779ac16512ff54adbe536d01790e6449e
* | NuPlayer HLS: better subtitle togglingRobert Shih2014-09-194-3/+43
|/ | | | | Bug: 17310061 Change-Id: Iacee1816285425aaad08c32b28591bb0162d5a85
* PlaylistFetcher:don't signal a/v eos on subttitle eosRobert Shih2014-09-171-0/+17
| | | | | Bug: 17310061 Change-Id: Ifbca3c12f21171a6e429dca51a250a41051fdd34
* HLS: fix freezes when toggling between a/v streamsRobert Shih2014-09-163-5/+63
| | | | | Bug: 17412740 Change-Id: Iacaf2fa1d20584056375803e1782ad6761c56fc5
* Merge "PlaylistFetcher: find the correct sequence number to start fetching" ↵Robert Shih2014-09-152-51/+107
|\ | | | | | | into lmp-dev
| * PlaylistFetcher: find the correct sequence number to start fetchingRobert Shih2014-09-152-51/+107
| | | | | | | | | | | | | | | | | | | | - skip over bad segemnts - if we skipped too far into the future when adapting in live streams, adjust back Bug: 17141635 Bug: 17416657 Change-Id: I0877ceaf6e69cab751bf9e92579071f9e61643eb
* | LiveSession: reliable switchRobert Shih2014-09-122-10/+57
| | | | | | | | | | Bug: 17142706 Change-Id: I9cd6c068178d62c294496e8ab0b0a3763354964f
* | LiveSession: re-buffer on under run to avoid stutterRobert Shih2014-09-122-1/+37
| | | | | | | | | | Bug: 13742725 Change-Id: I7dad8876e18084c3c060d08190fa8a72fc2f5bad
* | Merge "LiveSession: added onSwitchDown" into lmp-devRobert Shih2014-09-122-0/+62
|\ \
| * | LiveSession: added onSwitchDownRobert Shih2014-09-112-0/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | additionally in this change - AnotherPacketSource: added getEstimatedDurationUs that avoids looping through buffered access units in most cases; this method is called by LiveSession before triggering onSwitchDown. Also fix the original getBufferedDurationUs to accumulate durations across discontinuities. Bug: 13742612 Change-Id: I135932ea0c74671b7019a3c7054844926c18bc14
* | | Merge "LiveSession: raise upwards adaptation constraint" into lmp-devRobert Shih2014-09-122-16/+21
|\ \ \
| * | | LiveSession: raise upwards adaptation constraintRobert Shih2014-09-102-16/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust bandwidth more conservatively when considering an upwards adaptation. Also fixed an issue with kWhatCheckBandwidth messages being accumulated across switch generations; this causes onCheckBandwidth to be fired at a high frequency and LiveSession to be too sensitive to network glitches. Bug: 13743153 Change-Id: I1dec99cb5d123c6675abe0847fd12aab5178eefd
* | | | PlaylistFetcher: avoid repeated fetch when we run off the edge of live playlistsRobert Shih2014-09-071-6/+0
| |_|/ |/| | | | | | | | | | | Bug: 17416658 Change-Id: I1d07ce03a293206c48ff9ee11dc78b815ba367a4
* | | PlaylistFetcher: do not reset mStartTimeUs if we are resumingRobert Shih2014-09-031-2/+2
|/ / | | | | | | | | Bug: 17376049 Change-Id: Ie519bdf7128841172df41e6512d624e99d9853d6
* | PlaylistFetcher: add lower bound check when starting live streamsRobert Shih2014-08-281-0/+3
|/ | | | | | | | Avoid false 'missed the boat' alarms that cause us to queue a bogus discontinuity before even starting. Bug: 17303166 Change-Id: I5003934fc695f30db2df9a0803b8fe960d77a458
* HTTPLiveSource: check for NULL before getTrackCount/InfoRobert Shih2014-08-181-2/+10
| | | | | | | | The effect is MediaPlayer returns a 0-length array when getTrackInfo is called before PREPARED state. Bug: 12029173 Change-Id: Ib3a48525eac07b04a2ff88ce199d66dcc61c1641
* httplive: timestamp reporting, track selectionRobert Shih2014-08-056-174/+519
| | | | | | | Bug: 15153976 Bug: 15763638 Bug: 16351654 Change-Id: I4462276d4b7342647286a0ca4be11692ce52ff6d
* 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
* HLS: do not discard packets when queuing explicit discontinuityChong Zhang2014-06-261-14/+12
| | | | | | | | | | | in case of explicit discontinuity (#EXT-X-DISCONTINUITY tag in the playlist), do not discard packets that's already queued. (when seeking, the old fetcher will be discarded so this won't affect seeking case.) Bug: 15020526 Change-Id: I5d3fc489df35e3bc44acb1ee7851571cb99cb56b
* HLS: only queue discontinuity for first blockChong Zhang2014-06-251-0/+3
| | | | | Bug: 15020526 Change-Id: I15f9ab0f38dc510e584c668eea73ece61844d413
* refactor getTrackInfo()Chong Zhang2014-06-134-35/+56
| | | | | | | | | | | | | (this is in preparation for supporting other cc source) - split into two methods: getTrackCount() and getTrackInfo() - move track info parcelling to NuPlayer - parcel in the mime type of the subtitle format Bug: 15470448 Change-Id: If00724d8c3a2b2319cb9c5f29d3fe76347bfe947
* 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