102 commits

Author	SHA1	Message	Date
winlin	baa892a762	merge srs_app_st_socket to srs_app_st.	2015-06-14 08:43:38 +08:00
winlin	d103557a8b	merge the rtmp sdk to stack.	2015-06-13 16:04:59 +08:00
winlin	19e1f610a3	merge from bravo, parse the http reponse in json of bravo system.	2015-06-08 17:28:39 +08:00
winlin	6bfb743aa0	remove the unused app http file	2015-05-22 22:38:15 +08:00
winlin	f0ae66a081	merge the app http to conn.	2015-05-22 22:34:03 +08:00
winlin	ce1bb6c605	refine code, extrat the ISrsHttpMessage.	2015-05-22 22:24:05 +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	0acb942c3a	update on_hls, add ts_url, m3u8 and m3u8_url.	2015-04-23 12:05:24 +08:00
winlin	542aab4557	fix the hls notify bug, pass the query to get path.	2015-04-14 17:53:53 +08:00
winlin	e5b8e0da01	fix async call and hls_nb_notify bug.	2015-04-10 15:00:07 +08:00
winlin	5d37e47783	support config the hls_nb_notify.	2015-04-10 14:44:18 +08:00
winlin	5c00ce8a96	refine hls on_hls_notify, read a little of ts.	2015-04-10 14:17:49 +08:00
winlin	1f93fb3399	refine hls notify, support timeout.	2015-04-10 13:45:21 +08:00
winlin	310157ab77	refine the hls_on_notify, calc the spent time in ms.	2015-04-10 12:30:22 +08:00
winlin	e6d6bdfe57	refine the hls_on_notify, only read a chunk.	2015-04-10 12:27:30 +08:00
winlin	e3c6e52547	enhanced on_hls_notify, support HTTP GET when reap ts.	2015-04-10 12:01:45 +08:00
winlin	64b065e450	for hls callback, add duration of ts.	2015-04-03 13:46:44 +08:00
winlin	3b4bd194b6	refine http hooks, donot pass the known variable.	2015-03-31 17:52:49 +08:00
winlin	c49bc0628e	support on_hls for http hooks. 2.0.152.	2015-03-31 17:42:12 +08:00
winlin	c6817cc422	for #354, remove the double underscore of macro.	2015-03-21 10:25:03 +08:00
Nimrod A. Abing (on kohima)	a95bd7d30e	Modified on_close webhook. ... Pass the send_bytes and recv_bytes count to the web hook.	2015-03-16 15:39:49 +08:00
winlin	1277968d4a	refine http client, use initialize to set host and port.	2015-03-06 12:07:12 +08:00
winlin	964e4be9d4	refine http request post. 2.0.132.	2015-03-06 11:51:20 +08:00
winlin	1246989ea9	for #179, refine dvr, support callback when reap dvr segment.	2015-02-22 10:45:13 +08:00
winlin	a4ba40952a	for #250, rename rtmp to protocol dir.	2015-01-23 10:07:20 +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	9d34820c80	fix #158: http-callback check http status code ok(200). 2.0.84	2015-01-02 10:21:04 +08:00
winlin	569596c10d	update copyright, from 2013 to 2015	2014-12-31 20:32:09 +08:00
winlin	bc6616bd1f	refine code according to inspect of clion. 0.9.219	2014-09-28 11:08:30 +08:00
winlin	7b24788445	for bug #143, build on centos5.	2014-08-02 22:18:39 +08:00
winlin	79c641e8d6	remove flashP2P hss dvr, for it's a can-not-run feature. 0.9.178	2014-07-30 10:00:23 +08:00
winlin	b19d2e8e2d	refine code, rename srs_app_socket.cpp to srs_app_st_socket.cpp	2014-07-26 20:07:12 +08:00
winlin	8497b22d4a	complete the consts refine	2014-07-20 13:45:54 +08:00
winlin	d4b8fee61a	fix bug #73, http callback api support authentication in tcUrl	2014-05-22 10:23:12 +08:00
winlin	f0b54678ad	fix http hooks dvr bug, check dvr macro	2014-05-21 12:02:50 +08:00
winlin	ef0f7f4da8	support http heartbeat, 0.9.107	2014-05-19 17:39:01 +08:00
winlin	a1fed15789	add uptime, startup time, load to api	2014-05-08 15:45:51 +08:00
winlin	30bb3ff704	add dvr_plan hss to full.conf	2014-04-30 11:56:19 +08:00
winlin	3ed59f190b	refine srs live flashP2P(integrated by chnvideo)	2014-04-24 17:38:57 +08:00
winlin	67e1988b81	support live flashP2P(integrated by chnvideo VDN). 0.9.75	2014-04-24 16:32:19 +08:00
winlin	b276714573	support chnvideo hss streaming	2014-04-24 14:26:24 +08:00
winlin	35f3a93239	support dvr to hss. change to 0.9.74	2014-04-24 12:22:36 +08:00
winlin	e271cb607f	refine plan, add stream start time for atc	2014-04-23 17:53:14 +08:00
winlin	733ca2475d	call http api when dvr got keyframe	2014-04-22 17:32:45 +08:00
winlin	23a1b29935	add dvr option. refine macros of auto headers	2014-04-15 14:01:57 +08:00
winlin	9c3ba680d8	fix http hooks json encode bug, remove the JFIELD_CONT for the last field	2014-04-03 11:52:06 +08:00
winlin	a14267d2b4	refine the http url handler match. refine json encode	2014-04-03 11:49:14 +08:00
winlin	ec6d696565	refine http framework, use http message	2014-04-02 12:03:49 +08:00
winlin	e70609cea3	refine code, extract http hooks.	2014-04-01 18:40:24 +08:00