Commit Graph

106 Commits (b231550c3295a4f07c01f6a9aba51f778e3e1932)

Author SHA1 Message Date
winlin 664844b5f5 merge from srs2. for #513. 8 years ago
winlin 9ba4bed648 merge srs2 8 years ago
winlin cb1d47bfef fix #713, refine source to avoid critical fetch and create. 2.0.222 8 years ago
winlin 0e9318e5d8 merge from 2.0 9 years ago
winlin c7b97aa1c3 fix memory leak at source. 2.0.214 9 years ago
winlin 7ae2c6bf50 merge from srs2. 9 years ago
winlin eca46c03d2 refine code for consumer to refer the rtmp connection. 9 years ago
winlin d0c74fa7cd update 2015 to 2016 9 years ago
winlin 01c46bdbfd rename org simle-rtmp-server to ossrs 9 years ago
winlin 1ffd5fd455 rename org simple-rtmp-server to ossrs 9 years ago
winlin 0e52fc6d5b rename SrsStream to SrsBuffer 10 years ago
winlin 1fd83d9314 refine the order. 10 years ago
winlin 2a1b2b69a0 for #459, dvr support apply filter for ng-control dvr module. 10 years ago
winlin a7c4b786cf merge from 2.0 10 years ago
winlin 07ef8160a3 clear the queue when edge republish. 10 years ago
winlin f7c893d907 for #319, move gop_cache and queue_length to play 10 years ago
winlin 9c4340f789 for #319, move atc and atc_auto to play 10 years ago
winlin d6b0aa3a5b for #319, move time_jitter and mix_correct to play 10 years ago
winlin c34b0c86e1 fix #367, support nginx-rtmp exec. 3.0.1 10 years ago
winlin 94641c812b fix #442, support kickoff client. 10 years ago
winlin 3b0b2e0b85 fix the bug to support dump packets with count. 10 years ago
winlin ae37fa8f3e use send_min_interval for stream control. 2.0.183 10 years ago
lovacat e8c0ca7af0 fix #442: HTTP API kickoff client. 10 years ago
zhengfl a5a9f7c8c5 refine code:优化edge模式回源播放线程启动流程 10 years ago
zhengfl 2263f2a610 refine code:
优化 判断重复推流 及 推流流程
10 years ago
winlin 0aed408855 refine code, to 644 and unix encoding. 10 years ago
zhengfl db9ea4e66e rewrite #438 10 years ago
zhengfl f9257b89e7 fix #438
问题:edge模式,推流时异常断开。
    解决方法:增加edge模式推流检测。
10 years ago
winlin 56938efdbd fix #425, refine the time jitter, correct (-inf,-250)+(250,+inf) to 10ms. 2.0.175 10 years ago
winlin 1f1776a0d8 fix the export project bug. wakeup connection when dispose server. 10 years ago
winlin 811ef4bcf6 dispose the gop cache 10 years ago
winlin beb0431746 detect the monotonically increase and warn to use mix_correct 10 years ago
winlin 2d9f258eaf refine the mix correct algorithm, mix when got 10+ av or got 1 video and 1 audio. 10 years ago
winlin 0fbfad4172 fix gop cache, drop video only when video and not h.264 10 years ago
winlin d611bb6b45 for #209, server cycle to enable the hls to cleanup. do dispose 10 years ago
winlin 5d7b0edccc merge from bravo code, fix some warnings. 10 years ago
winlin b23e196f20 migarate from winlinvip to srs org, move the copyright to srs org. 10 years ago
winlin 115daa3cc1 migarate from winlinvip to srs org 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 bbac2348db for #354, remove the double underscore functions and variables. 10 years ago
wenjie.zhao 643f18abe4 add hds reload supported.#328 10 years ago
winlin ffef62900f for #328, support adobe hds. 2.0.138. 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
wenjie.zhao d4198ee8ba add hds supported. 10 years ago
winlin 0213cc6466 for #179, refine dvr, support POST create dvr when publish not start. 2.0.126 10 years ago
winlin a23191497f fix #136, support hls without io(in ram). 2.0.112 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 2698e6dbae for bug #293, http live streaming framework. 10 years ago