ozzay
|
1c3e143709
|
Recording functionality by Diederick Huijbers, slightly tweaked.
|
2016-02-12 16:29:08 +01:00 |
|
Erik Zandvliet
|
c0b5f0d4b1
|
X-Real-IP support
|
2016-02-12 16:29:08 +01:00 |
|
Thulinma
|
53febd82d1
|
Merge branch 'development' into LTS_development
# Conflicts:
# src/input/input_buffer.cpp
|
2016-02-12 16:18:54 +01:00 |
|
Thulinma
|
243595ff4d
|
UDP socket edits by Erik Zandvliet
|
2016-02-12 16:16:49 +01:00 |
|
Thulinma
|
d56e7f1408
|
Added a proxy in Output for getting the host (by Erik Zandvliet)
|
2016-02-12 15:51:54 +01:00 |
|
Thulinma
|
2d78e1e5f1
|
Improved MistInBuffer CPU usage by 50%.
|
2016-02-12 15:46:23 +01:00 |
|
Thulinma
|
7c759c7664
|
Optimized getWritableIdentifier to improve the speed of MistInBuffer even further.
|
2016-02-12 15:39:01 +01:00 |
|
Thulinma
|
fa6dd9ee56
|
Merge branch 'development' into LTS_development
# Conflicts:
# lib/dtsc.cpp
# lib/dtsc.h
|
2016-01-28 11:31:00 +01:00 |
|
Thulinma
|
9631b79e86
|
Removed DTSC::Stream and DTSC::Ring classes - no longer in use anywhere.
|
2016-01-28 11:27:26 +01:00 |
|
Erik Zandvliet
|
1866e4e1e1
|
Updated CORS headers and the (HTTP) output protocols to work with it.
|
2016-01-26 14:34:14 +01:00 |
|
Erik Zandvliet
|
3f93ca5f82
|
Merge branch 'development' into LTS_development
# Conflicts:
# src/output/output_progressive_mp4.cpp
|
2016-01-26 14:33:23 +01:00 |
|
Erik Zandvliet
|
a39350f83e
|
CORS Headers
|
2016-01-26 14:31:09 +01:00 |
|
Erik Zandvliet
|
90a53ddf70
|
Merge branch 'development' into LTS_development
# Conflicts:
# src/output/output_hds.cpp
|
2016-01-26 14:15:17 +01:00 |
|
Erik Zandvliet
|
3c48a6c03c
|
Embedding of flash players
|
2016-01-26 14:14:12 +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
|
78d69673f3
|
Fix HLS start issues for live streams.
|
2015-12-25 14:47:20 +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 |
|
Erik Zandvliet
|
e90c3193d6
|
Merge branch 'development' into LTS_development
# Conflicts:
# src/input/input_buffer.cpp
# src/input/input_buffer.h
|
2015-12-17 19:25:16 +01:00 |
|
Erik Zandvliet
|
a604d616f7
|
'Ugly' fix for dissapearing metadata
|
2015-12-17 19:22:55 +01:00 |
|
Thulinma
|
c2b1471170
|
Merge branch 'development' into LTS_development
|
2015-11-28 16:24:14 +01:00 |
|
Thulinma
|
c93c0a8b5f
|
Added new triggers to LSP.
|
2015-11-28 16:24:06 +01:00 |
|
Thulinma
|
e6e28668a9
|
Merge branch 'development' into LTS_development
|
2015-11-28 16:10:20 +01:00 |
|
cat
|
e5e36df045
|
such facepalm.
|
2015-11-28 16:09:49 +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
|
ed5440e382
|
Added ability to disable resume support for live streams.
|
2015-11-27 14:51:15 +01:00 |
|
Thulinma
|
bf180a2a35
|
Added "minimal" API request for requesting minimal responses only.
|
2015-11-27 10:44:21 +01:00 |
|
Thulinma
|
22467d603e
|
Added support for clients and lastms requests in active_streams API call
|
2015-11-27 10:44:21 +01:00 |
|
Thulinma
|
7168a3ffbd
|
Added STREAM_BUFFER trigger.
|
2015-11-27 10:44:21 +01:00 |
|
Thulinma
|
233b31ddee
|
Added RTMP_PUSH_REWRITE trigger.
|
2015-11-27 10:44:21 +01:00 |
|
Thulinma
|
9e1f0fcb7d
|
Merge branch 'development' into LTS_development
# Conflicts:
# src/input/input_buffer.cpp
|
2015-11-27 10:44:09 +01:00 |
|
Thulinma
|
c9ddc3fe1a
|
Fixed level of waiting for track debug message.
|
2015-11-27 10:01:24 +01:00 |
|
Thulinma
|
4397b410d4
|
Fixed typo in buffer size calculation.
|
2015-11-27 09:53:23 +01:00 |
|
Thulinma
|
f90f261116
|
Merge branch 'development' into LTS_development
|
2015-11-25 21:48:37 +01:00 |
|
Thulinma
|
5ae0cb42a9
|
UDP binds can now bind to a specific interface, fixed IPv4 support for UDP sockets on IPv6-capable machines.
|
2015-11-24 22:46:37 +01:00 |
|
Thulinma
|
be3a852fb0
|
Made UDP socket binding more robust.
|
2015-11-24 16:57:23 +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
|
d887e01aed
|
Merge branch 'development' into LTS_development
|
2015-11-24 15:20:40 +01:00 |
|
cat
|
2919e74d4e
|
forward script params to video url
|
2015-11-24 12:52:41 +01:00 |
|
cat
|
63f9fb52a5
|
LSP / embed support for appending a string to the video url
|
2015-11-20 12:11:00 +01:00 |
|
Balder
|
689129e805
|
Merge branch 'development' into LTS_development
|
2015-11-19 14:04:22 +01:00 |
|
Balder
|
d8bfe8cebc
|
Fixed ability to disable video or audio tracks from HTTP output.
|
2015-11-19 14:02:21 +01:00 |
|
Balder
|
7d9d4e26ae
|
fixed LTS tag for request url
|
2015-11-19 13:53:22 +01:00 |
|
Thulinma
|
c51f1b4955
|
Merge branch 'development' into LTS_development
# Conflicts:
# src/input/input_buffer.cpp
|
2015-11-16 16:16:44 +01:00 |
|
Thulinma
|
f268988354
|
Fixed buffer incorrectly nulling indexes for live streams.
|
2015-11-16 16:15:52 +01:00 |
|
Thulinma
|
2bc333956a
|
Merge branch 'development' into LTS_development
|
2015-11-16 11:44:19 +01:00 |
|
Thulinma
|
c194396215
|
Clarified valid page numbers debug message.
|
2015-11-16 11:44:11 +01:00 |
|
Thulinma
|
bd836f247d
|
Merge branch 'development' into LTS_development
|
2015-11-12 11:11:40 +01:00 |
|
Thulinma
|
e20761e8c7
|
Fix the case when a keyframe is not the first data pushed.
|
2015-11-12 11:11:32 +01:00 |
|
Thulinma
|
4db86ab2bb
|
Fixed HTTP-based CONN_PLAY triggers URLs
|
2015-11-12 10:13:16 +01:00 |
|