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

1583 commits

Author SHA1 Message Date
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
Thulinma
f6e2e95b5a Added USER_NEW trigger. 2016-02-19 11:33:40 +01:00
Thulinma
0d9108d1d6 Backported Pro shared_memory edits to OS edition 2016-02-15 14:42:19 +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
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
7c759c7664 Optimized getWritableIdentifier to improve the speed of MistInBuffer even further. 2016-02-12 15:39:01 +01:00
Thulinma
fa6dd9ee56 Merge branch 'development' into LTS_development 
# Conflicts:
#	lib/dtsc.cpp
#	lib/dtsc.h
 2016-01-28 11:31:00 +01:00
Thulinma
9631b79e86 Removed DTSC::Stream and DTSC::Ring classes - no longer in use anywhere. 2016-01-28 11:27:26 +01:00
Erik Zandvliet
3f93ca5f82 Merge branch 'development' into LTS_development 
# Conflicts:
#	src/output/output_progressive_mp4.cpp
 2016-01-26 14:33:23 +01:00
Erik Zandvliet
a39350f83e CORS Headers 2016-01-26 14:31:09 +01:00
Erik Zandvliet
90a53ddf70 Merge branch 'development' into LTS_development 
# Conflicts:
#	src/output/output_hds.cpp
 2016-01-26 14:15:17 +01:00
Erik Zandvliet
3c48a6c03c Embedding of flash players 2016-01-26 14:14:12 +01:00
Thulinma
8eb518606a Merge branch 'development' into LTS_development 
# Conflicts:
#	src/input/input_buffer.cpp
 2015-12-25 15:44:23 +01:00
Thulinma
401fe65979 - Made HLS no longer skip first fragment. 
- Ignore metadata tracks and invalid tracks for buffer calculations.
- Fixed statistics.
 2015-12-25 14:37:32 +01:00
Thulinma
3d1784a096 Merge branch 'development' into LTS_development 2015-11-28 16:06:33 +01:00
Thulinma
23800d6cbb Fixed shared memory issues under Windows, by Erik Zandvliet. 2015-11-28 16:06:26 +01:00
Thulinma
f90f261116 Merge branch 'development' into LTS_development 2015-11-25 21:48:37 +01:00
Thulinma
5ae0cb42a9 UDP binds can now bind to a specific interface, fixed IPv4 support for UDP sockets on IPv6-capable machines. 2015-11-24 22:46:37 +01:00
Thulinma
be3a852fb0 Made UDP socket binding more robust. 2015-11-24 16:57:23 +01:00
Thulinma
8e94528d6f Improved signal and UDP bind debugging information, decreased verbosity of windows SHM errors. 2015-11-24 15:57:17 +01:00
Thulinma
35b2dd6bee Better working TS input, Pro side. Code by Erik Zandvliet. 2015-11-05 17:11:04 +01:00
Thulinma
8bcda5e57b Merge branch 'development' into LTS_development 
# Conflicts:
#	lib/bitstream.h
#	lib/h264.cpp
#	lib/h264.h
#	lib/nal.cpp
#	lib/nal.h
 2015-11-05 17:07:17 +01:00
Thulinma
b28a619fc6 Various fixes and improvements, backported from Pro version. Code by Erik Zandvliet. 2015-11-05 17:05:21 +01:00
Thulinma
8678a845f3 Merge branch 'development' into LTS_development 2015-11-02 17:14:44 +01:00
Thulinma
5cce37c521 Fixed RTMP extended timestamp read 2015-11-02 17:14:38 +01:00
Thulinma
4889abb64e Merge branch 'development' into LTS_development 2015-11-02 15:53:01 +01:00
Thulinma
3a07633de5 Improved Socker::Buffer deletion handling. 2015-11-02 15:52:48 +01:00
Thulinma
59a4329266 Merge branch 'development' into LTS_development 2015-10-20 14:12:17 +02:00
Thulinma
500cdf6e71 Improved BPS calculation for live streams. 2015-10-20 14:12:11 +02:00
Thulinma
596689c9ee Merge branch 'development' into LTS_development 2015-10-15 10:28:33 +02:00
Erik Zandvliet
c417630abe Same fix, but for non-const iterator 2015-10-15 10:28:24 +02:00
Thulinma
101de0b81c Merge branch 'development' into LTS_development 2015-10-14 16:53:20 +02:00
Thulinma
9737d9fbdf Added missing return value for JSON class. 2015-10-14 16:53:13 +02:00
Thulinma
de1d202457 Made RTSP max send value runtime configurable. 2015-10-14 14:30:28 +02:00
Thulinma
279add438a Implemented triggers. 
Merged from code by Wouter Spruit, with additions by yours truly.
 2015-10-14 10:48:00 +02:00
Thulinma
b53cc64208 Merge branch 'development' into LTS_development 2015-10-09 15:01:50 +02:00
Thulinma
1eb5725751 Fixes to JSON library. 2015-10-09 15:00:03 +02:00
Thulinma
c20b8f2081 Fixed newlines in debug messages. Also, backported various Pro edition fixes that belonged in OS edition. 2015-10-08 13:54:54 +02:00
Thulinma
74c8932106 Merge branch 'development' into json_mod_LTS 
# Conflicts:
#	lib/shared_memory.cpp
#	src/controller/controller.cpp
#	src/io.cpp
#	src/output/output.cpp
#	src/output/output_http_internal.cpp
 2015-10-07 11:05:49 +02:00
Thulinma
16d38459b6 Made JSON library non-recursive. 
Co-authored with Diederick.
 2015-10-06 13:21:14 +02:00
Erik Zandvliet
b493976f90 MP4 HEVC fix 2015-10-05 17:08:18 +02:00
Thulinma
af9acdd9e2 Merge branch 'development' into LTS_development 
# Conflicts:
#	lsp/minified.js
#	lsp/mist.js
 2015-10-01 13:58:31 +02:00
Thulinma
1e9ee73bfe Added Util::stringToBool utility function. 2015-10-01 13:49:35 +02:00
Thulinma
ce124cb58d Merge branch 'development' into LTS_development 2015-09-30 20:00:20 +02:00
Thulinma
d7fb7dd779 Fixed boolean support in JSON library. 2015-09-30 19:59:44 +02:00
Thulinma
3b92a56707 Merge branch 'development' into LTS_development 2015-09-29 14:41:26 +02:00