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

262 commits

Author SHA1 Message Date
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
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
c8d1c2006e Pro version equivalent of recent free version changes. 2015-09-03 19:56:27 +02:00
Thulinma
d8051984f2 Merge branch 'development' into LTS_development 2015-09-03 17:55:47 +02:00
Thulinma
096b289cdf Updated --version argument to give more detailed output. 2015-09-03 17:54:20 +02:00
Erik Zandvliet
0913d2607e Working PlayReady/Verimatrix DRM support 2015-09-02 12:09:37 +02:00
Thulinma
58d9e094d7 Removed unused flags from ISMV input. 2015-07-31 23:44:30 +02:00
Thulinma
d0903a6583 Merge branch 'development' into LTS_development 2015-07-22 14:57:27 +02:00
Thulinma
c0f9fd250f Fixed some shared memory buffers not being cleared properly. 2015-07-22 14:55:59 +02:00
Thulinma
1c85037584 Merge branch 'development' into LTS_development 2015-07-22 12:38:32 +02:00
Thulinma
4b9c8cee74 Simplified and optimized FLV input and tag to DTSC conversion. 2015-07-22 12:37:09 +02:00
Thulinma
232fc9ff0a Merge branch 'development' into LTS_development 2015-07-22 09:53:46 +02:00
Thulinma
27240abd06 Clarified debug messages, tweaked verbosity levels. 2015-07-22 09:53:36 +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
dcde050143 Improved debug messages for all MistIn processes, added ability to manually kill MistIn processes. 2015-07-21 22:23:47 +02:00
Thulinma
87676ff669 Merge branch 'development' into LTS_development 2015-07-20 12:52:35 +02:00
Thulinma
7647430cf3 Fixed segfault in MistIn processes being run at high debug levels. 2015-07-11 01:16:00 +02:00
Erik Zandvliet
8024181e55 Made metadatapages larger 2015-06-26 18:05:42 +02:00
Thulinma
97fb7a6188 Merge branch 'development' into LTS_development 2015-06-26 18:04:21 +02:00
Thulinma
9577f99ce0 Added various VERYHIGH level debug messages to buffering, fixed streams with no more than 1 keyframe in each track not working. 2015-06-26 18:04:05 +02:00
Erik Zandvliet
10d7d5fb62 Made metadatapages larger 2015-06-22 14:56:29 +02:00
Thulinma
9e10cc621c Merge branch 'development' into LTS_development 
# Conflicts:
#	src/input/input_buffer.cpp
 2015-05-21 20:17:37 +02:00
Thulinma
6b2a158d9c Backported various fixes by Erik Zandvliet, also added better handling of re-pushes. 2015-05-21 20:15:09 +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
Erik Zandvliet
926dd01995 Fixed removing pages at the right points. 2015-05-20 14:45:38 +02:00
Thulinma
657d7ad7ca Fixed MP4 playback problems with zero-length parts (Mantrics playback issue). 2015-05-11 19:02:00 +02:00
Thulinma
6f933bdb97 Fixed live pushing when more than 2 tracks present. 2015-05-07 12:02:49 +02:00
Thulinma
77dcfc23ad Removed remaining recording code. 2015-04-28 09:39:01 +02:00
Thulinma
c96f0fb9e4 Merge branch 'development' into LTS_development 2015-04-21 17:14:51 +02:00
Thulinma
acc462c281 Minor edit to live buffer semaphore naming. 2015-04-21 17:14:13 +02:00
Thulinma
9b683f6ee3 Merge branch 'development' into LTS_development 2015-04-15 13:49:18 +02:00
Thulinma
73b1f2d75c Prevented deleting live tracks too soon. 2015-04-15 13:49:12 +02:00
Thulinma
818ffbed33 Merge branch 'development' into LTS_development 2015-04-14 17:33:35 +02:00
Thulinma
f86476153e Fixed live semaphore problems. 2015-04-14 17:33:30 +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
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
4bdbd82f66 LTS Commits 2015-04-05 21:38:36 +02:00
Erik Zandvliet
d370ef4eac Working multi-input 2015-04-02 09:56:47 +02:00
Thulinma
cf52b6bbcc Added support for space as a stream separator character. 2015-03-13 01:05:01 +01:00
Thulinma
39f06dc99a Added MP3 input support (coded by Erik Zandvliet) 2015-03-10 12:52:44 +01:00
Thulinma
96328cd035 Changed default buffer size to 50s from 30s 2015-03-06 12:48:23 +01:00