Commit graph

619 commits

Author SHA1 Message Date
Erik Zandvliet
0913d2607e Working PlayReady/Verimatrix DRM support 2015-09-02 12:09:37 +02:00
Thulinma
27fdbb2468 Merge branch 'development' into LTS_development 2015-08-28 22:17:35 +02:00
Thulinma
2fb1459dff Fixed Windows compile. 2015-08-28 22:17:29 +02:00
Thulinma
d6922c92f5 Merge branch 'development' into LTS_development 2015-08-28 21:58:43 +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
eadd3863fc Merge branch 'development' into LTS_development
# Conflicts:
#	lib/timing.cpp
#	lib/timing.h
2015-07-30 11:58:17 +02:00
Thulinma
610c48ddcb Added getUTCString call to Util library. 2015-07-30 11:57:23 +02:00
Thulinma
e36b05500b Major DASH cleanup/bugfix spree: live DASH now works in bitmovin player. 2015-07-29 22:59:39 +02:00
Thulinma
1c85037584 Merge branch 'development' into LTS_development 2015-07-22 12:38:32 +02:00
Thulinma
4b9c8cee74 Simplified and optimized FLV input and tag to DTSC conversion. 2015-07-22 12:37:09 +02:00
Thulinma
569ef07f29 Merge branch 'development' into LTS_development
# Conflicts:
#	lib/stream.cpp
#	src/output/output_http_internal.cpp
2015-07-21 23:51:46 +02:00
Thulinma
c3efc1001f Improved startInput function behaviour and reliability, added streamAlive function. 2015-07-21 23:07:10 +02:00
Thulinma
b316878674 Merge branch 'development' into LTS_development 2015-07-08 22:38:36 +02:00
Thulinma
421842bda5 Fixed incorrect stripping of ? character and beyond in stream name containing a + or space character before the ? character. 2015-07-08 22:38:27 +02:00
Thulinma
a9971f07cf Merge branch 'development' into LTS_development 2015-07-01 16:59:33 +02:00
Thulinma
b93841f659 Fixed NOSHM and WITH_THREADNAMES flags, added NOCRASHCHECK flag. 2015-07-01 16:59:26 +02:00
Erik Zandvliet
06cfc1eed2 Fixes for HTTP DASH live streaming 2015-06-30 16:00:29 +02:00
Thulinma
993801789a Merge branch 'development' into LTS_development 2015-05-21 19:16:22 +02:00
Thulinma
17aa6bbbb6 Compatibility improvements as well as simplification to RTMP push input. 2015-05-21 19:10:05 +02:00
Thulinma
e0c9173f9a Merge branch 'development' into LTS_development 2015-05-12 11:23:08 +02:00
Thulinma
a3bf393bea Added generic CORS header adder, now used in controller, HLS output and internal HTTP handler. 2015-05-12 11:23:00 +02:00
Thulinma
8e3de119b8 Merge branch 'development' into LTS_development 2015-04-16 16:10:41 +02:00
Thulinma
a891b5ba41 Fixed Windows typo. 2015-04-16 16:10:34 +02:00
Thulinma
241ac8f911 Merge branch 'development' into LTS_development 2015-04-16 15:59:32 +02:00
Thulinma
e672959f96 Fixes to Windows shared memory handling for VoD. 2015-04-16 15:59:25 +02:00
Thulinma
98cfc3c199 Merge branch 'development' into LTS_development 2015-04-16 15:01:49 +02:00
Thulinma
f20f1607c6 More debugging. 2015-04-16 15:01:41 +02:00
Thulinma
32e7893f80 Merge branch 'development' into LTS_development 2015-04-16 14:39:30 +02:00
Thulinma
ef26df5e38 Changed + in shared memory page name to _ 2015-04-16 14:39:23 +02:00
Thulinma
c458572192 Merge branch 'development' into LTS_development 2015-04-16 14:21:15 +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
b2f4b02669 Merge branch 'development' into LTS_development 2015-04-16 14:07:11 +02:00
Thulinma
2808595d7b Changed Windows shared memory back to non-global. 2015-04-16 14:07:04 +02:00
Thulinma
2ab799db93 Merge branch 'development' into LTS_development 2015-04-16 13:22:06 +02:00
Thulinma
e105569b06 More changes to Windows support. 2015-04-16 13:21:30 +02:00
Thulinma
721e9dfd05 Merge branch 'development' into LTS_development 2015-04-16 13:19:01 +02:00
Thulinma
d120523bbb Improvements to connector shutdown code, attempted fix for Windows support. 2015-04-16 13:18:52 +02:00
Thulinma
cb298c57fd Merge branch 'development' into LTS_development
# Conflicts:
#	CMakeLists.txt
#	src/analysers/info.cpp
2015-04-16 12:24:37 +02:00
Thulinma
243a05c8af Removed unused code from procs library, updated and simplified connector handler in controller. 2015-04-16 12:23:03 +02:00
Thulinma
7c0db4531d Removed legacy libraries (converter, ftp, filesystem) from codebase. 2015-04-15 14:24:43 +02:00
Thulinma
3489d1ee34 Merge branch 'development' into LTS_development
# Conflicts:
#	src/input/input_buffer.cpp
2015-04-14 15:32:05 +02:00
Thulinma
69cf17d01d Increased maximum simultaneous tracks from 5 to 10, made this a define option. Allow multiple pushes through a single RTMP connection. 2015-04-14 15:30:25 +02:00
Thulinma
8d377602be Changed windows shm functions to ANSI equivalents. 2015-04-13 16:58:30 +02:00
Thulinma
ad8af44c4d Merge branch 'development' into LTS_development 2015-04-12 15:32:04 +02:00
Thulinma
c000249ad5 Improved shared memory namings to no longer use the '#' character, added cmake-related files to .gitignore 2015-04-12 15:31:52 +02:00
Thulinma
514f0a9b2b Fixes to AC3, MP3, 4+GiB MP4 and MP4 B-frames by Oswald de Bruin 2015-04-07 14:38:39 +02:00
Thulinma
4bdbd82f66 LTS Commits 2015-04-05 21:38:36 +02:00
Thulinma
dffc0f9539 Fixed handling of type 3 RTMP packets with extended timestamps. Removed redundant code. 2015-04-02 16:39:24 +02:00
Thulinma
49f9b44add Changed RTMP set peer bandwidth size from 4 to 5 bytes. 2015-04-02 16:39:11 +02:00
Thulinma
f9201cbf9a Fixes to HTTP parser lib, DTSCMeta keysizes, MP4 headers and 4+GiB MP4 file output by Oswald de Bruin 2015-04-02 16:22:52 +02:00