712 commits

Author	SHA1	Message	Date
winlin	4f5cc9c403	for #151, use absolutely overflow to make jwplayer happy. 1.0.23	2015-01-23 15:14:29 +08:00
winlin	73cfdea332	for #299, srs http server support dash vod stream over mp4 range. 2.0.103	2015-01-23 13:45:59 +08:00
winlin	2a05783d5c	for #293, support http ts stream. 2.0.101	2015-01-22 18:32:10 +08:00
winlin	2167a8385c	update version to 3.0.101	2015-01-22 09:36:19 +08:00
winlin	b7b268dfbf	fix #293, support http live flv/aac/mp3 stream with fast cache. 2.0.100.	2015-01-19 13:17:46 +08:00
winlin	53d9faf395	for #293, update readme.	2015-01-18 19:50:54 +08:00
winlin	e71bc0cbc5	for bug #277, refine the http server.	2015-01-17 23:44:21 +08:00
winlin	cbed2bbca4	fix #277, refine http server refer to go http-framework. 2.0.98	2015-01-17 23:00:40 +08:00
winlin	9bbbaad288	for bug #277, refine http api refer to go http-framework. 2.0.97	2015-01-17 21:58:23 +08:00
winlin	cc22ca4890	hotfix #290, use iformat only for rtmp input. 2.0.95	2015-01-17 13:06:18 +08:00
winlin	4449a8d7b0	fix #290, use iformat only for rtmp input. 1.0.22	2015-01-17 13:04:52 +08:00
winlin	63309a0538	refine for bug #288, drop info frame without error.	2015-01-14 11:55:15 +08:00
winlin	b705ed0b90	for bug #288, refine the codec decode info frame failed. 1.0.21	2015-01-14 11:32:19 +08:00
winlin	b466756931	merge from feilong for bug #281.	2015-01-08 17:44:08 +08:00
winlin	27e0521ace	fix #281, fix hls bug ignore type-9 send aud. 1.0.20	2015-01-08 17:37:28 +08:00
winlin	6c833902f9	merge http api from tufang. 2.0.92	2015-01-08 16:02:33 +08:00
winlin	0e9c9db3f4	fix the aggregate bug, adjust to starttime of msg. 2.0.91	2015-01-07 15:37:44 +08:00
winlin	0e03d019a8	for bug #215, srs rtmp dump support conn args. 2.0.90	2015-01-07 13:29:30 +08:00
winlin	dc11418c79	fix #274: http-callback support on_dvr when reap a dvr file. 2.0.89	2015-01-03 15:33:23 +08:00
winlin	dd2c7e0b4d	hotfix to remove the pageUrl for http callback. 2.0.88	2015-01-03 15:08:46 +08:00
winlin	247b772449	hotfix to remove the pageUrl for http callback. 1.0.19	2015-01-03 15:07:12 +08:00
winlin	f881bc43b5	fix #179: dvr support custom filepath by variables. 2.0.87	2015-01-03 12:54:54 +08:00
winlin	75f2607685	fix #211, support security allow/deny publish/play all/ip. 2.0.86	2015-01-02 16:02:13 +08:00
winlin	f8ec7c706d	merge from 1.0.18, hotfix #207, trim the last 0 of log. 2.0.85	2015-01-02 12:57:44 +08:00
winlin	e590537dca	fix #207, trim the last 0 of log. 1.0.18	2015-01-02 12:56:15 +08:00
winlin	9d34820c80	fix #158: http-callback check http status code ok(200). 2.0.84	2015-01-02 10:21:04 +08:00
winlin	8df0f724d6	fix #216, http-callback post in application/json content-type. 2.0.83	2015-01-02 09:22:49 +08:00
winlin	ca977ef739	hotfix #216, http-callback post in application/json content-type. 1.0.17	2015-01-02 09:20:45 +08:00
winlin	518a5a72ab	fix #263, srs-librtmp flv read tag should init size. 2.0.82	2015-01-02 09:05:16 +08:00
winlin	c1c01ec802	hotfix #270, memory leak for http client post. 2.0.81	2015-01-01 11:47:18 +08:00
winlin	bb6dfe40c1	fix #270, memory leak for http client post. 1.0.16	2015-01-01 11:44:28 +08:00
winlin	569596c10d	update copyright, from 2013 to 2015	2014-12-31 20:32:09 +08:00
winlin	12f4abd553	fix #266, aac profile is object id plus one. 2.0.80	2014-12-29 14:24:22 +08:00
winlin	c0a6c3efa3	merge from 1.0release, hotfix #267, the forward dest ep should use server. 2.0.79	2014-12-29 09:07:50 +08:00
winlin	d9aca8ab82	hotfix #267, the forward dest ep should use server. 1.0.15	2014-12-29 09:05:56 +08:00
winlin	e27c95b0e8	merge from 1.0release for #268, the hls pcr is negative when startup. 2.0.78	2014-12-29 08:45:19 +08:00
winlin	513c1ec6d5	fix #268, the hls pcr is negative when startup. 1.0.14	2014-12-29 08:38:29 +08:00
winlin	9a66d22f3b	hotfix 1.0release, 1.0.13	2014-12-26 21:43:00 +08:00
winlin	b8de3bd3b4	convert the core to unix format.	2014-12-25 10:55:12 +08:00
winlin	92146712d8	fix srs-librtmp send raw aac audio channel bug. 2.0.76	2014-12-25 09:52:18 +08:00
winlin	28eedfc177	merge from 1.0release for #264, ignore the video NALU which is actually a sequence header to make HLS happy. 2.0.75	2014-12-22 17:12:09 +08:00
winlin	2e43a63bf4	fix #264, ignore the video NALU which is actually a sequence header to make HLS happy. 1.0.12	2014-12-22 17:10:51 +08:00
winlin	eef8034632	merge from 1.0release for bug #264. 2.0.74	2014-12-20 11:58:39 +08:00
winlin	1dfac0bf1d	fix #264, support disconnect publish connect when hls error. 1.0.11	2014-12-20 11:45:59 +08:00
winlin	db13c725a6	refine #259, rename the on_dispose to wakeup. 2.0.73	2014-12-19 09:19:47 +08:00
winlin	0d6b91039d	fix #257, refine latency, send when got one+ msgs, 2.0.72	2014-12-16 09:26:22 +08:00
winlin	cbad7a3074	fix #257, server latency is 0.1s+, the bottleneck is encoder. 2.0.71	2014-12-13 12:48:49 +08:00
winlin	595bf24a51	for bug #257, default to off the realtime(min-latency).	2014-12-13 10:13:49 +08:00
winlin	10297fab51	fix #257, support 0.1s+ latency. 2.0.70	2014-12-12 21:51:06 +08:00
winlin	6bdd0af728	for bug #251, remove the queue fast cache for it's too complex, use queue fast vector instead. 2.0.69	2014-12-10 09:18:49 +08:00
winlin	7150a99f41	for bug #251, remove the mic(message iovs cache), no use.	2014-12-10 09:15:38 +08:00
winlin	a3de1c71fc	reset the mw_latency to 350.	2014-12-08 09:49:45 +08:00
winlin	1311b6fe65	fix #251, support 10k clients. 2.0.67	2014-12-07 16:31:47 +08:00
winlin	55d98fceed	for bug #251, add min msgs for queue cond wait.	2014-12-07 16:15:19 +08:00
winlin	5a2b8afead	for bug #251, add queue fast vector. 2.0.66	2014-12-07 13:26:45 +08:00
winlin	8f72f79504	for bug #251, add queue fast cache. 2.0.65	2014-12-07 12:08:38 +08:00
winlin	bba6063492	for bug #251, the shared ptr message share the header. 2.0.64	2014-12-07 11:25:05 +08:00
winlin	330819fb74	for bug #251, refine the mic algorithm. 2.0.63	2014-12-06 22:50:51 +08:00
winlin	d53fd7f570	for bug #251, support mic(message iovs cache). 2.0.61	2014-12-06 20:10:05 +08:00
winlin	d827928eeb	for bug #251, merge the performance refines.	2014-12-06 09:55:51 +08:00
winlin	9892b92258	Revert "for bug #251, somhc(session-oriented message-header cache). 2.0.61" ... It hurt performance, should never use it. This reverts commit d073adde58.	2014-12-06 01:19:49 +08:00
winlin	d073adde58	for bug #251, somhc(session-oriented message-header cache). 2.0.61	2014-12-06 00:59:10 +08:00
winlin	f9b9a60de7	for bug #251, remove the SrsMessage, use SrsCommonMessage or SrsSharedPtrMessage. 2.0.60	2014-12-05 23:03:52 +08:00
winlin	e80c8603d4	fix #251, revert changes, for the cond wait and fast cache queue is no use. 2.0.59	2014-12-05 20:55:19 +08:00
winlin	92ecdf088b	for bug #251, use macro to define the fast cache and cond wait. 2.0.58	2014-12-05 18:47:17 +08:00
winlin	cd317859db	add mw sleep time and msgs/iovs table.	2014-12-05 17:07:27 +08:00
winlin	9ee138746f	for bug #251, 9k+ clients, use fast cache for msgs queue. 2.0.57	2014-12-05 16:44:11 +08:00
winlin	dde05c6315	for bug #251, refine the send use cond wait.	2014-12-05 14:38:43 +08:00
winlin	fad6074a25	set send socket buf. mw/mr sleep default to 350.	2014-12-05 11:24:05 +08:00
winlin	279b4ff4c9	refine macros	2014-12-04 21:37:04 +08:00
winlin	b1d7fbe668	fix #241, add mw(merged-write) config. 2.0.53	2014-12-04 21:35:13 +08:00
winlin	f1192a8302	fix bug for bug #241, default to 32k for socket buffer.	2014-12-04 18:35:50 +08:00
winlin	5589b13d2e	for bug #241, support mr(merged-read) config and reload. 2.0.52.	2014-12-04 18:21:04 +08:00
winlin	57f844b636	for bug #249, simplify the macro, 0 to disable chunk stream cache.	2014-12-04 15:49:24 +08:00
winlin	a23b5b9a4b	for bug#241, simplify the buffer, donot change its size.	2014-12-04 15:43:37 +08:00
winlin	4b09531e2f	for bug #241, simplify the merged read config macros.	2014-12-04 15:33:17 +08:00
winlin	f57801eb46	fix #249, cache the chunk headers info to +5% or +10% performance. 2.0.51	2014-12-04 14:58:40 +08:00
winlin	90992b31a3	for bug #194, add the send macro to performance.	2014-12-04 13:54:02 +08:00
winlin	60bc9c2aa0	add performance header to control options for performance. 2.0.50	2014-12-04 13:43:55 +08:00
winlin	29324fab46	fix #248, improve about 15% performance for fast buffer. 2.0.49	2014-12-04 13:05:13 +08:00
winlin	f35ec2155b	for bug #241, support merged read. 2.0.48	2014-12-03 19:27:27 +08:00
winlin	463e1fbc41	for bug #237, refine the thread loop for publish thread. 2.0.47	2014-12-02 19:28:36 +08:00
winlin	e9712cc627	refine recv thread, donot set auto response for publish recv thread. 2.0.46	2014-12-02 17:16:20 +08:00
winlin	5905e5c050	merge from 1.0release, traverse the token before response connect. 2.0.45.	2014-12-02 15:41:54 +08:00
winlin	304208f822	fix #239, traverse the token before response connect. 1.0.10.	2014-12-02 15:27:36 +08:00
winlin	757cffbabf	for bug #237, when recv thread failed, quit the cycle. 2.0.44	2014-12-02 15:21:08 +08:00
winlin	a94dbecdc4	refine macro of srs-librtmp. 2.0.43	2014-12-02 13:41:41 +08:00
winlin	3584bdb7b6	srs-librtmp support hijack io apis for st-load. 2.0.42.	2014-12-02 12:19:17 +08:00
winlin	472b1742a2	for bug #237, use isolate thread to recv message. 2.0.41	2014-12-01 23:38:51 +08:00
winlin	1847c5fef7	ignore the actual length of share key. 2.0.40	2014-12-01 22:09:09 +08:00
winlin	47b4b694be	add qtcreate project file trunk/src/qt/srs/srs-qt.pro. 2.0.39.	2014-12-01 10:58:17 +08:00
winlin	efb73c5487	fix #235, refine handshake, replace union with template method. 2.0.38.	2014-11-29 18:41:14 +08:00
winlin	ff5cdb1cc1	for bug #215, add srs_rtmp_dump tool. 2.0.37.	2014-11-28 12:26:36 +08:00
winlin	7f121efd7a	merge from allspace srs-librtmp for win vs2010. 2.0.36	2014-11-28 10:33:36 +08:00
winlin	14fca601f9	merge from 1.0 hotfix. 3.0.35	2014-11-27 18:50:54 +08:00
winlin	9c033c7da6	hotfix 1.0, author bug, use error macro. 1.0.9	2014-11-27 18:48:01 +08:00
winlin	03f72fb1a6	for bug #229, revert changes of allspace, for srs-librtmp branch build failed. 2.0.34	2014-11-27 18:39:02 +08:00
winlin	eb4e7aad69	try to build srs-librtmp on vs2010, failed.	2014-11-27 18:20:13 +08:00
winlin	4c0c3a9ada	refine merged code for allspace.	2014-11-27 15:29:24 +08:00
winlin	468941833c	change srs version to 2.0.33	2014-11-27 15:23:16 +08:00