2664 Commits (9ead08725df7e9c41fbbc7bbc26b98c8847951e7)

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	b3bd007f0d	update git commit	10 years ago
winlin	ae6d0a5ab1	Merge branch '2.0release' into develop	10 years ago
tufang14	b6d650cdb4	m3u8 mount bug	10 years ago
winlin	dbcd7d883b	add script check_hls_backup.sh to research hls.	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	23b978c0bb	merge from github	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	0000c945ea	refine the proxy api server.	10 years ago
winlin	fe1886aa08	add proxy for hls	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	09ce6651eb	Merge branch '2.0release' into develop	10 years ago
winlin	1cb2992808	refine build for modules, add defines.	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	014993ad1e	remove the sudo of log.	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
winlin	a28c051c2c	osx support build nginx and ffmpeg	10 years ago
winlin	f3e5431d0f	check what a fuck os for some fresh.	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
winlin	9c43c73d86	Merge branch 'develop' of https://github.com/wenjiegit/simple-rtmp-server into wenjiegit-develop	10 years ago
winlin	33e579599c	refine build for osx	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	0017ee85e0	Merge branch '2.0release' into develop	10 years ago
winlin	59d9af8039	update conf	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	636bc574af	start 2.0release, 80773 lines.	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	74fa3ba16f	fix build failed for linux.	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	5d12a1ab20	for #328, add hds specification.	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	3e5821efff	enable http api for x86_x64	10 years ago
winlin	3732554844	remove the xcode state.	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	5370493140	add ingest to mac.dev conf.	10 years ago
winlin	24616e15b5	remove the code for xcode, not required.	10 years ago
winlin	b3aed2cb59	fix the bug of configure.	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	0ff49fd299	for #155, debug srs on xcode.	10 years ago
winlin	db7ddfd510	fix #155, #135, support osx(darwin) for mac pro. 2.0.137.	10 years ago
winlin	20fb5f3e8e	modify the colorful bash for osx.	10 years ago
winlin	b0953c1d3a	add comments of audio profile supported by srs.	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	b8e70f8538	support module	10 years ago
winlin	ee30e6bb1f	Merge branch 'develop' of github.com:winlinvip/simple-rtmp-server into develop	10 years ago
winlin	05d238f860	support modules.	10 years ago
winlin	688890cd7a	refine configure, generate objs/makefile first.	10 years ago
winlin	a29b8a7a5b	refine configure, move auto headers to script.	10 years ago
winlin	aaf87cf3d9	add srs module rule.	10 years ago
winlin	b360fe279d	remove libaacplus.	10 years ago
winlin	496f689de7	fix bug for libfdk aac.	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	f619f174e6	add readme for ide.	10 years ago
winlin	5d0cb7e68f	update conf for rtsp	10 years ago
winlin	012c29e124	for #133, update the wiki.	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
winlin	922150b2cf	for #304, rewrite hls/ts code, support h.264+mp3 for hls. 2.0.117.	10 years ago
winlin	3c813847bd	rewrite the ts remux of hls. 2.0.117	10 years ago
winlin	1ed3e283ab	implements the pat/pmt write ts header.	10 years ago
winlin	e88c1e32ee	always increasing target duration, for #304	10 years ago
winlin	25af6c6847	for #304, use stringstream to generate m3u8, add hls_td_ratio. 2.0.116.	10 years ago
winlin	381e88d698	add release code. ZhouGuowen for SRS2.0	10 years ago
winlin	b982b27f6f	add dev code for each release. HuKaiqun for SRS1.0	10 years ago
winlin	e19ee0cb99	for #311, set pcr_base to dts. 2.0.114.	10 years ago
winlin	87519aaae8	fix the avc codec bug, the ibmf format may like the annexb, we must guess only one time. 2.0.114	10 years ago
winlin	66931a8890	try to fix hls problem, print the video packets.	10 years ago
winlin	b8d4f68a69	try to refine hls, always flush video when reap segment.	10 years ago
winlin	5a3cd235fd	refine hls, try to fix the hls ts corrupt problem.	10 years ago
winlin	d5e3ac4e7d	for #310, the aac profile must be object plus one. 1.0.26	10 years ago
winlin	4820d455d5	for #310, workaround to force to LC/MAIN, donot support SSR above. 2.0.113	10 years ago
winlin	f8bdd28de6	add comments for hls m3u8, target duration may should not changed.	10 years ago
winlin	693c7a5349	refine hls m3u8, use LR(0x0a, \n) as new line char	10 years ago
winlin	81ea6d34ce	add pdf of hls rfc, corrent the content type.	10 years ago
winlin	30b1759aa9	fix bug for memory hls.	10 years ago
winlin	bdda337f33	fix aac adts bug, the frame length is 2bits.	10 years ago
winlin	0af6e5e829	fix bug for srs-librtmp	10 years ago
winlin	dba983d124	for #136, update the config for ram hls.	10 years ago
winlin	a23191497f	fix #136, support hls without io(in ram). 2.0.112	10 years ago
winlin	89b37d3469	for #136, refine the conf for hls.	10 years ago
winlin	4d10cc9f59	for #250, add conf.	10 years ago
winlin	16afe7ddbb	fix #250, support push MPEGTS over UDP to SRS. 2.0.111	10 years ago
winlin	4246be92c9	for #250, merge avc to codec. use queue to dequeue.	10 years ago
winlin	153a3a6c42	must user pithy print for mpegts print.	10 years ago
winlin	70c8fe13c4	for #250, support h264 video for push mpegts over udp. 2.0.110	10 years ago
winlin	66fccdbbd1	for #250, demux PES stream ok, only support h.264(annexb) and aac(adts) in mpegts over udp. 3.0.109.	10 years ago
winlin	bce78fdab6	for #250, add comments for elemetary stream specifed by stream_id.	10 years ago
winlin	a384cc400a	for #250, use udp packet handler.	10 years ago
winlin	35ab0ea627	for #250, use buffer to cache bytes, for system will split the udp packet.	10 years ago
winlin	b38bae2a89	for #250, refine parse pes packet, remove the clear method.	10 years ago
winlin	1685cdd48e	for #250, parse pes packet ok, ts message ok.	10 years ago
winlin	486277089d	for #250, parse the PES ts packet payload.	10 years ago
winlin	755e61e011	update the qt project.	10 years ago
winlin	8374017329	build libfdk-aac in ffmpeg. 2.0.108	10 years ago
winlin	cc87992fe0	for #250, decode the PMT and PAT	10 years ago
winlin	7692e50fc2	for #250, calc and verify the crc32 of PAT.	10 years ago
winlin	52b62918d9	for #250, decode the PAT of PSI ts packet.	10 years ago
winlin	51aecb8fde	for #250, decode the ts packet header and adaptation field.	10 years ago
winlin	bd395904df	for #250, the ts packet and adaptation field.	10 years ago
winlin	aff7a1cb4d	add ts packet definition for #250.	10 years ago
winlin	919a85b103	for #301, hls support h.264+mp3, ok for vlc. 2.0.107	10 years ago
winlin	2c42350489	for #301, http ts stream support h.264+mp3. 2.0.106	10 years ago
winlin	aaade0f04f	for #268, refine the pcr start at 0, dts/pts plus delay. 2.0.105	10 years ago
winlin	9cbc753e8e	for #151, #268, refine the pcr start at 0, dts/pts plus delay. 1.0.25	10 years ago
winlin	c9d270fbe0	refine code for #250, ts remux	10 years ago
winlin	b0daf1482d	update version to 1.0.24	10 years ago
winlin	1835957a2b	for #151, refine pcr=dts-800ms and use dts/pts directly. 1.0.24	10 years ago
winlin	ea85ad2e20	for #293, #250, move the ts codec to kernel ts.	10 years ago
winlin	d22e4e86d8	update projects for rtmp renamed to protocol	10 years ago
winlin	711b6ca277	for #250, basic stream caster framework. 2.0.104	10 years ago
winlin	6463d22a14	for #250, add mpegts over udp stream caster class.	10 years ago
winlin	7f02bfa3a4	for #250, the mpegts over udp stream caster framework.	10 years ago
winlin	52891b491a	listen and serve stream caster mpegts over udp.	10 years ago
winlin	f9d1e1111a	merge from feilong, consumer directly sleep when paused.	10 years ago
winlin	8ace73f30d	for #151, use absolutely overflow to make jwplayer happy. 2.0.103	10 years ago
winlin	4f5cc9c403	for #151, use absolutely overflow to make jwplayer happy. 1.0.23	10 years ago
winlin	6b89ffbc1d	add config section for stream caster.	10 years ago
winlin	73cfdea332	for #299, srs http server support dash vod stream over mp4 range. 2.0.103	10 years ago
winlin	e0ee8de2fb	for #299, srs http server support dash, flash request range in range or bytes.	10 years ago
winlin	a4ba40952a	for #250, rename rtmp to protocol dir.	10 years ago
winlin	d9a012164e	update vs2010 project.	10 years ago
winlin	a647043a06	update readme and wiki url for http ts stream	10 years ago
winlin	2a05783d5c	for #293, support http ts stream. 2.0.101	10 years ago
winlin	dfe385d0c9	for #293, move the simple buffer to kernel.	10 years ago
winlin	77d78eac5c	for #293, add http ts stream framework.	10 years ago
winlin	0f59073400	refine code, rename the pts to dts although both ok for audio.	10 years ago
winlin	913f98b902	for bug #293, http ts stream, move the avc codec from app to kernel.	10 years ago
winlin	dc6299171f	refine http stream code.	10 years ago
winlin	7d86c6d9e9	for bug #293, refine for fast cache of http stream.	10 years ago
winlin	2167a8385c	update version to 3.0.101	10 years ago
winlin	25807298ad	alias http_stream to http_server. rename http to http_static of vhost. rename http_flv to http_renux	10 years ago
winlin	7305fa6f03	update vs2010 filter	10 years ago
winlin	f26a2a8f0e	add vs2010 filters.	10 years ago
winlin	db700a0c64	update vs solution	10 years ago
winlin	31efea4f33	rename srs cmake ide to jetbrains clion	10 years ago
winlin	664c85cf3d	Merge branch 'develop' of github.com:winlinvip/simple-rtmp-server into develop	10 years ago
winlin	a3607c9193	use ide dir for ides.	10 years ago
winlin	49330b98b3	Merge pull request #296 from panda1986/develop ... 支持mp3音频编码	10 years ago
panda1986	797c1b0762	support all acodec. not forced to aac.	10 years ago
panda1986	e7d54c2ca9	Update srs_app_ffmpeg.cpp ... srs develop 新增支持mp3转码后，需要添加新的acodec-libmp3lame.所以去掉srs_app_ffmpeg.cpp中对acodec的判断	10 years ago
winlin	bb1331cc91	update conf.	10 years ago
winlin	b735e29d05	refine conf, add port.	10 years ago
winlin	e5ef4c2e66	update the conf of http static and stream.	10 years ago
winlin	5f194bc87c	merge from feilong, the crash for cosumer wait.	10 years ago
winlin	b7b268dfbf	fix #293, support http live flv/aac/mp3 stream with fast cache. 2.0.100.	10 years ago
winlin	29a8932b49	for bug #293, use http stream cache for android weixin to happy.	10 years ago
winlin	f9f2fcbb9c	for #293, add http stream cache for audio mp3/aac stream.	10 years ago
winlin	e6549b261c	for #293, support http mp3 streaming	10 years ago
winlin	d364a81d8f	for #293, support http mp3 streaming	10 years ago
winlin	99bf397487	for bug #293, add mp3 id3 spec	10 years ago
winlin	b04888a35d	for #293, #277, support http chunked encoding	10 years ago
winlin	15d87537a1	for bug #293, support aac stream.	10 years ago
winlin	3244c083c7	for bug #293, support http aac stream	10 years ago
winlin	7674524c31	for #239, empty the aac encoder	10 years ago
winlin	c0233542bf	for #293, add aac encoder for http aac stream.	10 years ago
winlin	77e43d1813	refine comments of aac publish for #212	10 years ago
winlin	c0a7752718	for #293, add aac mime audio/x-aac	10 years ago
winlin	d546827b1c	for #293, refine the mime of content type.	10 years ago
winlin	3b853a6dbd	fix #293, support rtmp remux to http flv live stream.	10 years ago
winlin	53d9faf395	for #293, update readme.	10 years ago
winlin	eea31ef4f3	for #293, support rtmp remux to http flv live stream.	10 years ago
winlin	faaa9187f2	for #293, mount http flv stream when publish.	10 years ago
winlin	2698e6dbae	for bug #293, http live streaming framework.	10 years ago
winlin	eff2d81016	for #293, add http flv stream	10 years ago
winlin	c4302b9b61	for bug #277, the http server subscribe the reload.	10 years ago
winlin	f1393ee43f	for bug #277, use http not found when no file.	10 years ago
winlin	398b212bfa	for bug #277, refine code, support default http vhost.	10 years ago
winlin	2742c0d3c2	for #277, support http vhost mount.	10 years ago
winlin	4513486266	refine http server, support mount dir for vhost.	10 years ago
winlin	bfff8413b6	refine code for #277, the copy first param is the dest.	10 years ago
winlin	c695a8fcbd	refine code for #277, extract the flv vod stream.	10 years ago
winlin	e71bc0cbc5	for bug #277, refine the http server.	10 years ago
winlin	bbe96a4b31	for bug #277, support flv stream.	10 years ago
winlin	cbed2bbca4	fix #277, refine http server refer to go http-framework. 2.0.98	10 years ago
winlin	9bbbaad288	for bug #277, refine http api refer to go http-framework. 2.0.97	10 years ago
winlin	a1f887f46f	refine code, move onMetaData to consts.	10 years ago
winlin	04aa6f8296	drop script data except the onMetaData packet.	10 years ago
winlin	cc22ca4890	hotfix #290, use iformat only for rtmp input. 2.0.95	10 years ago
winlin	4449a8d7b0	fix #290, use iformat only for rtmp input. 1.0.22	10 years ago
winlin	29be14dd37	merge from feilong, fix memory leak.	10 years ago
winlin	a4b61081cc	merge from feilong, fix memory leak.	10 years ago
winlin	fae006ca7c	merge from feilong, fix memory leak.	10 years ago
winlin	63309a0538	refine for bug #288, drop info frame without error.	10 years ago
winlin	b705ed0b90	for bug #288, refine the codec decode info frame failed. 1.0.21	10 years ago
winlin	964668dc73	merge from feilong, print format error.	10 years ago
winlin	b3225100e7	Merge pull request #282 from tufang14/develop ... add client num in statistic with traverse every client for #227	10 years ago
qiang.li	310e49e7f3	add client num in statistic with traverse every client	10 years ago
winlin	982e9555bd	merge from feilong, fix hls msg memory leak bug.	10 years ago
winlin	b466756931	merge from feilong for bug #281.	10 years ago
winlin	27e0521ace	fix #281, fix hls bug ignore type-9 send aud. 1.0.20	10 years ago
winlin	6c833902f9	merge http api from tufang. 2.0.92	10 years ago
winlin	ac584a4db2	Merge pull request #279 from tufang14/develop ... add client num for stream in statistic for #227	10 years ago
qiang.li	46d716612c	add client num for stream in statistic	10 years ago
winlin	44f5efda21	refine the print info.	10 years ago
winlin	0e9c9db3f4	fix the aggregate bug, adjust to starttime of msg. 2.0.91	10 years ago
winlin	5aa31568ba	fix the rtmp dump, parse the aggregate msg.	10 years ago
winlin	5661fc2676	refine dvr and rtmp dump, write the original data.	10 years ago
winlin	a402ca7120	refine code, the consumer always alive longer than queue recv thread.	10 years ago
winlin	89a3cf9efe	refine code, failed when specified complex but no ssl for srslibrtmp	10 years ago
winlin	0e03d019a8	for bug #215, srs rtmp dump support conn args. 2.0.90	10 years ago
qiang.li	08e9f6ef42	add play client num in statistic	10 years ago
winlin	f1efdcd000	refine code, use global virtual id to generate the id of vhost and stream.	10 years ago
winlin	ae63af6a4a	refine code, implements the stat.:	10 years ago
winlin	97bea51499	refine the api, response the error code and data.	10 years ago
winlin	cc796a433a	refine the statistic arch.	10 years ago
winlin	40ed2249e8	refine code to use the one coding style.	10 years ago
winlin	4bb17f0c81	replace the TAB with 4spaces	10 years ago
winlin	344ff24f66	add srs_app_statistic to upp project.	10 years ago
winlin	67adc8dc61	merge with security bug fix.	10 years ago
qiang.li	a4a93613d0	add statistic for stream	10 years ago
winlin	dc11418c79	fix #274: http-callback support on_dvr when reap a dvr file. 2.0.89	10 years ago
winlin	dd2c7e0b4d	hotfix to remove the pageUrl for http callback. 2.0.88	10 years ago
winlin	247b772449	hotfix to remove the pageUrl for http callback. 1.0.19	10 years ago
winlin	7f60d472e6	remove the change vhost forward.	10 years ago
winlin	45724bfaec	update conf for transcode.	10 years ago
winlin	0b9bbdbe74	Merge branch '1.0release' into develop	10 years ago
winlin	f9a33fbeee	fix the compile failed for utest at 32bits cpus	10 years ago
qiang.li	8d534d3470	get stream info use http api #227	10 years ago
winlin	f881bc43b5	fix #179: dvr support custom filepath by variables. 2.0.87	10 years ago
winlin	f89941254a	refine code of security deny check	10 years ago
winlin	18b15b9099	refine comments of security deny check	10 years ago
winlin	75f2607685	fix #211, support security allow/deny publish/play all/ip. 2.0.86	10 years ago
winlin	f8ec7c706d	merge from 1.0.18, hotfix #207, trim the last 0 of log. 2.0.85	10 years ago
winlin	e590537dca	fix #207, trim the last 0 of log. 1.0.18	10 years ago
winlin	07b207b7e3	remove test code for api-server.	10 years ago
winlin	9d34820c80	fix #158: http-callback check http status code ok(200). 2.0.84	10 years ago
winlin	8df0f724d6	fix #216, http-callback post in application/json content-type. 2.0.83	10 years ago
winlin	ca977ef739	hotfix #216, http-callback post in application/json content-type. 1.0.17	10 years ago
winlin	518a5a72ab	fix #263, srs-librtmp flv read tag should init size. 2.0.82	10 years ago
winlin	c1c01ec802	hotfix #270, memory leak for http client post. 2.0.81	10 years ago
winlin	bb6dfe40c1	fix #270, memory leak for http client post. 1.0.16	10 years ago
winlin	569596c10d	update copyright, from 2013 to 2015	10 years ago
winlin	1824e18bd2	fix the comment bug.	10 years ago
winlin	12f4abd553	fix #266, aac profile is object id plus one. 2.0.80	10 years ago
winlin	c0a6c3efa3	merge from 1.0release, hotfix #267, the forward dest ep should use server. 2.0.79	10 years ago
winlin	d9aca8ab82	hotfix #267, the forward dest ep should use server. 1.0.15	10 years ago
winlin	e27c95b0e8	merge from 1.0release for #268, the hls pcr is negative when startup. 2.0.78	10 years ago
winlin	513c1ec6d5	fix #268, the hls pcr is negative when startup. 1.0.14	10 years ago
winlin	5e9ff71740	refine the log verbose	10 years ago
winlin	2d229b09be	refine rtmp protocol stack comments	10 years ago
winlin	5a229e89bf	refine the rtmp protocol stack comments, the stream id in little-endian.	10 years ago
winlin	9e35664510	refine the simple handshake comment.	10 years ago
winlin	8757473a7a	Merge branch '1.0release' into develop	10 years ago
winlin	dec4f6b989	hotfix 1.0release, add remote gitlab	10 years ago
winlin	8ea6da2607	Merge branch '1.0release' into develop	10 years ago
winlin	dfd4eeca45	hotfix 1.0release, git checkout develop when commit	10 years ago
winlin	9a66d22f3b	hotfix 1.0release, 1.0.13	10 years ago
winlin	b8de3bd3b4	convert the core to unix format.	10 years ago
winlin	92146712d8	fix srs-librtmp send raw aac audio channel bug. 2.0.76	10 years ago
winlin	9788570ba5	fix bug for ubuntu14 to build.	10 years ago
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	10 years ago
winlin	2e43a63bf4	fix #264, ignore the video NALU which is actually a sequence header to make HLS happy. 1.0.12	10 years ago
winlin	b77e1de1d1	fix bug of utest	10 years ago
winlin	81e70e7bdb	for bug https://github.com/winlinvip/st-load/pull/3, add ecma array to object.	10 years ago
winlin	eef8034632	merge from 1.0release for bug #264. 2.0.74	10 years ago
winlin	7737042795	fix #264, remove the test code. 1.0.11	10 years ago
winlin	1dfac0bf1d	fix #264, support disconnect publish connect when hls error. 1.0.11	10 years ago
winlin	db13c725a6	refine #259, rename the on_dispose to wakeup. 2.0.73	10 years ago
winlin	61a648f1d2	refine for #259, chmod -x files.	10 years ago
winlin	24815e4efe	refine code for bug #239	10 years ago
winlin	304208f822	fix #239, traverse the token before response connect. 1.0.10.	10 years ago
tufang14	3d0d43c5dc	token bug ... 多级origin-edge模式，edge上功能不生效	10 years ago
winlin	0c132e9781	update the log position.	10 years ago
winlin	127b96b255	add git2unix and git commit script.	10 years ago
winlin	9c033c7da6	hotfix 1.0, author bug, use error macro. 1.0.9	10 years ago
winlin	575e50b6e2	hotfix to add comments on 1.0release	10 years ago
winlin	be53b10ed3	refine log position	10 years ago
winlin	d91a9dfa9d	udpate the srs_bwt.	10 years ago
winlin	cd0ab5fb43	update PRIMARY, AUTHORS, CONTRIBUTORS rule	10 years ago
winlin	db7af6259a	update PRIMARY, AUTHORS, CONTRIBUTORS rule	10 years ago
winlin	d672fae255	update PRIMARY, AUTHORS, CONTRIBUTORS rule. 1.0.8	10 years ago
winlin	44962c9142	update PRIMARY, AUTHORS, CONTRIBUTORS rule	10 years ago