917 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
winlin	fdad7c25f0	fix isse #35: the gettimeofday jitter, log warn message	2014-03-21 17:56:27 +08:00
winlin	4f284b20f0	drop ts segment when duration is too small	2014-03-21 17:35:27 +08:00
winlin	5758551508	support hls republish	2014-03-21 17:10:24 +08:00
winlin	f25c6558a5	write pid to ./objs/srs.pid.	2014-03-21 15:45:34 +08:00
winlin	0686b8fa5a	update readme, add product wiki link	2014-03-21 14:02:14 +08:00
winlin	a0c0c94cf0	refine conf, add comments for other listen type	2014-03-21 14:00:26 +08:00
winlin	2cebaff9d8	refine hls, ts temp file use ext .tmp	2014-03-21 13:10:47 +08:00
winlin	02e27c7d5a	update readme, add hls(audio-only) support to readme. update sample flv from h264+mp3 to h264+aac	2014-03-21 12:19:55 +08:00
winlin	dbf642723f	update readme, add hls(audio-only) support to readme. update sample flv from h264+mp3 to h264+aac	2014-03-21 11:38:02 +08:00
winlin	8600c0ebe9	Merge branch 'master' of github.com:winlinvip/simple-rtmp-server	2014-03-20 18:56:48 +08:00
winlin	e5eb8538a3	support pure audio hls. change to 0.9.24	2014-03-20 18:56:23 +08:00
winlin	e0fb1029c9	support pure audio hls. change to 0.9.24	2014-03-20 18:55:45 +08:00
winlin	b708f588fc	refine the hls module, clear logic dead code, rename TSCache to HlsCache, M3u8Muxer to HlsMuxer. that is, make it to more readable.	2014-03-20 18:19:08 +08:00
winlin	2036cef43b	Merge branch 'master' of github.com:winlinvip/simple-rtmp-server	2014-03-20 15:16:28 +08:00
winlin	ef7853d7f7	fix demo bug, remove the api server static-dir when link to nginx	2014-03-20 15:15:46 +08:00
winlin	6bc18f2e44	fix script generate auto header bug, always create file	2014-03-20 14:23:36 +08:00
winlin	8239174e97	update configure, change to 0.9.23	2014-03-20 14:11:36 +08:00
winlin	238349b0c0	update configure, change to 0.9.23	2014-03-20 14:08:53 +08:00
winlin	6374fa1383	simple default configure, only enalbe ssl+hls, disable ffmpeg/nginx/utest/gperf/gprof	2014-03-20 13:30:06 +08:00
winlin	3fc133bded	update readme, add vn/an for ffmpeg	2014-03-20 11:20:12 +08:00
winlin	c63ad48893	Merge branch 'master' of github.com:winlinvip/simple-rtmp-server	2014-03-20 09:41:13 +08:00
winlin	822143b500	fix bug of build script	2014-03-20 09:26:48 +08:00
winlin	a2c5075002	update comments for handshake.	2014-03-19 23:40:49 +08:00
winlin	a470330383	finish utest for handshake.	2014-03-19 23:34:50 +08:00
winlin	6b84a5e14c	change to 0.9.22	2014-03-19 22:51:04 +08:00
winlin	b7d40b5aba	support vn/an to disable video/audio, for radio streaming	2014-03-19 22:45:58 +08:00
winlin	747bbd988e	change to 0.9.21, refine complex handshake, client/server support complex handshake.	2014-03-19 17:15:52 +08:00
winlin	da93b6fe99	add complex handshake utest	2014-03-19 17:14:42 +08:00
winlin	491ea4b630	support client complex handshake with server	2014-03-19 16:30:43 +08:00
winlin	841f0f8899	change to 0.9.19, verify the s1/s2/c2, refine the handshake.	2014-03-19 14:58:29 +08:00
winlin	152d3539d8	add s1 validation for client/server	2014-03-19 13:10:25 +08:00
winlin	12445174e7	add option --static, to static link for arm	2014-03-19 12:39:09 +08:00
winlin	efa22074be	always use static link, for manually build arm, and x86/64 use static link is ok.	2014-03-19 12:18:48 +08:00
winlin	e0e451b680	add utest support for arm	2014-03-19 11:24:25 +08:00
winlin	d89d16ca1e	print the system info when startup main	2014-03-19 10:51:33 +08:00
winlin	2eeb289c2f	assert system is little-endian	2014-03-19 10:38:02 +08:00
winlin	b58ab508f9	add rtmp handshake utest, for arm to finger out the bug	2014-03-19 00:47:10 +08:00
winlin	1c055e7424	add log for ssl disabled.	2014-03-18 17:44:43 +08:00
winlin	1ffbdbc098	refine log, donot show error when client gracefully close it	2014-03-18 16:17:52 +08:00
winlin	b52a051d80	refine readme, confs	2014-03-18 15:38:34 +08:00
winlin	a0b747621e	update srs.conf, add comments to see full.conf	2014-03-18 15:29:27 +08:00
winlin	b36338853a	refine the conf files, rename srs.conf to demo.conf	2014-03-18 15:13:25 +08:00
winlin	d67edf631b	update readme, add ubuntu12 to test list	2014-03-18 13:04:06 +08:00
winlin	c85dde7f3f	substitute all TAB with 4spaces.	2014-03-18 11:32:58 +08:00
winlin	e5770b10b1	refine the colorful log for srs. remove the log when client close.	2014-03-18 11:28:22 +08:00
winlin	8029b7464a	Merge pull request #28 from wenjiegit/master ... merge from wenjie.zhao for colorful log.	2014-03-18 11:00:00 +08:00
winlin	618f6f52ae	fix bug of librtmp sample on x86/x64 platform	2014-03-17 12:06:58 +08:00
winlin	1a3142d23b	fix bug of librtmp sample build for arm, use static link	2014-03-17 12:00:21 +08:00
winlin	618579e484	refine srs build for arm, support librtmp sample	2014-03-17 11:52:23 +08:00
winlin	a29bd05c0f	refine build script	2014-03-17 11:32:16 +08:00