Thulinma
|
6e0e66076d
|
WebSocket API in controller
|
2018-03-20 20:07:11 +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
|
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
|
abda56ced8
|
No longer print RTSP data to stderr on transport error
|
2018-03-01 16:37:43 +01:00 |
|
Thulinma
|
2dbdd855cd
|
Changed HLS playlist content type
|
2018-02-14 09:09:54 +01:00 |
|
Thulinma
|
a51f0d1039
|
Buffer fixup
|
2018-02-13 16:06:18 +01:00 |
|
Thulinma
|
def6c2266e
|
Even more TS input tweaks
|
2018-02-13 16:03:58 +01:00 |
|
Thulinma
|
87fb2fc5b9
|
Improved input descriptions
|
2018-02-13 13:05:35 +01:00 |
|
Thulinma
|
017c9dbb65
|
Improved input descriptions
|
2018-02-13 12:59:09 +01:00 |
|
Thulinma
|
f6bba2f729
|
Changed default response for Input::isAlwaysOn for non-devel builds from true to false.
|
2018-02-12 10:57:27 +01:00 |
|
Thulinma
|
3e6b7fc9e8
|
Fixed TS input not shutting down correctly, fixed issue when track is not properly filled
|
2018-02-08 13:08:54 +01:00 |
|
Thulinma
|
106967515a
|
Cleaner TS input shutdown
|
2018-02-07 10:56:06 +01:00 |
|
Thulinma
|
1467fda3ec
|
Merge branch 'development' into LTS_development
|
2018-01-30 16:05:58 +01:00 |
|
Thulinma
|
fd60a6b8d3
|
Fix Windows builds
|
2018-01-30 16:05:50 +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
|
7c1a6fe7ce
|
Added default implementation of Input::trackSelect
|
2018-01-24 18:57:30 +01:00 |
|
Thulinma
|
8c3b8d9666
|
Added timeout support to analysers in validate mode
|
2018-01-17 11:28:04 +01:00 |
|
Thulinma
|
0c6cd9bfc6
|
Added crappy "HiIpcam" IP cam support
|
2018-01-16 11:18:59 +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
|
7dd7cc6fe1
|
Merge branch 'development' into LTS_development
|
2017-12-13 11:00:08 +01:00 |
|
Thulinma
|
fb88d214fb
|
Changed "No tracks found" input class message to INFO level from WARN level
|
2017-12-13 10:59:52 +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
|
ca19feed7f
|
Merge branch 'development' into LTS_development
# Conflicts:
# src/controller/controller_storage.cpp
|
2017-12-08 19:54:44 +01:00 |
|
Thulinma
|
26d039f278
|
Controller now disables colors when stdout is no terminal, additionally disables interactive setup when stdin is no terminal.
|
2017-12-08 19:48:49 +01:00 |
|
Thulinma
|
304426c2c6
|
Improved logging system
|
2017-12-08 19:48:49 +01:00 |
|
Thulinma
|
8c3178339b
|
Controller now disables colors when stdout is no terminal, additionally disables interactive setup when stdin is no terminal.
|
2017-12-06 16:59:27 +01:00 |
|
Thulinma
|
626e688bf2
|
Removed newline from access log message
|
2017-12-06 16:59:27 +01:00 |
|