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

788 commits

Author SHA1 Message Date
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
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
2dbdd855cd Changed HLS playlist content type 2018-02-14 09:09:54 +01:00
Thulinma
2f17e82c08 Added EBML recording 2018-01-24 20:18:52 +01:00
Thulinma
26cd8251e2 Merge branch 'development' into LTS_development 
# Conflicts:
#	CMakeLists.txt
 2018-01-24 20:16:35 +01:00
Thulinma
a762932c45 EBML library, input and output, supports MKV and WebM. 2018-01-24 20:10:55 +01:00
Thulinma
27afc466e6 Merge branch 'development' into LTS_development 
# Conflicts:
#	src/output/output_http.cpp
#	src/output/output_progressive_mp4.cpp
#	src/output/output_progressive_mp4.h
 2018-01-24 19:50:43 +01:00
Thulinma
105b1677d1 Generalized byte range request parsing 2018-01-24 19:21:23 +01:00
Thulinma
e6a5dac974 Added support for FLOAT to WAV output 2018-01-24 19:13:01 +01:00
Thulinma
ad29c297c2 Merge branch 'development' into LTS_development 
# Conflicts:
#	lib/bitfields.h
#	src/input/input.cpp
#	src/output/output.cpp
 2018-01-24 19:12:05 +01:00
Thulinma
363df9aacf Moved getMainSelectedTrack to InOutBase class 2018-01-24 18:59:29 +01:00
Thulinma
1d70ab288a Merge branch 'development' into LTS_development 2018-01-02 13:24:37 +01:00
Thulinma
dca157228e Fixed RTMP implementation to match 2012 spec update and not 2009 original spec 2018-01-02 13:24:31 +01:00
Thulinma
a1ea79af0c Fixed behaviour when stream cannot be loaded for JSON/JS and HTML page outputs 
# Conflicts:
#	src/output/output_http_internal.cpp
 2018-01-02 12:07:26 +01:00
Thulinma
6594f9bc94 Merge branch 'development' into LTS_development 
# Conflicts:
#	src/output/output_http_internal.cpp
 2018-01-02 12:06:35 +01:00
Thulinma
ec2dda0bff Fixed behaviour when stream cannot be loaded for JSON/JS and HTML page outputs, backported a few Pro improvements to OS edition 2018-01-02 12:05:01 +01:00
Thulinma
7540bfa27f Changed several onFinish'es into onFail, where appropriate 2017-12-13 11:06:50 +01:00
Thulinma
f4f644ee34 Merge branch 'development' into LTS_development 
# Conflicts:
#	src/output/output_hls.cpp
 2017-12-11 13:14:44 +01:00
Thulinma
b3cdf34fbc Respond more correctly to failed HLS requests 2017-12-11 13:13:38 +01:00
Thulinma
c9bb214ab9 Merge branch 'development' into LTS_development 2017-12-11 11:49:31 +01:00
Thulinma
90ce2e0b4c No longer disconnect on deleteStream 2017-12-10 01:25:00 +01:00
Thulinma
304426c2c6 Improved logging system 2017-12-08 19:48:49 +01:00
Thulinma
08dac5b2db Improved logging system 2017-12-06 16:59:27 +01:00
Thulinma
71477f05d3 Fixed HLS non-subtitle output 2017-11-30 14:10:58 +01:00
Thulinma
8e74d4cd4b Fixed typoes Balder spotted. Wut? But how?! 2017-11-28 11:26:19 +01:00
Thulinma
15801aa7b7 Track mapping and deletion fixes 2017-11-28 11:08:30 +01:00
Thulinma
2dd62e0dce Track mapping and deletion fixes 2017-11-28 10:54:52 +01:00
Thulinma
13c224e698 Default file handler message to VERYHIGH level 2017-11-27 10:15:59 +01:00
Thulinma
5ebbdf3f3b Changed SSL handshake error to level MEDIUM instead of FAIL 2017-11-23 14:15:14 +01:00
Thulinma
307d14f901 Added more ISO639 support (2-letter codes and conversions), improved audio/video/subtitle selection through HTTP connectors 2017-11-23 14:15:04 +01:00
Ramoe
e09cd5308e Added SRT input, MP4 output subtitle support, DASH and HLS output subtitle support 2017-11-23 14:14:58 +01:00
Ramoe
b9e261e1ef Reworked existing subtitle support (sideloaded, MP4 in and srt out) 2017-11-23 14:14:52 +01:00
Thulinma
310e7bc5f9 Merge branch 'development' into LTS_development 
# Conflicts:
#	src/output/output.cpp
 2017-11-23 14:08:32 +01:00
Thulinma
ae8760ee08 Changed default track selection ordering for VoD files back to previous ordering, live is still reversed. 2017-11-23 14:07:46 +01:00
Thulinma
186281c383 Set max RTMP chunk size to 64k 2017-11-11 22:23:52 +01:00
Thulinma
1eedda4a4e Fixed double question mark in RTMP URL bullshit 2017-11-11 22:21:29 +01:00
Thulinma
bfe95d0bb3 Set max RTMP chunk size to 64k for Youtube compatibility 2017-11-11 22:21:23 +01:00
Thulinma
3ea3721f59 Fix Facebook resume support 2017-11-11 22:21:17 +01:00
Thulinma
029e978887 LTS: Improved debug message levels for MP4 output 2017-11-07 14:31:39 +01:00
Thulinma
e58a24c239 Merge branch 'development' into LTS_development 
# Conflicts:
#	src/output/output_progressive_mp4.cpp
 2017-11-07 14:30:19 +01:00
Thulinma
ef8d305f37 Improved debug message levels for MP4 output 2017-11-07 14:28:26 +01:00
Thulinma
c4d036490f Fixed same-connection HTTP requests after any end of track is reached 2017-11-07 14:25:09 +01:00
Thulinma
8e6af4c591 Fixed repushing issues 2017-11-07 11:12:12 +01:00
Thulinma
a634f4a738 Fixed 32-bit compiling of MP4 output 2017-11-02 11:04:29 +01:00
Thulinma
014eed32e8 Fixed recstart/recstop values in the past 2017-10-26 12:50:59 +02:00