8064 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
winlin	3732554844	remove the xcode state.	2015-03-11 14:56:03 +08:00
winlin	1ad0c847ce	fix http parse bug	2015-03-11 14:55:46 +08:00
winlin	f247ac9daf	fix the http parse bug.	2015-03-11 14:48:51 +08:00
wenjie.zhao	07d8f060eb	refine annotation	2015-03-11 14:36:28 +08:00
wenjie.zhao	570c0d66bd	fix path issue.	2015-03-11 14:34:00 +08:00
wenjie.zhao	066158de61	Merge branch 'winlinvip-develop' into develop	2015-03-11 14:19:35 +08:00
wenjie.zhao	e57bda8908	Merge code. ... Conflicts: trunk/configure trunk/src/app/srs_app_source.cpp trunk/src/kernel/srs_kernel_error.hpp	2015-03-11 14:18:09 +08:00
wenjie.zhao	d4198ee8ba	add hds supported.	2015-03-11 13:34:58 +08:00
winlin	5370493140	add ingest to mac.dev conf.	2015-03-11 13:24:14 +08:00
winlin	74d6f27519	update donation, add yefayang.	2015-03-11 11:39:43 +08:00
winlin	24616e15b5	remove the code for xcode, not required.	2015-03-10 18:33:32 +08:00
winlin	b3aed2cb59	fix the bug of configure.	2015-03-10 18:18:47 +08:00
winlin	f9767c91b5	fix configure bug, refine code for stream caster.	2015-03-10 18:07:43 +08:00
winlin	6c11207e28	fix http ts bug, the adts use id=1 which indicates the aac encoding.	2015-03-10 17:58:29 +08:00
winlin	5c3c38684b	fix the bug of flv stream, metadata type should be 18	2015-03-10 17:04:02 +08:00
winlin	0ff49fd299	for #155, debug srs on xcode.	2015-03-10 13:13:31 +08:00
winlin	db7ddfd510	fix #155, #135, support osx(darwin) for mac pro. 2.0.137.	2015-03-10 12:50:27 +08:00
winlin	20fb5f3e8e	modify the colorful bash for osx.	2015-03-09 23:20:12 +08:00
winlin	b0953c1d3a	add comments of audio profile supported by srs.	2015-03-08 20:02:43 +08:00
winlin	5143e3a58d	fix #316, http api provides stream/vhost/srs/server bytes, codec and count. 2.0.136	2015-03-08 19:59:10 +08:00
winlin	2e9f2753c9	for #316, add stream codec info. 2.0.135	2015-03-08 18:33:35 +08:00
winlin	885b9af122	for #310, refine code to support he/hev2, use aac object.	2015-03-08 17:56:49 +08:00
winlin	8dbabe3708	fix #310, refine aac LC, support aac HE/HEv2. 2.0.134.	2015-03-08 17:36:43 +08:00
winlin	d3e2838fc6	for #310, refine the aac profile for adts and aac object for RTMP sequence header.	2015-03-08 17:33:52 +08:00
winlin	04f3f2a8f8	for #316, add codec info to stream.	2015-03-08 15:33:08 +08:00
winlin	8bf60895a9	refine the kbps of server.	2015-03-08 12:55:40 +08:00
winlin	fbbe46d272	refine the config, support directly parse file.	2015-03-07 22:25:43 +08:00
winlin	b8e70f8538	support module	2015-03-07 16:49:21 +08:00
winlin	ee30e6bb1f	Merge branch 'develop' of github.com:winlinvip/simple-rtmp-server into develop	2015-03-07 16:39:56 +08:00
winlin	05d238f860	support modules.	2015-03-07 16:39:05 +08:00
winlin	688890cd7a	refine configure, generate objs/makefile first.	2015-03-07 16:37:29 +08:00
winlin	a29b8a7a5b	refine configure, move auto headers to script.	2015-03-07 16:33:06 +08:00
winlin	aaf87cf3d9	add srs module rule.	2015-03-07 16:29:18 +08:00
winlin	b360fe279d	remove libaacplus.	2015-03-06 22:35:02 +08:00
winlin	496f689de7	fix bug for libfdk aac.	2015-03-06 22:29:49 +08:00
winlin	f31412db21	update readme.	2015-03-06 17:07:44 +08:00
winlin	b3ef8e9d48	set stream caster to experiment state	2015-03-06 15:46:33 +08:00
winlin	f26e719800	fix #322, fix http-flv stream bug, support multiple streams. 2.0.133.	2015-03-06 13:37:57 +08:00
winlin	1277968d4a	refine http client, use initialize to set host and port.	2015-03-06 12:07:12 +08:00
winlin	2bcb4f811c	refine http.	2015-03-06 11:56:28 +08:00
winlin	964e4be9d4	refine http request post. 2.0.132.	2015-03-06 11:51:20 +08:00
winlin	3982ec1d87	refine http request parse. 2.0.132.	2015-03-06 11:36:26 +08:00
winlin	4325809daf	refine http	2015-03-05 21:45:01 +08:00
winlin	6fccfa061d	refine the http request code.	2015-03-05 10:36:40 +08:00
winlin	025b707330	refine the http request reader.	2015-03-04 18:20:15 +08:00
winlin	3e394a5f06	for #320, set socket send buffer to smaller macro. 2.0.131	2015-03-04 16:52:43 +08:00
winlin	04dc60ebe1	refine http for srs, rename SrsGoHttp to SrsHttp.	2015-03-04 13:09:35 +08:00
winlin	983ab8fb89	pass all utest for 2.0	2015-03-04 12:24:22 +08:00
winlin	e7fd733dc5	fix the long long warning.	2015-03-04 09:59:40 +08:00
winlin	3d47fbdc5c	fix build failed of utest.	2015-03-04 09:18:15 +08:00