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
|
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
|
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 |
|
Thulinma
|
35b2dd6bee
|
Better working TS input, Pro side. Code by Erik Zandvliet.
|
2015-11-05 17:11:04 +01:00 |
|
Thulinma
|
01e9a45335
|
Clarified comment
|
2015-10-29 16:50:36 +01:00 |
|
Thulinma
|
67e1a832a2
|
Removed confusing comments.
|
2015-10-29 16:34:37 +01:00 |
|
ozzay
|
e0ab83e61c
|
MP4 keyframe problem fixed
|
2015-10-29 16:26:09 +01:00 |
|
Thulinma
|
d504bbe720
|
Merge branch 'development' into LTS_development
# Conflicts:
# src/input/input_buffer.cpp
|
2015-10-20 15:36:33 +02:00 |
|
Thulinma
|
9df850a149
|
Fix for repushing.
|
2015-10-20 15:35:21 +02:00 |
|
cat
|
718c0b7f35
|
embed selfdetection fix
|
2015-10-20 11:40:36 +02:00 |
|
Thulinma
|
58d4015af2
|
Merge branch 'development' into LTS_development
|
2015-10-20 11:39:57 +02:00 |
|
Thulinma
|
3ed0d1b3a3
|
Merge branch 'development' into LTS_development
|
2015-10-19 16:59:36 +02:00 |
|
cat
|
718d009f9f
|
embed exclude for IE/FF fix
|
2015-10-19 16:47:52 +02:00 |
|
Thulinma
|
de1d202457
|
Made RTSP max send value runtime configurable.
|
2015-10-14 14:30:28 +02:00 |
|
Thulinma
|
e3f324e9af
|
Merge branch 'development' into LTS_development
|
2015-10-14 11:19:08 +02:00 |
|
Thulinma
|
b28b463662
|
Improved HLS bandwidth accuracy.
|
2015-10-14 11:18:56 +02:00 |
|
Thulinma
|
279add438a
|
Implemented triggers.
Merged from code by Wouter Spruit, with additions by yours truly.
|
2015-10-14 10:48:00 +02:00 |
|
Thulinma
|
eb6b98b219
|
Merge branch 'development' into LTS_development
# Conflicts:
# src/controller/controller.cpp
|
2015-10-14 10:38:59 +02:00 |
|
Thulinma
|
3ba11441a1
|
Improved flow of controller main function, made config file only re-write if updates were actually necessary, failure to open a stream input now fails the output correctly.
|
2015-10-14 10:25:58 +02:00 |
|
Thulinma
|
6b21e06c76
|
Merge branch 'development' into LTS_development
|
2015-10-13 15:56:53 +02:00 |
|
Thulinma
|
73ef41e97b
|
Properly trigger failure state on streams when connection to source fails.
|
2015-10-13 15:55:26 +02:00 |
|
Thulinma
|
330117b1f4
|
Merge branch 'development' into LTS_development
|
2015-10-13 15:34:58 +02:00 |
|
Thulinma
|
2f4a4660d0
|
Fixed controller breaking when all connectors are deleted simultaneously.
|
2015-10-13 15:34:24 +02:00 |
|