204 commits

Author	SHA1	Message	Date
winlin	49b880d4ce	refine comments	2016-09-09 14:18:50 +08:00
winlin	eb915413ad	Merge branch '2.0release' into develop	2016-09-09 14:14:22 +08:00
winlin	0015b303a6	librtmp: refine comment for NALU process.	2016-09-09 14:14:12 +08:00
winlin	17df61724d	Merge branch '2.0release' into develop	2016-09-08 19:56:17 +08:00
winlin	7aaa74b9e0	TODO: FIXME: for librtmp, must group NALUs to frame.	2016-09-08 19:56:06 +08:00
winlin	5d5fa7204d	Merge branch '2.0release' into develop	2016-08-18 12:22:30 +08:00
winlin	d919668b61	don't ignore aud	2016-08-18 12:22:04 +08:00
winlin	bf22acd689	Merge branch '2.0release' into develop	2016-08-18 11:29:22 +08:00
winlin	a4bb03b9d6	ignore other 264 frame except sps,pps,idr,nonidr	2016-08-18 11:27:11 +08:00
winlin	31a1b7bed2	Merge branch '2.0release' into develop	2016-08-10 22:30:05 +08:00
winlin	304ff02aef	default to 30s timeout for librtmp	2016-08-10 22:29:56 +08:00
winlin	14760003ba	merge from 2.0	2016-08-10 22:05:21 +08:00
winlin	e00928557e	fix the timeout for librtmp	2016-08-10 22:04:01 +08:00
winlin	f8358da316	refine ingester log.	2016-01-13 16:20:05 +08:00
winlin	f1e7e9d933	support gmd. change work_dir. hourglass. add utilies.	2016-01-08 13:58:19 +08:00
winlin	d0c74fa7cd	update 2015 to 2016	2015-12-23 11:35:40 +08:00
winlin	01c46bdbfd	rename org simle-rtmp-server to ossrs	2015-11-11 10:45:45 +08:00
winlin	1ffd5fd455	rename org simple-rtmp-server to ossrs	2015-11-11 10:37:50 +08:00
winlin	8cec06e898	merge srs2, use srs_freepa for array	2015-11-02 11:05:39 +08:00
winlin	2af7749771	for #515, use srs_freepa to free the array.	2015-11-02 11:02:27 +08:00
winlin	d9f991ed2f	use system utility for string finds	2015-10-23 14:42:02 +08:00
winlin	d8f18aee37	use the right int type for port.	2015-09-24 18:33:07 +08:00
winlin	df6ac8842c	rename rtmp utility to protocol utility	2015-09-22 09:11:07 +08:00
winlin	168625dce2	rename rtmp amf0 to protocol amf0.	2015-09-22 09:05:21 +08:00
winlin	0e52fc6d5b	rename SrsStream to SrsBuffer	2015-09-22 08:57:31 +08:00
winlin	a4f51564db	rename kernel stream to buffer	2015-09-22 08:48:55 +08:00
winlin	a242aa35dc	add pid to srs rtmp dump	2015-08-24 16:00:11 +08:00
winlin	575a698820	fix #380, srs-librtmp send sequence header when sps or pps changed.	2015-08-20 14:20:49 +08:00
winlin	ec87dd9cd6	refine code for srs rtmp dump	2015-08-19 19:02:33 +08:00
winlin	170ad05148	add gfps and nb_packets	2015-08-19 15:31:19 +08:00
winlin	e7714cd445	add packets interval in ms to set the right send_min_interval	2015-08-19 15:14:26 +08:00
winlin	ae37fa8f3e	use send_min_interval for stream control. 2.0.183	2015-08-14 11:13:40 +08:00
winlin	d103557a8b	merge the rtmp sdk to stack.	2015-06-13 16:04:59 +08:00
winlin	ac13817aae	update donation	2015-05-08 07:04:31 +08:00
winlin	b23e196f20	migarate from winlinvip to srs org, move the copyright to srs org.	2015-04-29 17:38:23 +08:00
winlin	115daa3cc1	migarate from winlinvip to srs org	2015-04-29 17:06:32 +08:00
winlin	8fbc6526bb	for #383, refine code to support mix correct algorithm.	2015-04-15 16:17:52 +08:00
winlin	bd77f995bf	ignore the unknown flv tag.	2015-04-09 12:35:17 +08:00
winlin	61d5b78ae5	refine the h264 parser, one ts message should parsed to one rtmp/flv message.	2015-04-04 15:53:36 +08:00
winlin	02addf61f7	fix #302, remove the thread unsafe code, no static.	2015-03-23 21:21:36 +08:00
winlin	f69fa7273b	fix #302, remove the thread unsafe code, no static.	2015-03-23 21:19:04 +08:00
winlin	bbac2348db	for #354, remove the double underscore functions and variables.	2015-03-21 11:55:28 +08:00
winlin	a15ce1147f	for #155, fix all warnings for mac.	2015-03-13 12:53:01 +08:00
winlin	16afe7ddbb	fix #250, support push MPEGTS over UDP to SRS. 2.0.111	2015-01-31 23:20:00 +08:00
winlin	4246be92c9	for #250, merge avc to codec. use queue to dequeue.	2015-01-31 21:16:42 +08:00
winlin	70c8fe13c4	for #250, support h264 video for push mpegts over udp. 2.0.110	2015-01-31 19:46:55 +08:00
winlin	a4ba40952a	for #250, rename rtmp to protocol dir.	2015-01-23 10:07:20 +08:00
winlin	a1f887f46f	refine code, move onMetaData to consts.	2015-01-17 13:29:11 +08:00
winlin	04aa6f8296	drop script data except the onMetaData packet.	2015-01-17 13:23:30 +08:00
winlin	44f5efda21	refine the print info.	2015-01-07 15:46:00 +08:00