Commit graph

652 commits

Author SHA1 Message Date
Thulinma
ebb9b3d8c4 Fix for HLS streams with "m3u" in the stream name 2018-05-09 12:24:02 +02:00
Thulinma
94bb2aa0f1 Fix potential segfault in doSync 2018-05-09 10:24:59 +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
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
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
75cefe9956 Added buffer and rate params to RTSP output 2018-03-22 10:41:52 +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
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