hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4550 commits 3 branches 0 tags 29 MiB
Commit graph

4550 commits

This branch
This branch
All branches
Author SHA1 Message Date
cat
182ec4656e LSP: bugfix for empty config files 2015-10-07 11:28:54 +02:00
Thulinma
5df392ef6b Merge branch 'development' into LTS_development 2015-10-07 11:24:04 +02:00
Thulinma
8fb8a98c5f Pro side of JSON library updates. 2015-10-07 11:06:22 +02:00
Thulinma
74c8932106 Merge branch 'development' into json_mod_LTS 
# Conflicts:
#	lib/shared_memory.cpp
#	src/controller/controller.cpp
#	src/io.cpp
#	src/output/output.cpp
#	src/output/output_http_internal.cpp
 2015-10-07 11:05:49 +02:00
cat
80ba997c52 LSP triggers: dont show stream options for system or output triggers 2015-10-07 10:24:51 +02:00
Thulinma
6d25774b94 Improved performance of FLV input and generic input IO class. 2015-10-06 16:36:06 +02:00
Thulinma
16d38459b6 Made JSON library non-recursive. 
Co-authored with Diederick.
 2015-10-06 13:21:14 +02:00
Thulinma
f464a69371 Merge branch 'development' into LTS_development 
# Conflicts:
#	lsp/main.css
 2015-10-05 21:43:30 +02:00
Thulinma
7905bb2bda LSP bugfixes by Carina van der Meer 2015-10-05 21:39:52 +02:00
Erik Zandvliet
b493976f90 MP4 HEVC fix 2015-10-05 17:08:18 +02:00
Erik Zandvliet
01472ca88d Fix for TS Input CPU Usage 2015-10-05 17:08:10 +02:00
Thulinma
8567e5192a Merge branch 'development' into LTS_development 2015-10-02 14:58:06 +02:00
Balder
11cb4c1c76 Changed triggers names, changed descriptions 2015-10-02 14:57:54 +02:00
Thulinma
af9acdd9e2 Merge branch 'development' into LTS_development 
# Conflicts:
#	lsp/minified.js
#	lsp/mist.js
 2015-10-01 13:58:31 +02:00
Thulinma
51e6a5d1e9 Trigger documentation in browser interface. 2015-10-01 13:53:33 +02:00
Thulinma
1e9ee73bfe Added Util::stringToBool utility function. 2015-10-01 13:49:35 +02:00
Thulinma
ce124cb58d Merge branch 'development' into LTS_development 2015-09-30 20:00:20 +02:00
Thulinma
d7fb7dd779 Fixed boolean support in JSON library. 2015-09-30 19:59:44 +02:00
Thulinma
0c94e17e70 Fixed aspect ratios in MP4. 2015-09-29 14:41:34 +02:00
Thulinma
3b92a56707 Merge branch 'development' into LTS_development 2015-09-29 14:41:26 +02:00
Thulinma
adc34a0ac9 Fixed aspect ratios in MP4. 2015-09-29 14:39:59 +02:00
cat
0068f1c26b LSP bugfixes 2015-09-29 11:15:01 +02:00
Thulinma
c9a30c2816 Improved on/off display for streams. 2015-09-29 11:03:26 +02:00
Thulinma
24c17e9466 Tuned down debug verbosity for live streams significantly. 2015-09-26 22:41:15 +02:00
Thulinma
9903cd4322 Removed useless debug message. 2015-09-25 21:11:40 +02:00
Thulinma
76529664e6 Merge branch 'development' into LTS_development 2015-09-25 20:58:58 +02:00
Thulinma
94dafb7888 Made generic output debug message about "actually loaded..." clearer, changed level to warn. 2015-09-25 20:58:42 +02:00
Thulinma
1110f79548 Fixed completeKeyReady flag to only wait for selected tracks, not all tracks. 2015-09-25 20:57:09 +02:00
Thulinma
5c3ff12946 Fixed support for MP4 files without CTTS box in a track header. 2015-09-25 00:36:09 +02:00
Thulinma
5819e9cac8 Merge branch 'development' into LTS_development 2015-09-24 20:08:15 +02:00
cat
5d9f290e0b LSP - preview stream buttons, validate duplicate streamnames 2015-09-24 20:08:05 +02:00
cat
f7b4e1c1c3 LSP - hooks and triggers 2015-09-24 20:07:55 +02:00
Thulinma
f82e75e891 new embed framework - WIP 2015-09-24 20:07:45 +02:00
Erik Zandvliet
b32b6c5985 Fixed 2015-09-10 01:02:32 +02:00
Erik Zandvliet
1f4b523b1b Initial TS Input commit 2015-09-10 00:54:55 +02:00
Thulinma
10f0f6bb92 addstream/deletestream requests now no longer send a complete stream list as reply, but instead an incomplete stream list. 2015-09-08 22:42:54 +02:00
Thulinma
1910512a7b Merge branch 'development' into LTS_development 2015-09-08 21:53:59 +02:00
Thulinma
5d702abdc5 Added support for partial stream responses (by totally ignoring them). 2015-09-08 21:53:33 +02:00
Thulinma
9f5f90adcf Fix missing c_str() in RTSP warning message. 2015-09-08 18:38:34 +02:00
Thulinma
76cf297829 Merge branch 'development' into LTS_development 2015-09-08 18:38:00 +02:00
Thulinma
c62b4bf381 Split input handling into separate convert and serve functions. 2015-09-08 18:32:12 +02:00
Thulinma
b400ae20c0 Merge branch 'development' into LTS_development 2015-09-05 20:40:54 +02:00
Thulinma
c096450a8f Disallow < 1s buffer for live, set default from the start. 2015-09-05 20:40:44 +02:00
Thulinma
9b5bea2b15 Set default segment size from the start in buffer. 2015-09-05 20:40:07 +02:00
Thulinma
174de9dfb8 Fixed RTSP for folder and multiple live streams. 2015-09-05 13:24:04 +02:00
Thulinma
ccf1221d48 Merge branch 'development' into LTS_development 
# Conflicts:
#	src/input/input_buffer.cpp
 2015-09-04 17:25:12 +02:00
Thulinma
0e55b66e7d Improved track removal timings. 2015-09-04 17:24:28 +02:00
Thulinma
bb7dcd8f2a Merge branch 'development' into LTS_development 2015-09-04 10:12:45 +02:00
Thulinma
2222a37079 Improvements to track negotiation timings and debug message verbosity. 2015-09-04 10:12:30 +02:00
Thulinma
073f3a20fc Make RTP much less spammy. 2015-09-04 09:49:27 +02:00