202 commits

Author	SHA1	Message	Date
winlin	2fcd3972c1	for #299, refine the encoder object name	2017-02-12 21:50:02 +08:00
winlin	d612a21bad	for #299, refine audio codec object name	2017-02-12 20:46:24 +08:00
winlin	caf69f193d	for #299, refine the codec object name	2017-02-12 20:38:39 +08:00
winlin	4fe79a1025	for #738, fix the audio sample offset error.	2017-02-05 20:27:37 +08:00
winlin	253ac40312	for #738, parse avcc/sps/pps/asc from mp4.	2017-02-04 14:57:07 +08:00
winlin	9d21a8bb33	for #738, use reader and seeker for mp4 demuxer to seek for general mp4(ftyp-mdat-moov).	2017-02-03 22:49:19 +08:00
winlin	34a8eb6113	for #738, add srs ingest mp4 tool	2017-01-31 20:43:48 +08:00
winlin	d3bb8b6a86	for #742, refine the io interfaces.	2017-01-30 19:59:59 +08:00
winlin	bb5bd0ee1c	include for uintxx_t	2017-01-30 17:38:30 +08:00
winlin	b16ab038ce	for #742, refine the u_intxx_t to uintxx_t	2017-01-30 17:32:18 +08:00
winlin	011ac4f6a9	for #738, add mp4 demuxer to librtmp	2017-01-30 17:19:07 +08:00
winlin	136a7ef488	for #299, refine docs.	2017-01-26 17:28:49 +08:00
winlin	8acb99f96c	refine comments for librtmp	2017-01-18 16:59:19 +08:00
winlin	0e6f7e66f0	add srs_rtmp_free_packet for srs-librtmp	2017-01-18 16:31:41 +08:00
winlin	7acc3aca16	refine hijack io for srslibrtmp	2017-01-18 16:23:59 +08:00
winlin	e8c48ac8f8	merge srs2, use specific error code for dns resolve	2017-01-18 16:05:33 +08:00
winlin	60be29f324	fix #750, use specific error code for dns resolve. 2.0.231	2017-01-18 16:03:57 +08:00
winlin	3fe338d1c5	for #742, use ms for application clock tbn.	2017-01-17 12:25:30 +08:00
winlin	7ac932cfa0	update to 2013-2017	2016-12-16 11:57:25 +08:00
winlin	77bca7cc05	Merge branch '2.0release' into develop	2016-09-13 18:08:19 +08:00
winlin	53d2eb5e02	fix librtmp get bytes bug.	2016-09-13 18:08:12 +08:00
winlin	8a4e241eec	merge from srs2	2016-09-09 14:29:33 +08:00
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	d68a459198	Merge branch '2.0release' into develop	2016-08-10 22:13:30 +08:00
winlin	02fb0779be	fix the microsec calc bug for librtmp	2016-08-10 22:13:24 +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	82ff05c1d4	rename rtmp io to protocol io	2015-09-22 09:07: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