1845 Commits (c02da33c115e89fb65bbb6adee221b2f3253c8f3)

Author	SHA1	Message	Date
winlin	da00b67c76	Merge branch '2.0release' into develop	10 years ago
winlin	a95fd6d140	read the http flv stream.	10 years ago
winlin	022b6aa561	refine the http remux for http flv stream.	10 years ago
winlin	f0c24eeacc	add stream caster for post flv over http.	10 years ago
winlin	91e285b0cd	Merge branch '2.0release' into develop	10 years ago
winlin	4b372d8d16	change primary to the primary branch.	10 years ago
winlin	94681702e1	Merge branch '2.0release' into develop	10 years ago
winlin	e63b8eda51	migarate to srs org.	10 years ago
winlin	42ddb76544	Merge branch '2.0release' into develop	10 years ago
winlin	8603dba697	migarate to srs org.	10 years ago
winlin	17b15deee6	Merge branch '2.0release' into develop	10 years ago
winlin	b23e196f20	migarate from winlinvip to srs org, move the copyright to srs org.	10 years ago
winlin	53e92a17f5	Merge branch '2.0release' into develop	10 years ago
winlin	115daa3cc1	migarate from winlinvip to srs org	10 years ago
winlin	5559fb9842	Merge branch '2.0release' into develop	10 years ago
winlin	ae6d0a5ab1	Merge branch '2.0release' into develop	10 years ago
tufang14	b6d650cdb4	m3u8 mount bug	10 years ago
winlin	e50996270e	fix the config parse error.	10 years ago
winlin	0acb942c3a	update on_hls, add ts_url, m3u8 and m3u8_url.	10 years ago
winlin	7b157b0678	refine hls ingester, quit when error.	10 years ago
winlin	aabe84046c	refine hls ingester, quit when error.	10 years ago
winlin	114f4447bb	Merge branch '2.0release' into develop	10 years ago
winlin	4e5ddb51e7	refine the overflow algorithm, prevent smaller piece.	10 years ago
winlin	1d973e2178	refine the overflow algorithm, prevent smaller piece.	10 years ago
winlin	d19dfa528e	abs overflow also plus the deviation, for pure audio hls.	10 years ago
winlin	c514a4ceeb	use atc for ingest hls aac time.	10 years ago
winlin	3e0ba172a3	Merge branch '2.0release' into develop	10 years ago
winlin	a28eec89b0	support ingest hls with m3u8 in m3u8.	10 years ago
winlin	7d5f1c2be8	Merge branch '2.0release' into develop	10 years ago
winlin	ba6736839b	support hls ingest, fix the bugs.	10 years ago
winlin	2239e9f1fd	support ingest hls live stream to RTMP.	10 years ago
winlin	623e37e22a	Merge branch '2.0release' of github.com:winlinvip/simple-rtmp-server into 2.0release	10 years ago
winlin	6e5c587e0a	support aac_adtstoasc filter to copy mode.	10 years ago
J	aca02b6d6b	for #384,refine code for empty body request.	10 years ago
J	8adbdc39e3	for #384,refine code for empty body request.	10 years ago
J	a71db53661	for #384,refine code for empty body request.	10 years ago
J	56f75cbbe9	fix #384	10 years ago
winlin	6726a88f47	merge from 2.0release	10 years ago
winlin	22ca46350b	fix #383, support mix_correct algorithm. 2.0.161.	10 years ago
winlin	8fbc6526bb	for #383, refine code to support mix correct algorithm.	10 years ago
winlin	542aab4557	fix the hls notify bug, pass the query to get path.	10 years ago
winlin	70c1d3cc7e	Merge branch '2.0release' into develop	10 years ago
winlin	02a2cb7e1a	for #381, refine the hls notify, report one by one.	10 years ago
winlin	a4216cc582	add todo for ts parse.	10 years ago
winlin	40eab7fc88	for #381, refine the deviation for hls.	10 years ago
winlin	0c939e7114	merge from 2.0.160:	10 years ago
winlin	dcac9c69d5	fix #381, support reap hls/ts by gop or not. 2.0.160.	10 years ago
winlin	9759b78da8	Merge branch '2.0release' into develop	10 years ago
winlin	e5b8e0da01	fix async call and hls_nb_notify bug.	10 years ago
winlin	5d37e47783	support config the hls_nb_notify.	10 years ago
winlin	0a7cea063c	refine http read, support c style api	10 years ago
winlin	5c00ce8a96	refine hls on_hls_notify, read a little of ts.	10 years ago
winlin	1f93fb3399	refine hls notify, support timeout.	10 years ago
winlin	d8988da0ea	refine the hls_on_notify, calc the spent time in ms.	10 years ago
winlin	310157ab77	refine the hls_on_notify, calc the spent time in ms.	10 years ago
winlin	e6d6bdfe57	refine the hls_on_notify, only read a chunk.	10 years ago
winlin	17c1423f4a	Merge branch '2.0release' into develop	10 years ago
winlin	e3c6e52547	enhanced on_hls_notify, support HTTP GET when reap ts.	10 years ago
winlin	7dbc95e085	refine the hls deviation for floor algorithm.	10 years ago
winlin	425e69e0cd	Merge branch '2.0release' into develop	10 years ago
winlin	23b310971e	guess again when annexb change to ibmf.	10 years ago
winlin	71e1602458	merge from 2.0.159	10 years ago
winlin	bd77f995bf	ignore the unknown flv tag.	10 years ago
winlin	546be09219	fix #375, fix hls bug, keep cc continous between ts files. 2.0.159.	10 years ago
winlin	29ac4c724b	change default log tank to file.	10 years ago
winlin	cfed8e81c5	merge from 2.0.158	10 years ago
winlin	e56d7add44	fix bug of config to parse the default value. 2.0.158	10 years ago
winlin	aef97db77a	refine the config code.	10 years ago
winlin	931370e9f6	Merge branch '2.0release' into develop	10 years ago
winlin	e7fd309cb0	refine hls info, show the deviation in seconds and pieces.	10 years ago
winlin	e958305d09	Merge branch '2.0release' into develop	10 years ago
winlin	6e2d756e1b	fix the bug of h.264 bit stream demux.	10 years ago
winlin	bd7db5aed6	only ignore the aud message.	10 years ago
winlin	61d5b78ae5	refine the h264 parser, one ts message should parsed to one rtmp/flv message.	10 years ago
winlin	4329366c08	for #304, do not add deviation for absolute overflow.	10 years ago
winlin	4f9df4f1a0	merge from 2.0.157, reap ts on the IDR.	10 years ago
winlin	77c29da26b	for #304, rewrite annexb mux for ts, refer to apple sample. 2.0.157.	10 years ago
winlin	70c59da1bf	enhanced avc decode, parse the sps get width+height. 2.0.156.	10 years ago
winlin	7e1749e029	refine the comments.	10 years ago
winlin	e458305f81	add utc time format.	10 years ago
winlin	90cd16aae4	Merge branch '2.0release' into develop	10 years ago
winlin	56cd373015	support hls callback with duration.	10 years ago
winlin	64b065e450	for hls callback, add duration of ts.	10 years ago
winlin	c4466a8c0c	fix crash bug for hls cleanup.	10 years ago
winlin	eb54ec25c9	fix compile errors.	10 years ago
winlin	cb148e43ee	merge from 2.0.155	10 years ago
winlin	17c0a5c470	fix #372, support transform vhost of edge 2.0.155.	10 years ago
winlin	d95e5a3f47	Merge branch '2.0release' into develop	10 years ago
winlin	4d98cbb965	add hls config in api.	10 years ago
winlin	fe5783e7a4	merge 2.0.154	10 years ago
winlin	8401d9ac06	fix #366, config hls to disable cleanup of ts. 2.0.154.	10 years ago
winlin	2d3d628865	merge from 2.0.153	10 years ago
winlin	717d088376	support server cycle handler. 2.0.153.	10 years ago
winlin	e75b7e89d6	merge from 2.0.152	10 years ago
winlin	3b4bd194b6	refine http hooks, donot pass the known variable.	10 years ago
winlin	c49bc0628e	support on_hls for http hooks. 2.0.152.	10 years ago
winlin	97442c56b6	enhance hls in floor mode.	10 years ago
winlin	76c1957260	enhance hls, increase piece one by one.	10 years ago
winlin	ef28865991	merge from 2.0.151	10 years ago
winlin	b9c21b1e8f	enhanced hls, warning when ts dup or jmp.	10 years ago
winlin	9be7fbba7d	user smaller deviation to avoid dup ts.	10 years ago
winlin	f6e135943f	enhanced hls, support deviation for duration. 2.0.151.	10 years ago
winlin	40f186ba82	Merge branch '2.0release' into develop	10 years ago
winlin	cd682ae4be	update donations. fix hls path bug.	10 years ago
winlin	abbed8f66c	merge from 2.0release	10 years ago
winlin	692b751da8	for #351, support config the m3u8/ts path for hls. 2.0.149.	10 years ago
winlin	922adaf59f	Merge branch '2.0release' into develop	10 years ago
winlin	85afb6ea6f	add donation. fix bug of adts.	10 years ago
winlin	01ee456649	fix the ts parse bug, should never complete message when PES packet length is 0.	10 years ago
winlin	75ca70c619	Merge branch '2.0release' into develop	10 years ago
tufang14	0faaa61be7	seg fault ... seg fault	10 years ago
winlin	a5c5befad1	for parse video ts.	10 years ago
winlin	896983c1dc	refine the aac codec enum name	10 years ago
winlin	1401f2e0ab	ignore when sps/pps consumed all frame.	10 years ago
winlin	12d5431f3b	Merge branch '2.0release' into develop	10 years ago
winlin	b319e9ff9c	ignore when sps/pps consumed all frame.	10 years ago
winlin	c250e3e651	Merg branch '2.0release' into develop	10 years ago
winlin	e818f36316	fix #360, fix build bug for centos7.	10 years ago
winlin	713cedfbb4	fix #149, RTMP/HTTP support bind to <[ip:]port>. 2.0.148	10 years ago
winlin	b6feb0742f	fix #149, RTMP/HTTP support bind to <[ip:]port>. 2.0.148	10 years ago
winlin	d16ae193f6	Merge branch '2.0release' into develop	10 years ago
winlin	fcab17741c	fix #222, the dvr path rule changed.	10 years ago
winlin	df3f24403e	Merge branch '2.0release' into develop	10 years ago
winlin	02addf61f7	fix #302, remove the thread unsafe code, no static.	10 years ago
winlin	bfa46e7a98	fix #302, remove the thread unsafe code, no static.	10 years ago
winlin	f69fa7273b	fix #302, remove the thread unsafe code, no static.	10 years ago
winlin	0a7b179e14	Merge branch '2.0release' into develop	10 years ago
winlin	2f2aaf5ee4	for #155, refine code, donot check network devices for osx.	10 years ago
winlin	e7e17cf15d	fix osx bug.	10 years ago
winlin	33cca3e027	for #155, add todo for osx. 2.0.146	10 years ago
winlin	e45c62003a	Merge branch '2.0release' into develop	10 years ago
winlin	bbac2348db	for #354, remove the double underscore functions and variables.	10 years ago
winlin	7065db192c	for #354, remove the double underscore of macro.	10 years ago
winlin	45d9018051	Merge branch '2.0release' into develop	10 years ago
winlin	c6817cc422	for #354, remove the double underscore of macro.	10 years ago
winlin	3ca906d560	Merge branch '2.0release' into develop	10 years ago
winlin	a4709a6439	for #151, add comments for the audio overflow ratio.	10 years ago
winlin	b1142d83fc	Merge branch '2.0release' into develop	10 years ago
winlin	0319e85f99	support config the audio overflow ratio.	10 years ago
winlin	b7138ba9c5	merge from 2.0	10 years ago
tufang14	e319da3329	小瑕疵 ... 小瑕疵	10 years ago
winlin	f564c903ac	support got uptime and loadavg for osx. 2.0.145	10 years ago
winlin	4a50bf1894	Merge branch '2.0release' into develop	10 years ago
winlin	fbd722bf76	refine the fast buffer to more readable.	10 years ago
winlin	d25eb0aaa2	merge from 2.0	10 years ago
winlin	f36e4a443d	refine the fast buffer. 2.0.144	10 years ago
winlin	6a98758435	revert the changes for SRS2.	10 years ago
winlin	df2644c850	merge from 2.0release	10 years ago
winlin	6855ab4c52	Merge branch 'develop' of https://github.com/tufang14/simple-rtmp-server into tufang14-develop	10 years ago
winlin	9bf6c9e9c6	Merge branch '2.0release' into develop	10 years ago
winlin	cf3becbc17	for #155, osx(darwin) enable http api and stat, rusage is ok.	10 years ago
winlin	9f81a8b73e	for #155, osx(darwin) support demo with nginx and ffmpeg. 2.0.143.	10 years ago
winlin	ab673e1300	for #155, osx(darwin) support demo with nginx and ffmpeg. 2.0.143.	10 years ago
tufang14	1cc3384a19	seg fault ... seg fault	10 years ago
winlin	79fbeeb8c6	Merge branch '2.0release' into develop	10 years ago
winlin	8a4312f4ec	fix bug, use size_t for string::npos	10 years ago
winlin	9e407d32fe	change verstion to 3.0.0	10 years ago
winlin	2241ba0e34	for #340, #343, add wiki and use srs string function, support hls_entry_prefix(hls base url). 2.0.142	10 years ago
wenjie.zhao	65f404fb42	for #340, refine ts prefix code.	10 years ago
wenjie.zhao	5969f72354	for #340, refine ts prefix code.	10 years ago
wenjie.zhao	10da182853	add hls prefix of uri supported	10 years ago
wenjie.zhao	efe3050d7a	fix hls muxer Segmentation fault.	10 years ago
wenjie.zhao	73f13dfc42	fix hls muxer Segmentation fault.	10 years ago
winlin	9a0a8affc5	Merge pull request #337 from tufang14/develop ... 可能数组越界	10 years ago
winlin	685a29af83	Merge branch '2.0release' into develop	10 years ago
winlin	c92d40e00b	for #334, refine code, use kbps instead skt of rtmp connection.	10 years ago
Nimrod A. Abing (on kohima)	a95bd7d30e	Modified on_close webhook. ... Pass the send_bytes and recv_bytes count to the web hook.	10 years ago
Nimrod A. Abing (on kohima)	bc93147426	for #308, disable st examples. for #334, refine the st init and event select.	10 years ago
tufang14	6cf5a6a7a9	可能数组越界 ... 可能数组越界	10 years ago
winlin	67671e43f9	Merge branch '2.0release' into develop	10 years ago
winlin	8ee0826e9a	fix build failed bug.	10 years ago
winlin	a21243ea12	merge from 2.0	10 years ago
winlin	d349a3dbda	update stable version check	10 years ago
winlin	519c25a064	fork srs2 and start srs3. 3.0.0	10 years ago
winlin	e6058c1560	update donation	10 years ago
winlin	320f45c6f4	fix #324, support hstrs(http stream trigger rtmp source) edge mode. 2.0.140.	10 years ago
winlin	27cb62b7aa	for #324, support hstrs(http stream trigger rtmp source) origin mode. 2.0.139.	10 years ago
winlin	995b130090	for #324, refine code for hstrs, support hijack handler.	10 years ago
winlin	5c6ef6ded6	fix warning for xcode.	10 years ago
winlin	6d15d0ea99	for #324, refine code, add hstrs config.	10 years ago
winlin	a15ce1147f	for #155, fix all warnings for mac.	10 years ago
wenjie.zhao	643f18abe4	add hds reload supported.#328	10 years ago
winlin	984145de72	for #328, add todo for hds, check whether disabled, support reload.	10 years ago
winlin	ffef62900f	for #328, support adobe hds. 2.0.138.	10 years ago
winlin	da56e4fbb9	for #328, fix hds compile error on mac.	10 years ago
wenjie.zhao	07d8f060eb	refine annotation	10 years ago
wenjie.zhao	570c0d66bd	fix path issue.	10 years ago
wenjie.zhao	e57bda8908	Merge code. ... Conflicts: trunk/configure trunk/src/app/srs_app_source.cpp trunk/src/kernel/srs_kernel_error.hpp	10 years ago
winlin	a739b2c555	fix the bug for fork ffmpeg in mac, the local variable is unvailable.	10 years ago
winlin	1ad0c847ce	fix http parse bug	10 years ago
winlin	f247ac9daf	fix the http parse bug.	10 years ago
wenjie.zhao	d4198ee8ba	add hds supported.	10 years ago
winlin	24616e15b5	remove the code for xcode, not required.	10 years ago
winlin	f9767c91b5	fix configure bug, refine code for stream caster.	10 years ago
winlin	6c11207e28	fix http ts bug, the adts use id=1 which indicates the aac encoding.	10 years ago
winlin	5c3c38684b	fix the bug of flv stream, metadata type should be 18	10 years ago
winlin	db7ddfd510	fix #155, #135, support osx(darwin) for mac pro. 2.0.137.	10 years ago
winlin	5143e3a58d	fix #316, http api provides stream/vhost/srs/server bytes, codec and count. 2.0.136	10 years ago
winlin	2e9f2753c9	for #316, add stream codec info. 2.0.135	10 years ago
winlin	885b9af122	for #310, refine code to support he/hev2, use aac object.	10 years ago
winlin	8dbabe3708	fix #310, refine aac LC, support aac HE/HEv2. 2.0.134.	10 years ago
winlin	d3e2838fc6	for #310, refine the aac profile for adts and aac object for RTMP sequence header.	10 years ago
winlin	04f3f2a8f8	for #316, add codec info to stream.	10 years ago
winlin	8bf60895a9	refine the kbps of server.	10 years ago
winlin	fbbe46d272	refine the config, support directly parse file.	10 years ago
winlin	f26e719800	fix #322, fix http-flv stream bug, support multiple streams. 2.0.133.	10 years ago
winlin	1277968d4a	refine http client, use initialize to set host and port.	10 years ago
winlin	2bcb4f811c	refine http.	10 years ago
winlin	964e4be9d4	refine http request post. 2.0.132.	10 years ago
winlin	3982ec1d87	refine http request parse. 2.0.132.	10 years ago
winlin	4325809daf	refine http	10 years ago
winlin	6fccfa061d	refine the http request code.	10 years ago
winlin	025b707330	refine the http request reader.	10 years ago
winlin	3e394a5f06	for #320, set socket send buffer to smaller macro. 2.0.131	10 years ago
winlin	04dc60ebe1	refine http for srs, rename SrsGoHttp to SrsHttp.	10 years ago
winlin	983ab8fb89	pass all utest for 2.0	10 years ago
winlin	e7fd733dc5	fix the long long warning.	10 years ago
winlin	3d47fbdc5c	fix build failed of utest.	10 years ago
winlin	a47dbf7a92	for #320, refine code.	10 years ago
winlin	34d6a2ece5	for #320, support macro to disable the complex send algorithm and enable tcp no delay. 2.0.129	10 years ago
winlin	fb3fced8d0	for #179, revert dvr http api. 2.0.128.	10 years ago
winlin	8ed256b7e9	for #179, wait keyframe for dvr. 2.0.127	10 years ago
winlin	0213cc6466	for #179, refine dvr, support POST create dvr when publish not start. 2.0.126	10 years ago
winlin	b903a7b436	for #179, dvr suport vhost/app/stream level control. 2.0.125.	10 years ago
winlin	1cb8e44b1b	fix #304, fix hls bug, write pts/dts error. 2.0.124.	10 years ago
winlin	a3648063d5	fix #179, support dvr http api. 2.0.123.	10 years ago
winlin	d650118988	fix #179, dvr support api to start or stop. 2.0.123	10 years ago
winlin	1246989ea9	for #179, refine dvr, support callback when reap dvr segment.	10 years ago
winlin	849e59b05d	for #179, support http api to start dvr.	10 years ago
winlin	c67a4fdf97	for #179, enable http api crossdomain for dvr api.	10 years ago
winlin	1445086451	for #179, update the metadata of flv dvr file.	10 years ago
winlin	7077b74d03	for #179, add dvr plan append.	10 years ago
winlin	95b4baee7c	for #179, refine dvr code to more simple.	10 years ago
winlin	3d225e1bc7	refine dvr, donot append the flv header.	10 years ago
winlin	a984eeecab	refine dvr, append file when dvr file exists. 2.0.122.	10 years ago
winlin	1102c7a58f	refine pithy print to more easyer to use 2.0.121.	10 years ago
winlin	9d233db27e	fix #133, support push rtsp to srs. 2.0.120.	10 years ago
winlin	a954040d29	for #133, rtsp parse aac from rtp packet.	10 years ago
winlin	0cc693a3b8	for #133, decode the h264 NALU from rtp.	10 years ago
winlin	6a64164985	for #133, show more info about rtp.	10 years ago
winlin	45c0b12958	for #133, finish rtsp sdp, start rtp.	10 years ago
winlin	f14af45413	for #133, alloc and free rtp port.	10 years ago
winlin	d4ceff649f	the join maybe failed, should use a variable to ensure thread terminated. 2.0.119.	10 years ago
winlin	ccc30c70c4	the join maybe failed, should use a variable to ensure thread terminated. 1.0.28.	10 years ago
winlin	40fbfd8560	for #133, rtsp extract tcp/udp listener.	10 years ago
winlin	4807f7850d	for #133, rtsp parse the announce packet, parse the sps/pps and audio sequence header by base64.	10 years ago
winlin	604f4cc57b	for #133, support the rtsp options request and response.	10 years ago
winlin	c0e50265bd	for #133, create rtsp framework.	10 years ago
winlin	e81e090239	for #133, add rtsp listener and handler.	10 years ago
winlin	78f34ad46f	for #304, support config default acodec/vcodec. 2.0.118.	10 years ago