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 |
|
Thulinma
|
12d18bd7c5
|
RelAccX improvements
|
2018-03-20 14:15:55 +01:00 |
|
Erik Zandvliet
|
7ea42685a6
|
Edits to RelAccX library
|
2018-03-20 14:15:50 +01:00 |
|
Thulinma
|
68c87a44d0
|
ResizeablePointer const fix
|
2018-03-20 14:15:45 +01:00 |
|
Thulinma
|
f0dd11056d
|
Merge branch 'development' into LTS_development
|
2018-03-01 17:14:33 +01:00 |
|
Thulinma
|
93114d53f9
|
Fixed crash in log parser
|
2018-03-01 17:14:28 +01:00 |
|
Thulinma
|
564082f178
|
Fix bitfields header
|
2018-03-01 17:14:21 +01:00 |
|
Thulinma
|
d9b0270528
|
Added log test binary
|
2018-03-01 17:14:00 +01:00 |
|
Thulinma
|
dfb1f0ecf0
|
Fixed crash in log parser
|
2018-03-01 17:13:36 +01:00 |
|
Thulinma
|
abda56ced8
|
No longer print RTSP data to stderr on transport error
|
2018-03-01 16:37:43 +01:00 |
|
Thulinma
|
fc84b501b3
|
Fix bitfields header
|
2018-03-01 16:37:23 +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
|
2acfd6e4c5
|
Merge branch 'development' into LTS_development
|
2018-02-13 13:05:57 +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
|
08a21c09c0
|
Improved PES parser in TS::Stream to better handle high bit rate streams
|
2018-02-13 09:59:09 +01:00 |
|