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

391 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thulinma
2d82dd6c2c Merge branch 'master' of github.com:DDVTECH/DMS 2012-05-01 23:56:26 +02:00
Thulinma
1db7ead3c0 Added support for pulling media files through ffmpeg, added MistFLV2DTSC converter to binaries. 2012-05-01 23:56:13 +02:00
Thulinma
76d7acfbb7 Fixed JSON lib automatic conversion from string to long long int. 2012-05-01 15:10:59 +02:00
Thulinma
332f399067 Fixed some issues with empty values in JSON::Value::toString() 2012-05-01 14:42:52 +02:00
Thulinma
663ffb74eb JSON reading fixed. I don't know why this wasn't noticed before. :-) 2012-05-01 14:28:31 +02:00
Thulinma
f91d7fa317 Merge branch 'DTSC' 
Conflicts:
	server.html
 2012-04-28 15:04:06 +02:00
Thulinma
505ed38a50 Include basic embed code generation in the HTTP connector. Closes #23, #24 and #25. 2012-04-28 14:58:49 +02:00
Thulinma
8b15fd52c4 Fixed Controller compiling, upped socket lib verbosity, fixed JSON::Value null -> string convert, fixed Makefile install command. 2012-04-28 00:51:21 +02:00
Thulinma
fffcf598c4 Merge branch 'DTSC' of github.com:DDVTECH/DMS into DTSC. Forced to Jaron's style, for now. May change later. 
Conflicts:
	Buffer/Makefile
	Connector_HTTP/Makefile
	Connector_RAW/Makefile
	Connector_RTMP/Makefile
 2012-04-27 21:11:10 +02:00
Thulinma
2701a0be46 Stable multi-user buffer and re-enabled push support. Renamed DDV_->Mist. Closes #25 2012-04-27 21:07:26 +02:00
Erik Zandvliet
fed61efd80 Merge branch 'DTSC' of github.com:DDVTECH/DMS into DTSC 2012-04-23 19:00:57 +02:00
Thulinma
f615427c95 A few bugfixes and improvements in the FLV2DTSC code. Also, moved conversion logic to flv_tag.cpp/h instead of keeping it inside the conversion tool itself. 2012-04-17 21:33:43 +02:00
Erik Zandvliet
74bbd112da Merge branch 'DTSC' of github.com:DDVTECH/DMS into DTSC 2012-04-17 11:13:12 +02:00
Thulinma
8294656515 Minor fixes in config.cpp 2012-04-17 11:11:01 +02:00
Erik Zandvliet
61a3fb8140 Merge fix 2012-04-17 10:46:29 +02:00
Thulinma
106adcffb8 RTMP Connector upgrade to DTSC - push mode doesn't convert to DTSC yet (it will tomorrow) and it is still untested - but should work. 2012-04-15 01:54:39 +02:00
Thulinma
e7bcbc4f9f Several major bugfixes in FLV handling, multithreaded buffer now actually works (still crashes when multiple users connect, though... needs further "tweaking"), updated toolset. 2012-04-10 16:26:30 +02:00
Thulinma
d20c27d020 First multithreaded version of the Buffer process. 2012-04-08 22:56:51 +02:00
Thulinma
7f979c7457 Restructured some for clarity, got rid of the crappy JSON library, general awesomeness. 2012-04-07 23:45:03 +02:00
Thulinma
e415264a11 Merge branch 'master' into DTSC 
Conflicts:
	Buffer/main.cpp
	server.html
 2012-04-04 15:02:05 +02:00
That-Guy
6f1916ebfd Merge branch 'master' of github.com:DDVTECH/DMS 2012-04-03 21:56:59 +02:00
Thulinma
8b0fea3add Merge branch 'master' of github.com:DDVTECH/DMS 
Conflicts:
	Buffer/main.cpp
 2012-04-03 20:35:55 +02:00
