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

62 commits

Author SHA1 Message Date
Thulinma
bef46f969c Merge branch 'development' into LTS_development 
# Conflicts:
#	lib/stream.cpp
#	lib/stream.h
#	src/input/input.cpp
#	src/output/output_http_internal.cpp
 2017-06-09 20:34:57 +02:00
Thulinma
26f74accdf MistInBuffer no longer boots if the process starting it has no data to fill it with. Optimized and simplified HTTP internal output. 2017-06-09 20:31:20 +02:00
Thulinma
c0dd64bc7b Merge branch 'development' into LTS_development 2017-05-11 14:14:44 +02:00
Cat
8143d6af05 Embed: dynamically load player js only if required 2017-05-11 14:14:31 +02:00
Thulinma
29cc6c15f8 Merge branch 'development' into LTS_development 
# Conflicts:
#	src/output/output_http_internal.cpp
 2017-04-06 10:29:48 +02:00
Cat
7b1652498b when public address is configured in the http protocol, thats where player.js should be loaded from 2017-04-06 10:08:52 +02:00
Thulinma
746d982d28 bufferLivePacket improvements for generic Outputs 2017-03-16 17:15:50 +01:00
Thulinma
eef9303e61 bufferLivePacket improvements for generic Outputs 2017-03-16 17:12:54 +01:00
Thulinma
5000afe768 Added --public-address option to HTTP output, for address overwriting 2017-03-10 11:39:31 +01:00
Thulinma
25ddaa3595 Merge branch 'development' into LTS_development 2017-03-06 11:53:52 +01:00
Cat
aa3527dcb0 Embed: custom streaminfo 2017-03-06 11:51:32 +01:00
Cat
b0326ccd1e LSP: thumbnailing; currently disabled 2017-03-06 11:46:44 +01:00
Thulinma
dadb1ebde8 Merge branch 'development' into LTS_development 
# Conflicts:
#	src/output/output.cpp
#	src/output/output_http_internal.cpp
 2017-01-10 12:36:53 +01:00
Thulinma
fd5b9805de Fixed favicon.ico 2017-01-10 12:34:43 +01:00
Thulinma
aebeeabd2b Merge branch 'development' into LTS_development 
# Conflicts:
#	src/output/output_httpts.cpp
#	src/output/output_ts_base.h
 2016-12-28 16:32:16 +01:00
Cat
1c0fd833bb Embed: VideoJS player added 2016-12-28 16:25:22 +01:00
Thulinma
7c37620294 Merge branch 'development' into LTS_development 2016-11-16 16:33:01 +01:00
Thulinma
bcff43dc80 Changed HTTP internals to use more generic URL building 2016-11-16 16:32:56 +01:00
Thulinma
08813dcd9b Merge branch 'development' into LTS_development 2016-09-22 16:42:04 +02:00
cat
d4be01474d Meta player, new embed code, new LSP style 2016-09-22 16:40:13 +02:00
Thulinma
cf75a2d6a2 Merge branch 'development' into LTS_development 2016-07-25 13:24:47 +02:00
Thulinma
bfa9882e8c Added ISO639-2 decoding in JSON-formatted metadata output 2016-07-25 13:24:36 +02:00
Thulinma
6694fedb3c Merge branch 'development' into LTS_development 2016-07-21 10:15:34 +02:00
Thulinma
33a0b2fae3 Added URL encode for info_/embed_ stream URLs 2016-07-21 10:15:26 +02:00
Thulinma
e0cc16cd86 Merge branch 'development' into LTS_development 2016-07-19 12:05:12 +02:00
Thulinma
d5fee4d656 Even more JSON/VTT/SRT fixes and internal URL handler improvements 2016-07-19 12:05:05 +02:00
Thulinma
ea18815676 Fixed slow embed code (internal HTTP output) problem 2016-06-10 14:22:29 +02:00
Thulinma
54b9079ab1 Fixed slow embed code (internal HTTP output) problem 2016-06-09 15:17:40 +02:00
Thulinma
e7962fce26 Fixed IPv6 addresses in hostnames in info_ json_ and embed_ URLs as well as .smil URLs. 2016-06-03 11:00:38 +02:00
Thulinma
0b2355c5bb Fixed IPv6 addresses in hostnames in info_ json_ and embed_ URLs as well as .smil URLs. 2016-06-02 14:07:21 +02:00
Thulinma
4c9c6fa7ba Backported various little edits from Pro edition. 2016-06-02 14:07:21 +02:00
Erik Zandvliet
5c4e0d8c54 More reasonable size for metadata 2016-05-19 17:32:47 +02:00
Thulinma
fa41e02047 Removed 5s timeout from streamAlive call. 2016-05-05 16:05:12 +02:00
Thulinma
f4b296164e Fixed all semaphore instances not being cleaned up properly. 2016-05-03 12:13:58 +02:00
Thulinma
53febd82d1 Merge branch 'development' into LTS_development 
# Conflicts:
#	src/input/input_buffer.cpp
 2016-02-12 16:18:54 +01:00
Thulinma
d56e7f1408 Added a proxy in Output for getting the host (by Erik Zandvliet) 2016-02-12 15:51:54 +01:00
Erik Zandvliet
1866e4e1e1 Updated CORS headers and the (HTTP) output protocols to work with it. 2016-01-26 14:34:14 +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
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
Thulinma
d8051984f2 Merge branch 'development' into LTS_development 2015-09-03 17:55:47 +02:00
Thulinma
096b289cdf Updated --version argument to give more detailed output. 2015-09-03 17:54:20 +02:00
Thulinma
569ef07f29 Merge branch 'development' into LTS_development 
# Conflicts:
#	lib/stream.cpp
#	src/output/output_http_internal.cpp
 2015-07-21 23:51:46 +02:00
Thulinma
fce83c903b Make internal HTTP output correctly serve embed codes for newer stream types. 2015-07-21 23:07:41 +02:00
Thulinma
e0c9173f9a Merge branch 'development' into LTS_development 2015-05-12 11:23:08 +02:00
Thulinma
a3bf393bea Added generic CORS header adder, now used in controller, HLS output and internal HTTP handler. 2015-05-12 11:23:00 +02:00
Thulinma
ac540cdd1d LTS feature: Added support for setting/overriding the error text for failed streams. 2015-04-17 02:01:27 +02:00