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

285 commits

Author SHA1 Message Date
Thulinma
0ca63d1440 Merge branch 'development' into LTS_development 
# Conflicts:
#	lib/stream.cpp
#	src/input/input.cpp
 2017-06-22 14:07:54 +02:00
Thulinma
25699ef8b2 Added stream status shared memory page (temporary system) 2017-06-22 14:03:35 +02:00
Thulinma
290d01a47f Merge branch 'development' into LTS_development 2017-06-19 20:37:45 +02:00
Erik Zandvliet
4de8932fe0 Fix in mp3 seeking code to correctly set the timestamp. 2017-06-19 20:37:25 +02:00
Thulinma
de4fea643a Merge branch 'development' into LTS_development 
# Conflicts:
#	src/output/output_progressive_flv.cpp
#	src/output/output_rtmp.cpp
 2017-06-19 12:46:41 +02:00
Thulinma
cef78b7d08 PCM support in Flash-based protocols 2017-06-19 12:40:32 +02:00
Thulinma
1a0548ec68 Merge branch 'development' into LTS_development 
# Conflicts:
#	src/input/input.cpp
#	src/input/input.h
 2017-06-09 20:41:48 +02:00
Thulinma
920efe0b26 Updated serve-type inputs to obey "always on" stream config setting, push inputs no longer counted as viewers. 2017-06-09 20:40:03 +02:00
Thulinma
26f4d1fdee MistInBuffer no longer boots if the process starting it has no data to fill it with. Optimized and simplified HTTP internal output. 2017-06-09 20:35:06 +02:00
Thulinma
bef46f969c Merge branch 'development' into LTS_development 
# Conflicts:
#	lib/stream.cpp
#	lib/stream.h
#	src/input/input.cpp
#	src/output/output_http_internal.cpp
 2017-06-09 20:34:57 +02:00
Thulinma
26f74accdf MistInBuffer no longer boots if the process starting it has no data to fill it with. Optimized and simplified HTTP internal output. 2017-06-09 20:31:20 +02:00
Thulinma
6bca77d758 Merge branch 'development' into LTS_development 2017-05-23 21:36:55 +02:00
Thulinma
24a1744b7e Input now prints message and aborts cleanly when pull lock could not be opened. 2017-05-23 21:36:49 +02:00
Thulinma
fac86bce49 Updated MistInAV in line with recent libavformat deprecations 2017-05-16 14:52:33 +02:00
Thulinma
3a4f990143 Removed useless variables in input class 2017-05-15 12:26:38 +02:00
Thulinma
5ed7c7ab22 Fixed TS input 2017-05-15 12:26:27 +02:00
Thulinma
51209e816c Removed useless variables in input class 2017-05-15 12:26:17 +02:00
Thulinma
2ba1dac4cd TS UDP input error message fix + stop if buffer shuts down fix 2017-05-15 11:15:11 +02:00
Thulinma
3cba6f011f Merge branch 'development' into LTS_development 2017-05-13 23:43:06 +02:00
Thulinma
41842227fa Added support for Opus in Ogg input 2017-05-13 23:42:32 +02:00
Thulinma
a178fd206d MistInAV X3 speedup + fixed VoD/live flag 2017-05-13 22:13:52 +02:00
Thulinma
401c323564 Fixed HLS input VoD 2017-05-12 15:39:21 +02:00
Thulinma
56c21b5ba6 Style enforcement 2017-05-12 12:56:37 +02:00
Balder
6811b54186 le fixes by me, all me none of it was Erik 2017-05-12 12:56:37 +02:00
Erik Zandvliet
2db54b38fc HLS input cleanup/restructure 2017-05-12 12:56:37 +02:00
Ramoe
a9c5334833 Added HLS input 2017-05-12 12:56:37 +02:00
Ramoe
30beda61ce Changed input boot sequence to allow for finer control 2017-05-12 12:56:37 +02:00
Thulinma
0c87ba1f7b Merge branch 'development' into LTS_development 
# Conflicts:
#	src/input/input.cpp
 2017-05-12 12:48:58 +02:00
Thulinma
260894468e Changed input boot sequence to allow for finer control 2017-05-12 12:47:15 +02:00
Thulinma
2717c21d4e Merge branch 'development' into LTS_development 
# Conflicts:
#	src/output/output_progressive_mp4.cpp
 2017-03-16 11:16:08 +01:00
Thulinma
43e82f8c87 Fix for Windows semaphore problem in live streams 2017-03-16 11:14:59 +01:00
Thulinma
8a31176041 Merge branch 'development' into LTS_development 2017-03-13 14:49:39 +01:00
Thulinma
b9dab56607 Fixes to MP3 input seeking 2017-03-13 14:49:31 +01:00
Thulinma
cab87a6425 Updated triggers, implemented LIVE_BANDWIDTH trigger 2017-03-10 11:41:52 +01:00
Thulinma
8b62c1c664 Merge branch 'development' into LTS_development 2017-03-07 17:07:05 +01:00
Thulinma
0ea100758d Added FLV::seekToTagType function for fast FLV seeking, now used in MistInFLV 2017-03-07 17:05:24 +01:00
Thulinma
ef3f4aaf1a Unified all push-in-enabled outputs into a single style/function of accepting incoming pushes 2017-02-28 14:08:08 +01:00
Thulinma
daa0833970 Merge branch 'development' into LTS_development 
# Conflicts:
#	src/output/output.h
#	src/output/output_rtmp.cpp
 2017-02-28 14:07:18 +01:00
Thulinma
9a783a782d Unified all push-in-enabled outputs into a single style/function of accepting incoming pushes 2017-02-28 14:05:37 +01:00
Thulinma
88749d2259 Added sourceURI to stream metadata structures 2017-02-28 13:59:38 +01:00
Thulinma
ec240fb1af Unified all input types into a single flexible type 2017-02-28 13:58:20 +01:00
Thulinma
e352a2fc38 Merge branch 'development' into LTS_development 2017-02-28 13:58:09 +01:00
Thulinma
8866b299fb Unified all input types into a single flexible type 2017-02-28 13:57:59 +01:00
Thulinma
dadb1ebde8 Merge branch 'development' into LTS_development 
# Conflicts:
#	src/output/output.cpp
#	src/output/output_http_internal.cpp
 2017-01-10 12:36:53 +01:00
Thulinma
c6377085f0 Added shutdown reason message in stream-mode inputs 2017-01-10 12:33:30 +01:00
Thulinma
8f38872ffc Fixed DTSC input bug with ping commands 2017-01-10 12:33:24 +01:00
Thulinma
1fde08e333 Merge branch 'development' into LTS_development 
# Conflicts:
#	src/input/input.cpp
 2016-11-18 15:34:48 +01:00
Thulinma
440596c117 Added crash handler for Pull-mode inputs 2016-11-18 15:33:25 +01:00
Thulinma
2aaf6d10f4 Added new generalized input keepRunning() function, FLV input now shuts down if the file is updated file it is active, added 15 second DTSH regeneration window 
# Conflicts:
#	src/input/input.cpp
 2016-11-14 11:34:58 +01:00
Thulinma
3f14db4b12 Merge branch 'development' into LTS_development 
# Conflicts:
#	src/input/input.cpp
#	src/output/output.cpp
 2016-11-14 11:29:24 +01:00