Commit graph

2774 commits

Author SHA1 Message Date
Thulinma
1f5dfdc580 Converted argument style to new singular method. 2016-05-04 16:51:16 +02:00
Thulinma
5505b68bc2 Merge branch 'development' into LTS_development
# Conflicts:
#	lsp/minified.js
2016-05-04 16:49:57 +02:00
Thulinma
b91d817e33 LSP updates by Carina van der Meer. 2016-05-04 16:49:15 +02:00
Thulinma
911cb65740 Fixed host not always being set correctly, probably. 2016-05-03 17:18:34 +02:00
Thulinma
9e85f255ef Suppress untrusted proxy messages if not relevant. 2016-05-03 17:01:46 +02:00
Thulinma
df16c815c2 Semaphore fixes. 2016-05-03 16:34:19 +02:00
Thulinma
9498f87cc3 Fixed Prometheus socket getting disconnected after each request. 2016-05-03 15:12:40 +02:00
Thulinma
0d17a511ef Fixed fatality in MistInBuffer. 2016-05-03 13:34:45 +02:00
Thulinma
f4b296164e Fixed all semaphore instances not being cleaned up properly. 2016-05-03 12:13:58 +02:00
Thulinma
dda9ed54b4 Fix track re-negotiation when needed. 2016-05-03 12:13:51 +02:00
Thulinma
ae9e270821 Various and and sundry fixes to random buffer stuff and things. 2016-05-03 00:53:10 +02:00
Erik Zandvliet
12e04b45af Made the default page size a compile flag 2016-05-02 13:03:48 +02:00
Thulinma
f26ec4c6d8 Added track index add checking for live data pages. 2016-05-02 12:36:40 +02:00
Thulinma
aa2dd8491c Fixed a segfault in the buffer on track deletion, added a WARN-level message when/if something similar occurs. 2016-05-01 15:56:10 +02:00
Thulinma
4c1760f5f7 Fixed IPv6 fix for trusted proxies. 2016-04-29 15:44:30 +02:00
Thulinma
760ccaa00a Fixed resumeMode sometimes defaulting to true instead of false. 2016-04-29 13:24:05 +02:00
Thulinma
9e8b07cbfc Added STATS_DELAY compile flag for overriding the statistics delay for better or worse accuracy than the default. 2016-04-27 12:49:25 +02:00
Thulinma
36d8986f4b Added CPU and memory stats to instrumentation outputs. 2016-04-26 16:18:43 +02:00
Thulinma
dbe2b1f661 HLS now sends unique session IDs for splitting sessions from each other. 2016-04-22 16:17:28 +02:00
Thulinma
b6d879369f Added JSON instrumentation output. 2016-04-22 16:17:28 +02:00
Thulinma
dd46788d37 Support for text-based prometheus-compatible instrumentation. 2016-04-22 16:17:28 +02:00
Thulinma
fd123c8c1f Listening sockets now closed when forking child processes, preventing lock of ports when children aren't killed. 2016-04-22 09:30:32 +02:00
Thulinma
61b66e349e Added onCrash handler for inputs, buffer now does proper cleanup when crashing. 2016-04-22 09:30:32 +02:00
Thulinma
babbcf706a Add support for telling iOS devices apart by X-Playback-Session-Id and allow IPv6-mapped IPv4 addresses to be properly recognized by the trusted proxy setting. 2016-04-19 18:26:00 +02:00
Thulinma
08bab96a6a Fixed X-Real-IP header support. 2016-04-19 18:25:49 +02:00
Thulinma
de0d0cbcdb Merge branch 'development' into LTS_development 2016-04-18 18:23:19 +02:00
Thulinma
f8d5a1f923 Added shell API helper. 2016-04-18 18:15:58 +02:00
Thulinma
0a8b8e40d8 Merge branch 'development' into LTS_development 2016-04-15 13:47:42 +02:00
Thulinma
9239586a89 Added cpu_use response to capabilities API call 2016-04-15 13:47:35 +02:00
Thulinma
a3a40dbf17 Fix stats not disappearing 2016-04-14 16:32:17 +02:00
Thulinma
c548077282 Made fillActive calls (stats_streams and current_streams) only count users that have retrieved at least 128KiB of data, in order to filter out index and meta requests. 2016-04-14 12:39:20 +02:00
Thulinma
9896b5837e Pro side of encoding fixes. 2016-04-14 12:08:26 +02:00
Thulinma
d20c4f5ec5 Merge branch 'development' into LTS_development
# Conflicts:
#	src/output/output_hss.cpp
#	src/output/output_rtmp.cpp
2016-04-14 12:05:55 +02:00
Thulinma
66dc2dc0cb Encoding fixes:
- base64 library renamed to encode library
- Moved urlencode/urldecode functions from HTTP library to encode library
- Moved hex/unhex functions from HTTP library to encode library
- Added urldecode support to RTMP urls, fixing XSplit wildcard stream support
2016-04-14 12:03:40 +02:00
Thulinma
87e2c774fd Added RTMP unescaping code to fix Xsplit support for wildcard streams. 2016-04-13 16:16:56 +02:00
Thulinma
230772f125 fillActive now 15 seconds delayed as opposed to 2 seconds delayed, for more accurate viewer counts. 2016-04-13 15:20:23 +02:00
Erik Zandvliet
4c2eeb96c8 Fix for handling negative h264 offsets in mp4 2016-04-12 15:07:35 +02:00
Erik Zandvliet
3b9911df71 MP4 header read optimise by Erik
This reverts commit b244618737.
2016-04-12 15:07:17 +02:00
Erik Zandvliet
90419e15eb Get width and height from sps when incorrect in mp4 file 2016-04-08 11:06:51 +02:00
Erik Zandvliet
939924439d Nasty hack for fixing H264 init data on FLV 2016-04-08 10:03:38 +02:00
Erik Zandvliet
b244618737 Revert "MP4 header read optimise by Erik"
This reverts commit b79fb8cd6b.
2016-04-08 10:03:19 +02:00
Balder
b8054a5200 Added header to enforce newest compatability for IE browsers. They misbehave on intranet addressess otherwise 2016-04-06 10:11:12 +02:00
Thulinma
cbaf4107f9 Silly mistake is silly. 2016-04-05 10:05:11 +02:00
Thulinma
f7b3ecee8c Merge branch 'development' into LTS_development 2016-03-05 00:21:42 +01:00
Balder
15603bc053 Changed Embed to enable MP4 again in FF as they've added H264 support for Windows beyond XP. XP seems to correctly see it can't play MP4. 2016-03-05 00:21:10 +01:00
Balder
211481f8ab Changed Embed to enable MP4 again in FF as they've added H264 support for Windows beyond XP. XP seems to correctly see it can't play MP4. 2016-02-29 13:44:58 +01:00
Thulinma
2029b35361 Tweaked fillActive to have both now and historic modes
Made streams no longer show as active for ~10m after being active.
2016-02-29 13:25:19 +01:00
Thulinma
56232c1fba Fix typo in recording
Add $stream variable to filename
Changed $seconds variable to $second
2016-02-29 13:23:09 +01:00
Thulinma
99b5b8361d Merge branch 'development' into LTS_development 2016-02-29 13:20:52 +01:00
Thulinma
77a6315dfb Wipe sessions when they expire. 2016-02-29 13:16:58 +01:00