Thulinma
|
bf1e2c8083
|
Merge branch 'development' into LTS_development
# Conflicts:
# src/output/output_hss.cpp
|
2015-07-28 20:40:39 +02:00 |
|
Thulinma
|
b7b2bb5f68
|
Added CORS headers to HSS output, added HTTP OPTIONS support to HLS and HSS outputs.
|
2015-07-28 20:23:06 +02:00 |
|
Thulinma
|
232fc9ff0a
|
Merge branch 'development' into LTS_development
|
2015-07-22 09:53:46 +02:00 |
|
Thulinma
|
0bda57fa0c
|
When reconnecting, close old connections to userClient/statsPage first to prevent accidental killing of outputs.
|
2015-07-22 09:53:04 +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
|
dc6b4ca0b9
|
Gave MistOut processes the ability to restart MistIn processes and/or reconnect to them as/if needed.
|
2015-07-21 23:36:32 +02:00 |
|
Thulinma
|
fce83c903b
|
Make internal HTTP output correctly serve embed codes for newer stream types.
|
2015-07-21 23:07:41 +02:00 |
|
Thulinma
|
c3efc1001f
|
Improved startInput function behaviour and reliability, added streamAlive function.
|
2015-07-21 23:07:10 +02:00 |
|
Thulinma
|
9c25e9fa79
|
Merge branch 'development' into LTS_development
# Conflicts:
# src/output/output.h
|
2015-07-11 01:07:36 +02:00 |
|
Thulinma
|
b8eec40fbf
|
Fixed documentation for realTime variable, improved output verbosity when waiting for inputs to load up pages, made timer more precise.
|
2015-07-11 01:07:06 +02:00 |
|
Thulinma
|
ec78f92b8e
|
Allow setting of play back rate multiplier in MP4 output through the "rate" GET parameter.
|
2015-07-11 01:05:18 +02:00 |
|
Erik Zandvliet
|
06cfc1eed2
|
Fixes for HTTP DASH live streaming
|
2015-06-30 16:00:29 +02:00 |
|
Erik Zandvliet
|
1b724afc83
|
Small fix in playback speed, when resuming playback
|
2015-06-26 18:05:51 +02:00 |
|
Erik Zandvliet
|
3920ce38b5
|
Small fix in playback speed, when resuming playback
|
2015-06-23 11:12:42 +02:00 |
|
Thulinma
|
cd74fd1e46
|
Merge branch 'development' into LTS_development
# Conflicts:
# src/controller/controller.cpp
|
2015-06-18 16:07:30 +02:00 |
|
Thulinma
|
eaabf9e800
|
Fixed errors when requesting short URLs, fixed race condition during shutdown of controller.
|
2015-06-18 16:06:35 +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
|
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
|
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
|
657d7ad7ca
|
Fixed MP4 playback problems with zero-length parts (Mantrics playback issue).
|
2015-05-11 19:02:00 +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
|
272debb196
|
Merge branch 'development' into LTS_development
|
2015-04-15 12:33:23 +02:00 |
|
Thulinma
|
f94f7963de
|
Fixed HDS live playback.
|
2015-04-15 12:33:06 +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 |
|
Erik Zandvliet
|
d296ac60bb
|
Fixed folder support
|
2015-04-07 14:39:39 +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
|
f48cdb14a1
|
Merge branch 'openSourceMulti' into proMulti
|
2015-04-06 20:26:08 +02:00 |
|
Thulinma
|
4a8abcaae6
|
Fixed MP4 filesize estimate.
|
2015-04-06 20:25:34 +02:00 |
|
Thulinma
|
4bdbd82f66
|
LTS Commits
|
2015-04-05 21:38:36 +02:00 |
|
Erik Zandvliet
|
4ee59b9aaf
|
Various fixes
|
2015-04-03 14:58:06 +02:00 |
|
Thulinma
|
185d75e0d9
|
Fixed iPhone/iPad/iPod user agent detection.
|
2015-04-02 16:32:27 +02:00 |
|
Thulinma
|
a9a7ff7202
|
Tweaked debug message verbosity.
|
2015-04-02 16:32:08 +02:00 |
|
Thulinma
|
3c8cc43ad9
|
Fixed HLS edge case handling.
|
2015-04-02 16:32:00 +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 |
|
Erik Zandvliet
|
d370ef4eac
|
Working multi-input
|
2015-04-02 09:56:47 +02:00 |
|
Erik Zandvliet
|
9b6312ca01
|
Switch to CMake
|
2015-04-02 09:55:33 +02:00 |
|
Thulinma
|
92d5d9be51
|
Fixed audio-only HLS output
|
2015-03-14 14:02:46 +01:00 |
|
Thulinma
|
260a0ceb68
|
Fixed various HLS problems with LQ/short inputs
|
2015-03-06 11:19:49 +01:00 |
|
wouter spruit
|
ff049f4ea2
|
continuity improvements
|
2015-03-06 10:32:19 +01:00 |
|
Thulinma
|
95f19c4259
|
Merged TS unification edits by Wouter Spruit.
|
2015-03-05 13:49:09 +01:00 |
|