4011 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
winlin	9ebb77d711	fix the warnings	2015-10-28 11:58:49 +08:00
winlin	e9e202dbf1	merge srs2	2015-10-28 11:51:32 +08:00
winlin	ef00005ab4	for ExoPlayer, remove duration for live.	2015-10-28 11:51:03 +08:00
winlin	8c96472cea	merge srs2	2015-10-28 11:03:15 +08:00
winlin	50a7b9c1ff	for ExoPlayer, add av tag in flv header. 2.0.197	2015-10-28 11:01:20 +08:00
winlin	59f5c5d6a5	Merge branch '2.0release' into develop	2015-10-27 18:21:04 +08:00
winlin	3b0bf1e10b	for #512, make the segment more acceptable, when in [min, max_td * 2], it's ok.	2015-10-27 18:20:57 +08:00
winlin	390f58e186	fix compile failed.	2015-10-27 17:57:58 +08:00
winlin	a416e891b4	fix compile failed.	2015-10-27 17:54:07 +08:00
winlin	1d57e53910	merge from 2.0release	2015-10-27 17:45:14 +08:00
winlin	d1979c760f	for #512, partical hotfix the hls pure audio. 2.0.196	2015-10-27 17:44:10 +08:00
winlin	3683f06e4d	for #512, write audio frame by frame for video+audio hls.	2015-10-27 16:20:02 +08:00
winlin	fe27e76492	support schema	2015-10-26 18:34:55 +08:00
winlin	a501f5bd7a	update htbt script	2015-10-26 14:54:41 +08:00
winlin	dd2945add1	update htbt script	2015-10-26 14:53:54 +08:00
winlin	6f6d495a19	update htbt script	2015-10-26 14:50:16 +08:00
winlin	3933819686	add htbt script	2015-10-26 14:18:19 +08:00
winlin	0a8cb8a391	add heartbeat script	2015-10-26 14:17:24 +08:00
winlin	11979229e6	Merge branch '2.0release' into develop	2015-10-26 13:34:44 +08:00
winlin	e08beba89e	fix the sed command for arm	2015-10-26 13:34:28 +08:00
winlin	45385241bb	fix the sed command for arm	2015-10-26 13:29:59 +08:00
winlin	1cfd678102	Merge pull request #510 from simple-rtmp-server/feature/kafka ... Feature/kafka	2015-10-23 14:45:29 +08:00
winlin	b8f2ba4f0d	complete kafka	2015-10-23 14:42:05 +08:00
winlin	cbe4252b4d	refine code.	2015-10-23 14:42:04 +08:00
winlin	d2ca51ac50	notify kafka when client close	2015-10-23 14:42:04 +08:00
winlin	71451878c9	refine kafka, simplify code.	2015-10-23 14:42:04 +08:00
winlin	9a47390253	fix #467, support write log to kafka. 3.0.6	2015-10-23 14:42:04 +08:00
winlin	76cd3f8749	kafka convert json to producer message.	2015-10-23 14:42:04 +08:00
winlin	8e344f1c26	add producer api messages.	2015-10-23 14:42:04 +08:00
winlin	7a0aaf5900	kafka refine code	2015-10-23 14:42:04 +08:00
winlin	f9f5b56951	kakfa erase messages when wrote.	2015-10-23 14:42:04 +08:00
winlin	22fa9a0f1f	kafka use temp transport to fetch metadata.	2015-10-23 14:42:04 +08:00
winlin	531b658f8e	retry when metadata empty	2015-10-23 14:42:04 +08:00
winlin	61486a82aa	kafka use topic and partition cache	2015-10-23 14:42:04 +08:00
winlin	7013993c7a	kafka send the accept message.	2015-10-23 14:42:04 +08:00
winlin	de41c1c9d2	kafka refine comments.	2015-10-23 14:42:04 +08:00
winlin	31a77a83ed	convert metadata to partitions	2015-10-23 14:42:04 +08:00
winlin	f0e39cc330	support show the summary of kafka metadata.	2015-10-23 14:42:04 +08:00
winlin	d013374871	rename ISrsCodec size to nb_bytes.	2015-10-23 14:42:03 +08:00
winlin	33a015329d	add function to convert kafka array to vector	2015-10-23 14:42:03 +08:00
winlin	84b3981d47	refs #1670: support decode the metadata response.	2015-10-23 14:42:03 +08:00
winlin	7106934c3a	kafka producer use async interface to request metadata.	2015-10-23 14:42:03 +08:00
winlin	a108fa8d01	kafka recv and decode message.	2015-10-23 14:42:03 +08:00
winlin	493d282255	kafka refine array, to decode and create object.	2015-10-23 14:42:03 +08:00
winlin	c4862878d1	kafka rename message set to raw message set.	2015-10-23 14:42:03 +08:00
winlin	6e5ed11a00	for kafka, support correlation id cache.	2015-10-23 14:42:03 +08:00
winlin	2e67eb8786	refine comments for kafka messages.	2015-10-23 14:42:03 +08:00
winlin	3c64e4b957	kafka encode and send packet.	2015-10-23 14:42:03 +08:00
winlin	9117e1e918	extract ISrsCodec for code and decode object.	2015-10-23 14:42:03 +08:00
winlin	45755fd1e7	refine code for kakfa request/response, string/bytes.	2015-10-23 14:42:03 +08:00