Commit graph

1650 commits

Author SHA1 Message Date
Thulinma
a0d54e1a95 Added H264 Annex B stream input 2017-07-22 18:49:57 +02:00
Erik Zandvliet
a2b83e0cd3 Merge branch 'development' into LTS_development 2017-07-19 17:43:27 +02:00
Erik Zandvliet
f5293ea29f MP4 rework 2017-07-19 17:30:10 +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
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
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
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
290d01a47f Merge branch 'development' into LTS_development 2017-06-19 20:37:45 +02:00
Erik Zandvliet
4de8932fe0 Fix in mp3 seeking code to correctly set the timestamp. 2017-06-19 20:37:25 +02:00
Thulinma
067ba7d381 Fixed extraneous checkLicense in Controller 2017-06-19 20:24:22 +02:00
Thulinma
187ef6138c Added LPCM support to .wav output 2017-06-19 12:47:40 +02:00
Thulinma
f46d2a0c4a Added PCM support to RTSP 2017-06-19 12:47:36 +02:00
Thulinma
5a44572896 PCM support in Flash-based protocols 2017-06-19 12:46:53 +02:00
Thulinma
de4fea643a Merge branch 'development' into LTS_development
# Conflicts:
#	src/output/output_progressive_flv.cpp
#	src/output/output_rtmp.cpp
2017-06-19 12:46:41 +02:00
Thulinma
cef78b7d08 PCM support in Flash-based protocols 2017-06-19 12:40:32 +02:00
Thulinma
ca65576510 Merge branch 'development' into LTS_development 2017-06-09 21:40:30 +02:00
Thulinma
bb5d0dda11 Removed bullshit timestamp checks, no longer relevant/needed. 2017-06-09 21:40:11 +02:00
Thulinma
695b4fd0bd Fixes in regard to 64-bit time stamps 2017-06-09 21:39:24 +02:00
Thulinma
cfb19317f3 Merge branch 'development' into LTS_development 2017-06-09 21:39:19 +02:00
Thulinma
72f9fd3be2 Fixes in regard to 64-bit time stamps 2017-06-09 21:39:05 +02:00
Thulinma
1a0548ec68 Merge branch 'development' into LTS_development
# Conflicts:
#	src/input/input.cpp
#	src/input/input.h
2017-06-09 20:41:48 +02:00
Thulinma
920efe0b26 Updated serve-type inputs to obey "always on" stream config setting, push inputs no longer counted as viewers. 2017-06-09 20:40:03 +02:00
Thulinma
26f4d1fdee MistInBuffer no longer boots if the process starting it has no data to fill it with. Optimized and simplified HTTP internal output. 2017-06-09 20:35:06 +02:00
Thulinma
bef46f969c Merge branch 'development' into LTS_development
# Conflicts:
#	lib/stream.cpp
#	lib/stream.h
#	src/input/input.cpp
#	src/output/output_http_internal.cpp
2017-06-09 20:34:57 +02:00
Thulinma
26f74accdf MistInBuffer no longer boots if the process starting it has no data to fill it with. Optimized and simplified HTTP internal output. 2017-06-09 20:31:20 +02:00
Thulinma
fdf4eeb9f1 Server start boolean now correctly set to true 2017-06-09 20:16:06 +02:00
Thulinma
22ac5bc2a4 YOU MUST CONSTRUCT MOAR MP4 DEBUG DATA 2017-06-09 20:15:54 +02:00
Thulinma
cf12baedb5 Using isKeyframe function from H264 library instead of local version in RTSP output 2017-06-09 20:15:43 +02:00
Thulinma
afff9c6079 No longer leave UDP socket open in spawned children from Controller 2017-05-25 12:15:00 +02:00
Thulinma
35c33b04ec Added Chrome workaround INFO-level message in MP4 output 2017-05-23 21:40:29 +02:00
Thulinma
6bca77d758 Merge branch 'development' into LTS_development 2017-05-23 21:36:55 +02:00
Thulinma
24a1744b7e Input now prints message and aborts cleanly when pull lock could not be opened. 2017-05-23 21:36:49 +02:00
Thulinma
3bad5c2161 Hopefully fixed Windows 2017-05-17 12:09:04 +02:00
Thulinma
6e21e70fae Fixed Windows builds. Wtf..? 2017-05-16 20:15:00 +02:00
Thulinma
c12e7897cf Compressed audio fixes for Flash-based protocols 2017-05-16 16:25:04 +02:00
Thulinma
4aec52743c Compressed audio fixes for Flash-based protocols 2017-05-16 16:24:49 +02:00
Thulinma
3157bfdd35 Fixed a compile warning 2017-05-16 14:53:31 +02:00
Thulinma
fac86bce49 Updated MistInAV in line with recent libavformat deprecations 2017-05-16 14:52:33 +02:00