Commit graph

3710 commits

Author SHA1 Message Date
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
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
a2d912912f Merge branch 'development' into LTS_development 2017-06-19 20:24:16 +02:00
Thulinma
c4eb021eef Added generated directory to gitignore 2017-06-19 20:24:11 +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
6595059737 Fixes to RTP library 2017-06-19 12:47:30 +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
416254304a Merge branch 'development' into LTS_development
# Conflicts:
#	lib/h264.h
2017-06-09 20:14:23 +02:00
Thulinma
7fae3e6739 Added ability to print backtraces in defines.h 2017-06-09 20:10:22 +02:00
Thulinma
05387f01fb Optimized socket library, added generic splitter function 2017-06-09 20:10:01 +02:00
Thulinma
c7c94dc3c3 Added Util::bootMS() to timing library 2017-06-09 20:09:41 +02:00
Thulinma
d45a89c5e6 Added isKeyframe function to H264 library 2017-06-09 20:09:12 +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
422c839ae2 Fix semaphore segfault when tryWait'ing on invalid semaphore. 2017-05-23 21:36:43 +02:00
Thulinma
108499bc58 Meta::toFile now returns, as it should 2017-05-23 21:36:35 +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
7d6e133858 Merge branch 'development' into LTS_development 2017-05-16 16:25:11 +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
d2b020072c Fixed a few config semaphore locks in Pro edition 2017-05-16 15:42:13 +02:00