Commit graph

90 commits

Author SHA1 Message Date
Thulinma
44fd455c8e Merge branch 'development' into LTS_development
# Conflicts:
#	src/input/input.cpp
2016-09-22 09:50:09 +02:00
Thulinma
80bd99de44 Added statExchange getPID function 2016-09-22 09:42:43 +02:00
Thulinma
497583e54b Merge branch 'development' into LTS_development
# Conflicts:
#	src/controller/controller_statistics.cpp
2016-09-22 09:16:34 +02:00
Thulinma
cdab043a4b Added sharedServer abandon() function, changed sharedServer.myPages container from set to deque 2016-09-22 09:12:27 +02:00
Thulinma
1172768c34 Merge branch 'development' into LTS_development
# Conflicts:
#	lib/shared_memory.cpp
#	src/controller/controller.cpp
#	src/controller/controller_storage.h
#	src/output/output.cpp
2016-09-15 16:17:06 +02:00
Thulinma
4472d00e69 Improved sharedClient isAlive handling 2016-09-15 16:03:24 +02:00
Thulinma
a4f35ca11e Made sharedServer::finishEach explicit 2016-09-15 15:45:42 +02:00
Thulinma
2294fbd365 Merge branch 'development' into LTS_development
# Conflicts:
#	src/input/input_dtsc.cpp
#	src/output/output.cpp
2016-07-28 20:50:29 +02:00
Thulinma
4dc3d22d12 Fixed potential deadlock in buffer when a past crash has happened 2016-07-28 20:44:28 +02:00
Thulinma
16f293cf2c Merge branch 'development' into LTS_development 2016-07-23 22:55:41 +02:00
Thulinma
4cef8d7cf5 Small fixes for VoD and DTSC pull input 2016-07-23 22:55:35 +02:00
Thulinma
f53882a822 Fixed Windows slow load bug. 2016-06-25 10:40:09 +02:00
Thulinma
6d384bd030 Fixed Windows slow load bug. 2016-06-24 13:48:21 +02:00
Thulinma
ed982b9eb3 Added/tweaked debug messages for stats 2016-06-09 18:42:32 +02:00
Thulinma
4c9c6fa7ba Backported various little edits from Pro edition. 2016-06-02 14:07:21 +02:00
Thulinma
1f319cc782 shm_open failures are now on HIGH level in stead of FAIL level. 2016-05-25 16:40:08 +02:00
Thulinma
5759dbef0f Added "invalidate_sessions" API call, made USER_NEW trigger even more atomic. 2016-05-20 13:06:37 +02:00
Erik Zandvliet
72de5e5b90 Changed sleep to wait everywhere where it was needed 2016-05-18 17:06:23 +02:00
Thulinma
1dfc22858a streamName and connector string data are now properly null-terminated in sharedStats structures, using snprintf. 2016-05-18 16:16:42 +02:00
Thulinma
5838f7a39c Made PIDs 4 bytes instead of 2. 2016-05-18 09:57:07 +02:00
Thulinma
b23a811849 Fixed stats reporting corrupt stream name under certain conditions. 2016-05-18 01:01:08 +02:00
Erik Zandvliet
a5a9facc22 DTSC Pull optimizes and quick-negotiate. 2016-05-13 17:27:25 +02:00
Thulinma
fa41e02047 Removed 5s timeout from streamAlive call. 2016-05-05 16:05:12 +02:00
Erik Zandvliet
dda0ea669c Fully implemented DTSC pull support 2016-05-05 16:05:12 +02:00
Thulinma
f4b296164e Fixed all semaphore instances not being cleaned up properly. 2016-05-03 12:13:58 +02:00
Thulinma
aa2dd8491c Fixed a segfault in the buffer on track deletion, added a WARN-level message when/if something similar occurs. 2016-05-01 15:56:10 +02:00
Thulinma
f6e2e95b5a Added USER_NEW trigger. 2016-02-19 11:33:40 +01:00
Thulinma
0d9108d1d6 Backported Pro shared_memory edits to OS edition 2016-02-15 14:42:19 +01:00
Erik Zandvliet
c25a533729 Recording, HLS Push, UDP (Multicast) Input, Threaded TS 2016-02-12 16:30:33 +01:00
Thulinma
8eb518606a Merge branch 'development' into LTS_development
# Conflicts:
#	src/input/input_buffer.cpp
2015-12-25 15:44:23 +01:00
Thulinma
401fe65979 - Made HLS no longer skip first fragment.
- Ignore metadata tracks and invalid tracks for buffer calculations.
- Fixed statistics.
2015-12-25 14:37:32 +01:00
Thulinma
3d1784a096 Merge branch 'development' into LTS_development 2015-11-28 16:06:33 +01:00
Thulinma
23800d6cbb Fixed shared memory issues under Windows, by Erik Zandvliet. 2015-11-28 16:06:26 +01:00
Thulinma
f90f261116 Merge branch 'development' into LTS_development 2015-11-25 21:48:37 +01:00
Thulinma
8e94528d6f Improved signal and UDP bind debugging information, decreased verbosity of windows SHM errors. 2015-11-24 15:57:17 +01:00
Thulinma
8bcda5e57b Merge branch 'development' into LTS_development
# Conflicts:
#	lib/bitstream.h
#	lib/h264.cpp
#	lib/h264.h
#	lib/nal.cpp
#	lib/nal.h
2015-11-05 17:07:17 +01:00
Thulinma
b28a619fc6 Various fixes and improvements, backported from Pro version. Code by Erik Zandvliet. 2015-11-05 17:05:21 +01:00
Thulinma
74c8932106 Merge branch 'development' into json_mod_LTS
# Conflicts:
#	lib/shared_memory.cpp
#	src/controller/controller.cpp
#	src/io.cpp
#	src/output/output.cpp
#	src/output/output_http_internal.cpp
2015-10-07 11:05:49 +02:00
Thulinma
16d38459b6 Made JSON library non-recursive.
Co-authored with Diederick.
2015-10-06 13:21:14 +02:00
Erik Zandvliet
1f4b523b1b Initial TS Input commit 2015-09-10 00:54:55 +02:00
Thulinma
2fb1459dff Fixed Windows compile. 2015-08-28 22:17:29 +02:00
Thulinma
71dc32d2d3 Added ability to break through semaphore locks to the controller monitoring thread. 2015-08-28 21:56:27 +02:00
Thulinma
b93841f659 Fixed NOSHM and WITH_THREADNAMES flags, added NOCRASHCHECK flag. 2015-07-01 16:59:26 +02:00
Thulinma
a891b5ba41 Fixed Windows typo. 2015-04-16 16:10:34 +02:00
Thulinma
e672959f96 Fixes to Windows shared memory handling for VoD. 2015-04-16 15:59:25 +02:00
Thulinma
f20f1607c6 More debugging. 2015-04-16 15:01:41 +02:00
Thulinma
a556d6032d Added insane-level debug message for opening of all shared memory pages. 2015-04-16 14:21:07 +02:00
Thulinma
2808595d7b Changed Windows shared memory back to non-global. 2015-04-16 14:07:04 +02:00
Thulinma
e105569b06 More changes to Windows support. 2015-04-16 13:21:30 +02:00
Thulinma
d120523bbb Improvements to connector shutdown code, attempted fix for Windows support. 2015-04-16 13:18:52 +02:00