Thulinma
ee41aa7cd0 Added DTSC rate limiter. Closes #12 2012-03-30 13:20:08 +02:00
Thulinma
a2adfdcd7d Merge branch 'master' into DTSC 
Conflicts:
	Buffer/main.cpp
 2012-03-27 12:57:14 +02:00
Thulinma
aaebc563e8 Fixed several FLV-related server bugs. 2012-03-12 15:49:19 +01:00
Erik Zandvliet
92b475e71b Merge branch 'master' of github.com:DDVTECH/DMS into DTSC 2012-03-12 15:48:58 +01:00
Erik Zandvliet
524ae68f11 Merge branch 'DTSC' of github.com:DDVTECH/DMS into DTSC 2012-03-12 15:47:44 +01:00
Thulinma
dbd6cbc500 Added closing of file descriptors to piped process starter (gets rid of ffmpeg junk output), added some extra debugging output to DDV Controller. 2012-03-11 13:48:03 +01:00
Lekensteyn
b08ced33e8 No need for listening on udp port 65535 2012-03-08 23:11:28 +01:00
Thulinma
4c3ce2d837 Fixed DTSC info comment. 2012-03-02 17:48:20 +01:00
Lekensteyn
a2eae38e6a Improve http argument parsing for special cases 2012-02-25 23:46:39 +01:00
Lekensteyn
a491b59fe8 According to the JSON spec, null is NOT valid array/object 2012-02-25 18:23:46 +01:00
Thulinma
53c6d582ba Fix DTSC tools compiling 2011-12-05 15:35:10 +01:00
Thulinma
68e4697a29 Attempt to fix FLV 2011-12-05 15:03:27 +01:00
Thulinma
63bf65952b Almost working HTTP connector - mid-rewrite, running into some issues, sleepy, going to bed... 2011-12-05 15:03:27 +01:00
Thulinma
ae48440f4b Buffer stabilized 2011-12-05 14:59:46 +01:00
Thulinma
553596c1e3 Finished FLV2DTSC code, fixed a lot of bugs in new code, added DTSC info tool. 2011-12-05 14:57:09 +01:00
Thulinma
67bf3b8320 First compiling version of DTSC-powered Buffer. Merged DTSC and DTMI into DTSC for ease of use. Todo: FLV2DTSC executable, DTSC support in all connectors... 2011-12-05 14:56:22 +01:00
Thulinma
67c92852b5 Updated sockets lib with buffers for easy sending/receiving and such. 2011-11-27 02:22:04 +01:00
Thulinma
2f5d5fcecb Summerizing of stats in Buffer done - closes #2 2011-11-26 04:27:04 +01:00
Thulinma
ff4e2aa285 Implemented stats logging on the connector level - closes #1 2011-11-26 03:16:28 +01:00
Thulinma
0fb103a3b4 Added byte counters to sockets, needed for issue #1 2011-11-26 02:31:56 +01:00
Thulinma
f9dcedb0e1 Re-fix for HTTP lib, fixed typo in Controller. 2011-10-31 19:48:29 +01:00
Thulinma
1301b7a919 Fixes config util for nonsection applications, attempt to fix DDV_Controller process spawning. 2011-10-31 18:24:01 +01:00
Thulinma
2b65a16565 Fixed HTTP util parsing of variables. 2011-10-31 15:53:13 +01:00
Thulinma
2468bd288b Better automatic version numbering (now for all processes), added -v switch for version display to all processes. 2011-10-31 15:23:46 +01:00
Thulinma
3f3d6c0222 Fixes 2011-10-18 10:15:42 +02:00
Thulinma
dd9eb3522a Added socket functions for connecting over TCP - fixed some stuff, added uplink support to server binary. 2011-10-18 05:17:50 +02:00
Thulinma
672aeb6670 Fixed a bug 2011-10-18 03:44:41 +02:00
Thulinma
ad39aafa89 Moved new gearbox to better dir, some cleanup 2011-10-17 21:21:38 +02:00