Thulinma
|
d42bf9777e
|
Merge branch 'development' into LTS_development
# Conflicts:
# CMakeLists.txt
# src/input/input_buffer.cpp
|
2017-07-22 18:55:12 +02:00 |
|
Thulinma
|
45e4cddec9
|
Updated Input class with preRun() and checkArguments() instead of single setup() function
|
2017-07-22 18:53:05 +02:00 |
|
Thulinma
|
169830bd15
|
Added SO_KEEPALIVE to all socket connections by default.
|
2017-07-22 18:51:29 +02:00 |
|
Thulinma
|
f9a0ec5b78
|
Fixed overflow problems when reading corrupt AVCC box
|
2017-07-22 18:51:24 +02:00 |
|
Thulinma
|
0eefe5a477
|
Added raw data payload printing in hex to DTSC analyser
|
2017-07-22 18:51:18 +02:00 |
|
Thulinma
|
74acdedeb2
|
Added HTTP::Downloader class
|
2017-07-22 18:51:11 +02:00 |
|
Thulinma
|
72a6816ec1
|
Added DTSC stdin input
|
2017-07-22 18:50:16 +02:00 |
|
Thulinma
|
a0d54e1a95
|
Added H264 Annex B stream input
|
2017-07-22 18:49:57 +02:00 |
|
Thulinma
|
efcb038a26
|
Made Util::Procs::childRunning a public function
|
2017-07-22 18:48:55 +02:00 |
|
Erik Zandvliet
|
a2b83e0cd3
|
Merge branch 'development' into LTS_development
|
2017-07-19 17:43:27 +02:00 |
|
Erik Zandvliet
|
c21260dfb3
|
Fix compile under cygwin/windows
|
2017-07-19 17:30:52 +02:00 |
|
Erik Zandvliet
|
f5293ea29f
|
MP4 rework
|
2017-07-19 17:30:10 +02:00 |
|
Thulinma
|
406ae57172
|
Merge branch 'development' into LTS_development
|
2017-07-19 12:59:42 +02:00 |
|
Cat
|
266248a67e
|
correctly display license user name
|
2017-07-19 12:59:36 +02:00 |
|
Thulinma
|
c6a9c2a1a5
|
Merge branch 'development' into LTS_development
|
2017-07-19 10:04:53 +02:00 |
|
Cat
|
cbbb10e217
|
handle extra slash after host
|
2017-07-19 10:04:45 +02:00 |
|
Thulinma
|
f7b4f786e8
|
Merge branch 'development' into LTS_development
|
2017-07-15 17:43:42 +02:00 |
|
Cat
|
ff7d784449
|
various fixes to both LSP and Embed
Embed:
- pass urlappend to streaminfo request
- updated videojs from 5.18 to 6.2
LSP:
- mail for help should use https now
|
2017-07-15 17:43:35 +02:00 |
|
Cat
|
6d34de94f5
|
LSP: bugfix for saving on the overview page
|
2017-07-15 17:43:30 +02:00 |
|
Cat
|
b2f5676ca7
|
LSP: bugfix adding triggers when no triggers set
|
2017-07-15 17:43:25 +02:00 |
|
Thulinma
|
a2d7f726c5
|
Merge branch 'development' into LTS_development
|
2017-07-10 14:19:07 +02:00 |
|
Thulinma
|
fcffcc688f
|
Fix socket header mistake
|
2017-07-10 14:18:59 +02:00 |
|
Thulinma
|
650977c089
|
Merge branch 'development' into LTS_development
|
2017-07-05 16:44:05 +02:00 |
|
Thulinma
|
4e92823b31
|
Fixed include in timing.h
|
2017-07-05 16:43:59 +02:00 |
|
Thulinma
|
e772168a91
|
Added urltest testing binary
|
2017-07-05 13:47:25 +02:00 |
|
Thulinma
|
9cc2f75a8e
|
Added load balancer input
|
2017-07-05 13:47:21 +02:00 |
|
Thulinma
|
f5faa61ed4
|
Added bandwidth API call for bandwidth limit and exception config
|
2017-07-05 13:47:16 +02:00 |
|
Thulinma
|
0fc40fb5a2
|
Load balancer can now on-the-fly add/remove servers and change weights, load balancer now reads bandwidth limits from servers, if provided
|
2017-07-05 13:47:09 +02:00 |
|
Thulinma
|
4a5599f802
|
Merge branch 'development' into LTS_development
# Conflicts:
# lib/http_parser.cpp
# lib/http_parser.h
|
2017-07-05 13:46:57 +02:00 |
|
Thulinma
|
fe805f40a8
|
Improved isAddress() function for sockets with masking support, added several socket convenience functions.
|
2017-07-05 13:44:50 +02:00 |
|
Thulinma
|
0afbaaaa41
|
Many improvements and fixes to HTTP::URL class
|
2017-07-05 13:44:41 +02:00 |
|
Thulinma
|
f695e23ffc
|
Fixed streams being able to go inactive multiple times in a row
|
2017-07-04 13:23:34 +02:00 |
|
Thulinma
|
194a717ad6
|
Incoming pushes now wait for buffer shutdowns and restart it, if needed (no more failing quick successive pushes!), simplified output logic with keepGoing() function, added missing termination checks in some wait loops
# Conflicts:
# src/output/output.h
|
2017-07-04 13:23:22 +02:00 |
|
Thulinma
|
c2520f9c81
|
Merge branch 'development' into LTS_development
# Conflicts:
# src/output/output.cpp
# src/output/output.h
|
2017-07-04 13:22:37 +02:00 |
|
Thulinma
|
f4242f23bf
|
Incoming pushes now wait for buffer shutdowns and restart it, if needed (no more failing quick successive pushes!), simplified output logic with keepGoing() function, added missing termination checks in some wait loops
|
2017-07-04 13:12:03 +02:00 |
|
Thulinma
|
01e0b76a6a
|
Internal stream state active/inactive rewritten to use newly exposed stream status
|
2017-06-23 15:08:57 +02:00 |
|
Thulinma
|
422caafde2
|
Added extra fields to RECORDING_END trigger:
- time of connection start
- time of connection end
- duration of media
- first media timestamp
- last media timestamp
|
2017-06-23 15:08:47 +02:00 |
|
Thulinma
|
9bdc6fd7c3
|
$basename and $wildcard support in stream push commands
|
2017-06-23 15:08:43 +02:00 |
|
Thulinma
|
0e1a18986a
|
Merge branch 'development' into LTS_development
# Conflicts:
# lib/stream.cpp
|
2017-06-23 15:06:59 +02:00 |
|
Thulinma
|
0907d6424f
|
Fixed buffer status bug, fixed buffer firstms/lastms bug
|
2017-06-23 15:06:01 +02:00 |
|
Thulinma
|
7f76d7bc30
|
Added ability for file recording to create parent directories first
|
2017-06-23 15:05:50 +02:00 |
|
Thulinma
|
5a4cb100fa
|
Added directory checking and creation functions to Util library
|
2017-06-23 15:05:05 +02:00 |
|
Thulinma
|
3c68d537f6
|
Streamstatus const fix
|
2017-06-23 15:03:01 +02:00 |
|
Thulinma
|
fea1cdc736
|
Fixed timeout on shutdown+page change.
|
2017-06-23 15:01:51 +02:00 |
|
Thulinma
|
e75bf65ab9
|
pushes now only restart when stream is truly active
|
2017-06-22 14:10:12 +02:00 |
|
Thulinma
|
0ca63d1440
|
Merge branch 'development' into LTS_development
# Conflicts:
# lib/stream.cpp
# src/input/input.cpp
|
2017-06-22 14:07:54 +02:00 |
|
Thulinma
|
25699ef8b2
|
Added stream status shared memory page (temporary system)
|
2017-06-22 14:03:35 +02:00 |
|
Thulinma
|
733099867e
|
Merge branch 'development' into LTS_development
|
2017-06-21 20:38:03 +02:00 |
|
Thulinma
|
76b5a91da6
|
Fixed packBytePos not being handled correctly
|
2017-06-21 20:37:55 +02:00 |
|
Thulinma
|
290d01a47f
|
Merge branch 'development' into LTS_development
|
2017-06-19 20:37:45 +02:00 |
|