4861 commits

Author	SHA1	Message	Date
winlin	da56e4fbb9	for #328, fix hds compile error on mac.	2015-03-12 07:26:30 +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	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
winlin	a739b2c555	fix the bug for fork ffmpeg in mac, the local variable is unvailable.	2015-03-11 15:54:31 +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	d4198ee8ba	add hds supported.	2015-03-11 13:34:58 +08:00
winlin	24616e15b5	remove the code for xcode, not required.	2015-03-10 18:33:32 +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	db7ddfd510	fix #155, #135, support osx(darwin) for mac pro. 2.0.137.	2015-03-10 12:50:27 +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	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
winlin	a47dbf7a92	for #320, refine code.	2015-03-03 17:28:07 +08:00
winlin	34d6a2ece5	for #320, support macro to disable the complex send algorithm and enable tcp no delay. 2.0.129	2015-03-03 17:22:44 +08:00
winlin	fb3fced8d0	for #179, revert dvr http api. 2.0.128.	2015-03-01 17:57:28 +08:00
winlin	8ed256b7e9	for #179, wait keyframe for dvr. 2.0.127	2015-02-27 21:11:29 +08:00
winlin	0213cc6466	for #179, refine dvr, support POST create dvr when publish not start. 2.0.126	2015-02-27 20:39:36 +08:00
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	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