Commit graph

767 commits

Author SHA1 Message Date
Thulinma
9b6e220b88 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
4cd8641e50 First multithreaded version of the Buffer process. 2012-04-08 22:56:51 +02:00
Thulinma
e3ecdb1e4b Restructured some for clarity, got rid of the crappy JSON library, general awesomeness. 2012-04-07 23:45:03 +02:00
That-Guy
2325d3be5a added embed page and temporary text (#17) 2012-04-05 00:36:14 +02:00
That-Guy
bfd12c723d renamed server-rel to server, added overview stats, placeholder bugfix (#17, 1h) 2012-04-04 21:18:46 +02:00
Thulinma
022ff26205 Merge branch 'master' into DTSC
Conflicts:
	Buffer/main.cpp
	server.html
2012-04-04 15:02:05 +02:00
That-Guy
833d556388 finished server-rel (delete confirmation) and embedded jQuery js (#17) 2012-04-04 14:42:35 +02:00
That-Guy
552fe630eb overview, limits for streams and streams finished (#17, 3h) 2012-04-04 00:14:32 +02:00
That-Guy
26c957f12a Merge branch 'master' of github.com:DDVTECH/DMS 2012-04-03 21:56:59 +02:00
That-Guy
e201b544ce part of streams and layout fixes (#17, 2h) 2012-04-03 21:56:35 +02:00
Thulinma
80ac6ff8c5 Merge branch 'master' of github.com:DDVTECH/DMS
Conflicts:
	Buffer/main.cpp
2012-04-03 20:35:55 +02:00
That-Guy
776ffcb296 standalone server page pixel fixes and log purging (#17, 1h) 2012-04-03 12:22:39 +02:00
That-Guy
466ba4cf65 new jquery version and several fixes 2012-04-03 11:22:42 +02:00
That-Guy
0c6e8cac8d protocols and selector for streams (#17, 1h) 2012-04-03 09:55:34 +02:00
That-Guy
7a13a54a26 limits and part protocols new sssp (#17, 2h) 2012-04-02 23:33:14 +02:00
That-Guy
f06e0e9219 standalone server new layout: login/out, logs and general style (#17, 3h, +6h) 2012-04-02 17:20:36 +02:00
That-Guy
783f1587d0 rel-sever layout and begin log page 2012-03-31 18:04:22 +02:00
Thulinma
77af63ebe4 Added DTSC rate limiter. Closes #12 2012-03-30 13:20:08 +02:00
Thulinma
f01c686997 Fix compiling of DTSC version branch. 2012-03-27 14:07:10 +02:00
Thulinma
e080363196 Merge branch 'master' into DTSC
Conflicts:
	Buffer/main.cpp
2012-03-27 12:57:14 +02:00
That-Guy
f3372b9e51 several fixes for non-complete JSON settings file (#17, 1h) 2012-03-22 16:06:39 +01:00
That-Guy
b58742e24d server.html check commit 2012-03-22 15:22:57 +01:00
Thulinma
05dd8b41c5 Merge branch 'DTSC' of github.com:DDVTECH/DMS into DTSC 2012-03-22 15:16:17 +01:00
Thulinma
3a96785cdd Default port set in server control page. 2012-03-22 13:36:34 +01:00
That-Guy
5c2623ae48 added log reader to server.html and fixed stream group bug (#17, done, 0.5h) 2012-03-18 21:27:28 +01:00
Lekensteyn
abb6d27350 WIP for RTSP support (GH-8) 2012-03-17 16:57:23 +01:00
Lekensteyn
cb51c11149 Fix compile/syntax errors in HTTP connector (guessed) 2012-03-17 16:27:15 +01:00
Lekensteyn
856474bf0f Specify null IP address for connection, rfc2326 C.1.7 2012-03-16 17:31:38 +01:00
Lekensteyn
7e3f96d14a Document sdp response for RTSP 2012-03-16 17:13:23 +01:00
Lekensteyn
ad31299def RTSP: Choose random port, extra debugging messages 2012-03-14 18:23:27 +01:00
Lekensteyn
b068d53e2a Fix build errors due to missing dtsc dependency 2012-03-14 18:08:23 +01:00
Erik Zandvliet
ff15e6c1a6 "Added documentation to Connector_RTSP/main.cpp for #8" 2012-03-13 08:42:37 +01:00
Thulinma
5fb7e235b5 Fixed several FLV-related server bugs. 2012-03-12 15:49:19 +01:00
Erik Zandvliet
53588811a7 Merge branch 'master' of github.com:DDVTECH/DMS into DTSC 2012-03-12 15:48:58 +01:00
Erik Zandvliet
8c85c8860e Merge branch 'DTSC' of github.com:DDVTECH/DMS into DTSC 2012-03-12 15:47:44 +01:00
Erik Zandvliet
c63e018105 Fix bug in buffer, new stuff for TS #16 5.5h 2012-03-12 15:47:29 +01:00
Thulinma
32880330fd Improved DDV_Controller makefile, fixed a bug. (Hoi Niels!) 2012-03-12 11:47:49 +01:00
Thulinma
cd9ed87802 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
Thulinma
a3e1bc73ae Fix loops when connections die with horrible timing. 2012-03-11 12:26:24 +01:00
Lekensteyn
827a1b8c36 No need for listening on udp port 65535 2012-03-08 23:11:28 +01:00
Lekensteyn
93edbf0fb9 Fix RTSP compile issues and add howto for running it correctly
pkg-config is wonderful, but .pc suppliers just have to write correct files...
2012-03-08 00:08:25 +01:00
That-Guy
1b357f1f1b Build limits in tables instead of plain text (#17) 2012-03-06 09:28:35 +01:00
That-Guy
2dea2daee6 Finished last parts of server.html; needs testing (#17, 2.2h) 2012-03-05 03:05:42 +01:00
Thulinma
09cb6b3c31 Fixed DTSC info comment. 2012-03-02 17:48:20 +01:00
That-Guy
45c5fee28c Fixed several bugs, finished limits (#17, 1.5h) 2012-02-29 22:23:20 +01:00
That-Guy
c5ae10bb33 Part of streams, channel and limits (#17, 1h, +1h) 2012-02-27 22:57:24 +01:00
That-Guy
050152b7b9 Splitted filler functions, added protocol settings (#17, 1h, +1h) 2012-02-26 21:26:18 +01:00
Lekensteyn
5afb962165 Improve http argument parsing for special cases 2012-02-25 23:46:39 +01:00
Lekensteyn
e3082feedb According to the JSON spec, null is NOT valid array/object 2012-02-25 18:23:46 +01:00
Lekensteyn
b441609817 Fix build error of DDV_Controller, gitignore it 2012-02-25 18:23:46 +01:00