2650 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
winlin	b903a7b436	for #179, dvr suport vhost/app/stream level control. 2.0.125.	2015-02-25 09:20:11 +08:00
winlin	1cb8e44b1b	fix #304, fix hls bug, write pts/dts error. 2.0.124.	2015-02-24 18:39:31 +08:00
winlin	a3648063d5	fix #179, support dvr http api. 2.0.123.	2015-02-24 17:29:30 +08:00
winlin	691f732204	for #179, update readme.	2015-02-23 19:51:13 +08:00
winlin	d650118988	fix #179, dvr support api to start or stop. 2.0.123	2015-02-23 19:23:32 +08:00
winlin	1246989ea9	for #179, refine dvr, support callback when reap dvr segment.	2015-02-22 10:45:13 +08:00
winlin	849e59b05d	for #179, support http api to start dvr.	2015-02-21 23:09:21 +08:00
winlin	c67a4fdf97	for #179, enable http api crossdomain for dvr api.	2015-02-21 21:17:59 +08:00
winlin	1445086451	for #179, update the metadata of flv dvr file.	2015-02-21 19:14:05 +08:00
winlin	7077b74d03	for #179, add dvr plan append.	2015-02-21 16:52:37 +08:00
winlin	95b4baee7c	for #179, refine dvr code to more simple.	2015-02-21 16:25:04 +08:00
winlin	3d225e1bc7	refine dvr, donot append the flv header.	2015-02-19 20:08:56 +08:00
winlin	a984eeecab	refine dvr, append file when dvr file exists. 2.0.122.	2015-02-19 19:50:10 +08:00
winlin	1102c7a58f	refine pithy print to more easyer to use 2.0.121.	2015-02-19 18:56:21 +08:00
winlin	9d233db27e	fix #133, support push rtsp to srs. 2.0.120.	2015-02-18 22:28:39 +08:00
winlin	a954040d29	for #133, rtsp parse aac from rtp packet.	2015-02-18 13:37:08 +08:00
winlin	0cc693a3b8	for #133, decode the h264 NALU from rtp.	2015-02-18 11:49:42 +08:00
winlin	6a64164985	for #133, show more info about rtp.	2015-02-18 07:27:11 +08:00
winlin	45c0b12958	for #133, finish rtsp sdp, start rtp.	2015-02-17 22:20:47 +08:00
winlin	f14af45413	for #133, alloc and free rtp port.	2015-02-17 21:10:06 +08:00
winlin	d4ceff649f	the join maybe failed, should use a variable to ensure thread terminated. 2.0.119.	2015-02-17 21:03:39 +08:00
winlin	ccc30c70c4	the join maybe failed, should use a variable to ensure thread terminated. 1.0.28.	2015-02-17 21:01:44 +08:00
winlin	40fbfd8560	for #133, rtsp extract tcp/udp listener.	2015-02-17 16:28:28 +08:00
winlin	4807f7850d	for #133, rtsp parse the announce packet, parse the sps/pps and audio sequence header by base64.	2015-02-17 14:16:02 +08:00
winlin	604f4cc57b	for #133, support the rtsp options request and response.	2015-02-16 22:15:59 +08:00
winlin	c0e50265bd	for #133, create rtsp framework.	2015-02-16 14:05:01 +08:00
winlin	e81e090239	for #133, add rtsp listener and handler.	2015-02-15 21:28:31 +08:00
winlin	78f34ad46f	for #304, support config default acodec/vcodec. 2.0.118.	2015-02-15 18:11:24 +08:00
winlin	922150b2cf	for #304, rewrite hls/ts code, support h.264+mp3 for hls. 2.0.117.	2015-02-15 17:43:35 +08:00
winlin	3c813847bd	rewrite the ts remux of hls. 2.0.117	2015-02-15 16:37:28 +08:00
winlin	1ed3e283ab	implements the pat/pmt write ts header.	2015-02-14 23:06:01 +08:00
winlin	e88c1e32ee	always increasing target duration, for #304	2015-02-14 16:30:04 +08:00
winlin	25af6c6847	for #304, use stringstream to generate m3u8, add hls_td_ratio. 2.0.116.	2015-02-12 13:34:59 +08:00
winlin	9a7696a7c2	Merge branch '1.0release' of github.com:winlinvip/simple-rtmp-server into 1.0release	2015-02-12 10:41:55 +08:00
winlin	103ce78b35	Merge branch 'develop' of github.com:winlinvip/simple-rtmp-server into develop	2015-02-12 10:20:47 +08:00
winlin	4cf263876c	update readme	2015-02-12 10:20:33 +08:00
winlin	e1e12e5dba	release 1.0r2	2015-02-12 10:19:19 +08:00
winlin	61b0ee55ed	release 1.0r2	2015-02-12 10:18:45 +08:00
winlin	d4f642504f	update readme	2015-02-12 10:16:06 +08:00
winlin	16bf0a1826	dev code HuKaiqun for 1.0.27.	2015-02-12 10:14:30 +08:00
winlin	f016245e20	dev code ZhouGuoWen for 2.0.115.	2015-02-12 10:12:49 +08:00
winlin	0e783f4548	Update README.md	2015-02-11 12:34:28 +08:00
winlin	d07f09aa0b	Update README.md	2015-02-11 12:28:48 +08:00
winlin	381e88d698	add release code. ZhouGuowen for SRS2.0	2015-02-11 08:52:52 +08:00
winlin	b982b27f6f	add dev code for each release. HuKaiqun for SRS1.0	2015-02-11 08:48:22 +08:00
winlin	e19ee0cb99	for #311, set pcr_base to dts. 2.0.114.	2015-02-10 23:15:43 +08:00
winlin	87519aaae8	fix the avc codec bug, the ibmf format may like the annexb, we must guess only one time. 2.0.114	2015-02-10 22:37:29 +08:00
winlin	66931a8890	try to fix hls problem, print the video packets.	2015-02-10 19:58:24 +08:00
winlin	b8d4f68a69	try to refine hls, always flush video when reap segment.	2015-02-10 19:32:42 +08:00
winlin	5a3cd235fd	refine hls, try to fix the hls ts corrupt problem.	2015-02-10 19:09:31 +08:00