Thulinma
|
c04572f685
|
Removed logs from controller config file.
|
2015-06-16 11:17:39 +02:00 |
|
Thulinma
|
9c4af587df
|
Fix stats analyser.
|
2015-06-16 11:17:18 +02:00 |
|
Thulinma
|
a936d1c737
|
Merge branch 'development' into LTS_development
|
2015-06-12 23:58:35 +02:00 |
|
Thulinma
|
0789cc46d2
|
Implemented RTMP calls ping and FCSubscribe, fixed a few RTMP typoes, added error handler for unsupported commands.
|
2015-06-12 23:58:23 +02:00 |
|
Thulinma
|
e17b9cb7bc
|
Merge branch 'development' into LTS_development
|
2015-06-03 17:24:55 +02:00 |
|
Thulinma
|
48f8bbcb91
|
Added support for HTTP prefixes without $ symbol.
|
2015-06-03 17:24:43 +02:00 |
|
Thulinma
|
2d37739c30
|
Added basic minimal HTTP server output.
|
2015-06-03 16:39:16 +02:00 |
|
Thulinma
|
9e10cc621c
|
Merge branch 'development' into LTS_development
# Conflicts:
# src/input/input_buffer.cpp
|
2015-05-21 20:17:37 +02:00 |
|
Thulinma
|
6b2a158d9c
|
Backported various fixes by Erik Zandvliet, also added better handling of re-pushes.
|
2015-05-21 20:15:09 +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 |
|
Erik Zandvliet
|
926dd01995
|
Fixed removing pages at the right points.
|
2015-05-20 14:45:38 +02:00 |
|
Thulinma
|
049e9babe0
|
Merge branch 'development' into LTS_development
|
2015-05-19 14:21:02 +02:00 |
|
Thulinma
|
7e2c4a8318
|
Fixed track misnegotiation in live pushing.
|
2015-05-19 14:20:45 +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
|
5326c07731
|
Changed DASH CORS headers to generic header adder.
|
2015-05-12 11:20:41 +02:00 |
|
Thulinma
|
a97797a604
|
Merge branch 'development' into LTS_development
# Conflicts:
# src/input/input_buffer.cpp
|
2015-05-11 19:18:20 +02:00 |
|
Thulinma
|
2845cbedcb
|
More fixes to Windows live metadata handling.
|
2015-05-11 19:11:00 +02:00 |
|
Thulinma
|
657d7ad7ca
|
Fixed MP4 playback problems with zero-length parts (Mantrics playback issue).
|
2015-05-11 19:02:00 +02:00 |
|
Thulinma
|
ccaec3d2f8
|
Fixed live stream memory leak in Windows builds
|
2015-05-07 19:00:01 +02:00 |
|
Thulinma
|
6f933bdb97
|
Fixed live pushing when more than 2 tracks present.
|
2015-05-07 12:02:49 +02:00 |
|
Thulinma
|
77dcfc23ad
|
Removed remaining recording code.
|
2015-04-28 09:39:01 +02:00 |
|
Thulinma
|
c96f0fb9e4
|
Merge branch 'development' into LTS_development
|
2015-04-21 17:14:51 +02:00 |
|
Thulinma
|
acc462c281
|
Minor edit to live buffer semaphore naming.
|
2015-04-21 17:14:13 +02:00 |
|
Thulinma
|
ac540cdd1d
|
LTS feature: Added support for setting/overriding the error text for failed streams.
|
2015-04-17 02:01:27 +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
|
5b86b0254b
|
Merge branch 'development' into LTS_development
|
2015-04-16 12:40:58 +02:00 |
|
Thulinma
|
2e052fa2a1
|
Removed old converter include.
|
2015-04-16 12:40:31 +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
|
184f7ad6c8
|
Removed old MistInfo binary and dependencies on it.
|
2015-04-16 12:21:33 +02:00 |
|
Thulinma
|
7c0db4531d
|
Removed legacy libraries (converter, ftp, filesystem) from codebase.
|
2015-04-15 14:24:43 +02:00 |
|
Thulinma
|
9b683f6ee3
|
Merge branch 'development' into LTS_development
|
2015-04-15 13:49:18 +02:00 |
|
Thulinma
|
73b1f2d75c
|
Prevented deleting live tracks too soon.
|
2015-04-15 13:49:12 +02:00 |
|