Commit graph

872 commits

Author SHA1 Message Date
Thulinma
67cba61ed7 Edited JSON codec format 2018-07-04 11:48:36 +02:00
Thulinma
9723159592 Improved selectDefaultTracks function to give feedback on selection changes. 2018-07-04 11:48:36 +02:00
Thulinma
9104d68a5d Updated generic HTTP output to support websockets. Added basic websocket JSON push support. 2018-07-04 11:48:36 +02:00
Thulinma
43934cf69c Added bootMsOffset to DTSC::Meta, RTMP now syncs on it. 2018-07-04 11:48:14 +02:00
Thulinma
bd0b820577 Added JSON output duplicate checking and persistent connections 2018-07-04 11:25:06 +02:00
Thulinma
6adfc2c970 Allow downloading of MP4 output as file through ?dl=1 and/or ?dl=filename.ext GET parameter 2018-07-04 11:24:29 +02:00
Thulinma
1451b64e00 Improved track selection logic for JSON output 2018-07-04 11:19:02 +02:00
Thulinma
ebdaf6e063 Merge branch 'development' into LTS_development
# Conflicts:
#	src/output/output.cpp
2018-06-12 11:25:59 +02:00
Thulinma
967bc5729c Improved input start behavior for live pushed streams 2018-06-12 11:24:35 +02:00
Erik Zandvliet
0f4a6c9367 Live mp4 working again 2018-05-24 15:13:07 +02:00
Thulinma
3b16f03674 Added HLS protocol option to disable session IDs, merging together all views from a single user into a single session. 2018-05-18 17:20:55 +02:00
Thulinma
3947fceeed Merge branch 'development' into LTS_development 2018-05-17 21:45:17 +02:00
Thulinma
7f1fca24d7 Added non-chunked options to DASH and HLS outputs 2018-05-17 21:45:14 +02:00
Thulinma
b6f0b596b2 Add support for boolean options to HTTP-based outputs 2018-05-17 21:44:41 +02:00
Thulinma
4a22be819d Fixed socket binding for TS UDP push output 2018-05-17 12:26:28 +02:00
Thulinma
a084005644 Merge branch 'development' into LTS_development
# Conflicts:
#	src/output/output_progressive_mp4.cpp
2018-05-16 11:10:55 +02:00
Thulinma
0c41fee7c8 Fixed ELST box in mp4, and use it to fix track desync issues. 2018-05-16 10:55:46 +02:00
Erik Zandvliet
e53b14365c Fixed ELST box in mp4, and use it to fix track desync issues. 2018-05-16 10:48:34 +02:00
Erik Zandvliet
0fff6f8773 Skip at least some corruption in TS 2018-05-16 10:48:12 +02:00
Thulinma
ecbb48dbfe Fixed http_internal responses for offline streams 2018-05-16 10:47:14 +02:00
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