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

4638 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thulinma
f934d15a78 Removed automatic wildcard addition for DTSC input URLs 2018-05-09 09:41:26 +02:00
Thulinma
a3b5555568 Merge branch 'development' into LTS_development 2018-05-08 11:35:47 +02:00
Thulinma
2e65c1e431 Added HTTP::URL::getFilePath() 2018-05-08 11:35:39 +02:00
Thulinma
7b9a731525 Fixed missing return statements in HLS input 2018-05-08 11:32:59 +02:00
Thulinma
a3de760df5 Merge branch 'development' into LTS_development 2018-05-08 11:29:56 +02:00
Thulinma
c370930c70 Fixed missing return statements to prevent GCC being whiny. 2018-05-08 11:29:48 +02:00
Thulinma
54e26f3ef4 Fixed HEVC codec display in HLS output 2018-04-30 17:06:38 +02:00
Thulinma
9d93d78b8b Add codec/resolution/framerate information to HLS index 
# Conflicts:
#	src/output/output_hls.cpp
#	src/output/output_hls.h
 2018-04-23 11:07:26 +02:00
Thulinma
807324f133 Merge branch 'development' into LTS_development 
# Conflicts:
#	src/output/output_hls.cpp
#	src/output/output_hls.h
 2018-04-23 11:04:49 +02:00
Thulinma
06bda0240c Add codec/resolution/framerate information to HLS index 2018-04-23 10:56:40 +02:00
Thulinma
bf89c6a3c1 Implemented ?stream=STREAMNAME in load balancer 2018-04-19 11:08:05 +02:00
Thulinma
05fee379ad Merge branch 'development' into LTS_development 2018-04-12 15:33:27 +02:00
Thulinma
662f1cfa9d Added -DNOGA=1 flag to disable Google Analytics 2018-04-12 15:31:32 +02:00
Cat
712fec11d5 remove google analytics tracking from LSP - to be added by MistController 2018-04-12 15:05:58 +02:00
Thulinma
59bb7cfaa4 Merge branch 'development' into LTS_development 2018-04-05 21:16:27 +02:00
Thulinma
5b0e2886ac Fixed compiling in Windows/Cygwin 2018-04-05 21:16:21 +02:00
Thulinma
d46eaf22e5 Added support for HTTP parameters in HTTPS protocol 2018-04-04 16:32:25 +02:00
Thulinma
da5e15621e Merge branch 'development' into LTS_development 
# Conflicts:
#	src/output/output_http_internal.cpp
 2018-04-04 16:31:36 +02:00
Thulinma
e39599894f support for protocol detection in player.js internal default URL 2018-04-04 16:05:27 +02:00
Thulinma
19b677f795 Merge branch 'development' into LTS_development 
# Conflicts:
#	src/output/output_ebml.cpp
#	src/output/output_hls.cpp
#	src/output/output_progressive_mp4.cpp
 2018-03-27 16:01:29 +02:00
Thulinma
3f341297a5 Changed EBML and MP4 priorities 2018-03-27 15:58:56 +02:00
Thulinma
266ab3a654 Implemented browser detection and handling of output-specific browser exceptions. 2018-03-27 15:58:51 +02:00
Thulinma
3c67277d81 Changed EBML and MP4 priorities 2018-03-27 15:57:55 +02:00
Thulinma
f65c759292 Implemented browser detection and handling of output-specific browser exceptions. 2018-03-27 15:57:08 +02:00
Thulinma
dc12c1ea78 EBML fix for ARMv7 2018-03-27 15:53:44 +02:00
Thulinma
4b2e2aa889 Merge branch 'development' into LTS_development 2018-03-22 12:37:22 +01:00
Thulinma
f48933a50d JSON lib support for double values 2018-03-22 12:36:52 +01:00
Thulinma
3e303e0320 Geo IP based load balancing (requires external coords) 2018-03-22 12:35:59 +01:00
Thulinma
75cefe9956 Added buffer and rate params to RTSP output 2018-03-22 10:41:52 +01:00
Thulinma
62ae2929a3 Merge branch 'newStatus' into Pro_newStatus 
# Conflicts:
#	src/controller/controller_api.cpp
#	src/controller/controller_statistics.cpp
#	src/controller/controller_statistics.h
#	src/controller/controller_streams.cpp
 2018-03-21 14:50:04 +01:00
Thulinma
e4ac68db54 Improved statistics and stream status 2018-03-21 14:46:22 +01:00
Thulinma
da91838a1f Merge branch 'development' into LTS_development 2018-03-21 14:39:30 +01:00
Thulinma
c475eb8d8c Default PRIu32 when missing. Ugly, but meh. 2018-03-21 14:39:21 +01:00
Thulinma
355d55decc Merge branch 'development' into LTS_development 
# Conflicts:
#	src/controller/controller_api.cpp
#	src/controller/controller_api.h
#	src/controller/controller_statistics.cpp
#	src/controller/controller_statistics.h
 2018-03-20 20:15:10 +01:00
Thulinma
6e0e66076d WebSocket API in controller 2018-03-20 20:07:11 +01:00
Thulinma
0dd602d5ca WebSocket API in controller 2018-03-20 20:06:37 +01:00
Thulinma
062d299c44 Merge branch 'development' into LTS_development 2018-03-20 16:34:29 +01:00
Thulinma
5ffd51e958 Fixed stream connect during shutdown 2018-03-20 16:34:23 +01:00
Thulinma
1b15fbff2b Added HTTP info.js websocket mode 
# Conflicts:
#	src/output/output_http_internal.cpp
 2018-03-20 15:16:24 +01:00
Thulinma
e06b14ce77 Merge branch 'development' into LTS_development 
# Conflicts:
#	src/output/output_http.cpp
#	src/output/output_http_internal.cpp
 2018-03-20 15:11:19 +01:00
Thulinma
b0bf1d14ec Added HTTP info.js websocket mode 2018-03-20 15:06:37 +01:00
Thulinma
798f099638 JSON output websocket support 2018-03-20 14:58:58 +01:00
Thulinma
dd976f7a7a Added basic websocket support 2018-03-20 14:58:52 +01:00
Thulinma
2443fcff92 Added new API JSON-based auth scheme 
# Conflicts:
#	src/controller/controller_api.cpp
 2018-03-20 14:58:06 +01:00
Thulinma
d3d93eb4da Merge branch 'development' into LTS_development 
# Conflicts:
#	src/controller/controller_api.cpp
 2018-03-20 14:56:49 +01:00
Thulinma
f126b17ed1 Added new API JSON-based auth scheme 2018-03-20 14:54:51 +01:00
Thulinma
ee55646141 Added Output::disconnect() call 2018-03-20 14:30:51 +01:00
Thulinma
0385daabe8 Merge branch 'development' into LTS_development 2018-03-20 14:30:42 +01:00
Thulinma
74baf8d4a4 Added Output::disconnect() call 2018-03-20 14:22:04 +01:00
Thulinma
bea8678df9 Added sharedPage::exists() call 2018-03-20 14:16:18 +01:00