hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2849 commits 3 branches 0 tags 29 MiB
Commit graph

2849 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Thulinma
72c4f9771a Merge branch 'development' into LTS_development 2016-02-29 13:05:46 +01:00
Thulinma
203d7b7a67 Fixed long long value in timing library to actually be long long. 2016-02-29 11:51:23 +01:00
Balder
7710a7d8a7 BalderDash fixes (H264 mp4 codecs weirdness//FF) 2016-02-29 11:35:17 +01:00
Balder
b79fb8cd6b MP4 header read optimise by Erik 2016-02-26 10:23:45 +01:00
Thulinma
f6e2e95b5a Added USER_NEW trigger. 2016-02-19 11:33:40 +01:00
Thulinma
4db2ea97ed HLS now won't remove fragments if <= 3 available 2016-02-19 11:32:41 +01:00
Thulinma
bbf0417b36 Disable resume support for live buffers by default. 2016-02-19 11:32:41 +01:00
Thulinma
a6ef31d1ea Changed buffer full/empty behaviour to trigger at 3 segments instead of 50% of buffer size. 2016-02-19 11:32:41 +01:00
Thulinma
b6f03a4591 Undo undone stuff. Bad Erik! 2016-02-18 13:33:34 +01:00
Thulinma
6de5aa7d5e Added LTS binary aes_ctr128 to .gitignore 2016-02-16 19:58:12 +01:00
Thulinma
4a413f11d4 Merge branch 'development' into LTS_development 2016-02-16 09:18:28 +01:00
Thulinma
463e549b4d Fixed naming bug when adding new streams 2016-02-16 09:18:02 +01:00
Thulinma
9d2d8646ca Added Ninja files to .gitignore 2016-02-16 09:15:24 +01:00
Thulinma
0d9108d1d6 Backported Pro shared_memory edits to OS edition 2016-02-15 14:42:19 +01:00
Thulinma
795db7d862 Made resume support disabled the new default. 2016-02-12 16:37:32 +01:00
Thulinma
bee6ba11e6 Fixed RTSP. 2016-02-12 16:33:01 +01:00
Thulinma
62f3a9f4d2 Fixed high CPU usage of TS input during shutdown. 2016-02-12 16:30:34 +01:00
Erik Zandvliet
c25a533729 Recording, HLS Push, UDP (Multicast) Input, Threaded TS 2016-02-12 16:30:33 +01:00
ozzay
1c3e143709 Recording functionality by Diederick Huijbers, slightly tweaked. 2016-02-12 16:29:08 +01:00
Erik Zandvliet
c0b5f0d4b1 X-Real-IP support 2016-02-12 16:29:08 +01:00
Thulinma
53febd82d1 Merge branch 'development' into LTS_development 
# Conflicts:
#	src/input/input_buffer.cpp
 2016-02-12 16:18:54 +01:00
Thulinma
243595ff4d UDP socket edits by Erik Zandvliet 2016-02-12 16:16:49 +01:00
Thulinma
d56e7f1408 Added a proxy in Output for getting the host (by Erik Zandvliet) 2016-02-12 15:51:54 +01:00
Thulinma
2d78e1e5f1 Improved MistInBuffer CPU usage by 50%. 2016-02-12 15:46:23 +01:00
Thulinma
7c759c7664 Optimized getWritableIdentifier to improve the speed of MistInBuffer even further. 2016-02-12 15:39:01 +01:00