Commit Graph

95 Commits

Author SHA1 Message Date
ziyue
4dbe0a1d3e 合并pr:#1025 2021-08-12 20:37:46 +08:00
ziyue
30b139eaf0 Merge branch 'feature_bafc' of https://github.com/xia-chu/ZLMediaKit 2021-08-12 11:18:34 +08:00
ziyue
e3d519dde6 无人观看自动关闭流时才打印日志 2021-08-12 10:54:57 +08:00
baiyfcu
0ed902509a player增加speed,pause扩展,seek支持秒级定位,MP4按时间戳生成文件 2021-08-09 18:28:43 +08:00
ziyue
566a49e227 修复getMediaTracks接口相关功能 2021-07-20 13:15:57 +08:00
wxf
ece7186e6c 改为按 Session 查找媒体源以支持 TCP/UDP Session 2021-07-15 11:25:48 +08:00
ziyue
1485be266a 查找MediaSource时,app与stream id不能为空 2021-07-01 10:56:59 +08:00
xiongziliang
09fa6b7aae 精简代码 2021-06-30 23:35:19 +08:00
xiongziliang
c470016316 优化MediaSource遍历性能 2021-06-30 23:03:27 +08:00
ziyue
69c3b24d06 优化遍历MediaSource接口性能 2021-06-30 21:24:16 +08:00
xiongziliang
f69a23565d Merge remote-tracking branch 'github/master' into dev 2021-04-18 23:13:47 +08:00
xiongziliang
387574a802 rtp主动推流时不触发无人观看事件:#799 2021-04-18 21:34:34 +08:00
xia-chu
155c59e17e 添加rtc类型的推流 2021-04-07 18:17:49 +08:00
xiongziliang
c0f4899950 录制接口支持指定切片时间大小:#747 2021-03-07 10:41:57 +08:00
xiongziliang
56f044f8ed 修复线程安全bug 2021-02-28 20:58:25 +08:00
xiongziliang
aa45590c13 添加对象统计接口 2021-01-23 09:44:37 +08:00
xia-chu
f63b2b1863 去除编译警告,修复bug 2021-01-19 16:05:38 +08:00
xia-chu
b6cbc87712 全面整理代码,去除编译警告 2021-01-17 18:31:50 +08:00
xiongziliang
c69e9b8ec1 主动发送rtp接口(startSendRtp)支持返回本地端口: #538 2021-01-02 20:43:02 +08:00
ziyue
fd15fe70b2 合并 https://gitee.com/kingyuanyuan/ZLMediaKit 2020-12-27 18:41:53 +08:00
xiongziliang
55cf411c1e 支持bitrate 2020-12-05 12:22:17 +08:00
xiongziliang
c4c978be44 去除编译警告 2020-11-29 09:34:02 +08:00
hewenyuan
50927548e9 增加多路RTP视频流输出 2020-11-27 17:19:55 +08:00
xiongziliang
ab9a605a66 优化代码结构 2020-10-24 23:33:13 +08:00
xiongziliang
38a002646d 修复FFmpeg拉流代理功能缺陷的问题:#533 2020-10-24 23:31:58 +08:00
xiongziliang
8cb564de0a 优化直播源类型说明 2020-10-24 23:31:22 +08:00
xiongziliang
02c4aa3f4b 优化代码 2020-10-24 23:28:25 +08:00
xiongziliang
a1de3bfd30 添加流创建时间、在线时间 2020-10-01 18:57:15 +08:00
xiongziliang
7f3877e437 添加网速统计功能 2020-10-01 11:02:00 +08:00
xiongziliang
5cd8e8ae1c 添加媒体生成源信息 2020-09-27 11:32:49 +08:00
xiongziliang
08a5891bdc 修复url解析相关bug 2020-09-20 20:15:39 +08:00
xiongziliang
07ef417250 优化HLS直播相关代码 2020-09-20 10:13:15 +08:00
xiongziliang
be1e872f0c 完善按需转协议(包括hls) 2020-09-12 19:20:18 +08:00
xiongziliang
9e26a02fb1 实现rtsp/rtmp按需转协议功能 2020-09-12 19:09:56 +08:00
xiongziliang
51ae8d4083 复用忽略协议查找流的相关代码 2020-09-06 18:19:54 +08:00
xiongziliang
09e484794b 实现ps-rtp的发送 #366 2020-09-06 17:56:05 +08:00
xiongziliang
ac70597216 优化getTrack接口相关代码 2020-09-06 17:54:52 +08:00
xiongziliang
eca9236955 优化与拦截代码 2020-09-06 17:52:07 +08:00
xiongziliang
f23e117751 MultiMediaSourceMuxer默认能处理大部分事件 2020-08-08 12:20:13 +08:00
xiongziliang
f84b3d90b4 流未找到事件中,可以立即返回播放失败: #417 2020-07-16 16:00:31 +08:00
xiongziliang
3c858a8351 添加媒体注册回调事件:#373 2020-07-02 18:14:39 +08:00
xiongziliang
0548256c30 合并写缓存优化对rtp的支持 2020-05-27 11:25:56 +08:00
xiongziliang
dea36cfc84 优化合并写逻辑,确保GOP缓存第一帧为关键帧并确保音视频数据的交织性 2020-05-27 11:09:02 +08:00
xiongziliang
ff7914e441 修改MediaSource相关接口 2020-05-26 10:11:58 +08:00
xiongziliang
f9df7f5217 去除ultraLowDelay配置项 2020-04-29 11:08:43 +08:00
xiongziliang
f222af2632 完善代码 2020-04-24 15:28:27 +08:00
xiongziliang
e85a8f277e RTMP协议限制G711规格、日志打印codec相关信息 2020-04-24 15:08:28 +08:00
xiongziliang
2e74d5c957 修复合并写相关bug: #282 2020-04-24 13:51:04 +08:00
xiongziliang
b6946a5968 事件广播触发者改成SockInfo对象 2020-04-23 21:38:44 +08:00
xiongziliang
99a55ddaaa 添加合并写功能 2020-04-09 16:19:03 +08:00