aunix/ZLMediaKit
1
0
Fork 0
mirror of https://gitee.com/xia-chu/ZLMediaKit.git synced 2026-05-06 19:07:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,521 Commits 16 Branches 0 Tags 156 MiB
021f09e62b
Commit Graph

161 Commits

Author SHA1 Message Date
xgj
9d532cf16b fix startsendrtp pt error 2022-04-01 19:12:37 +08:00
xgj
61625f458f for webapi startsendrtp can send raw rtp 2022-04-01 18:28:09 +08:00
ziyue
595182cebb Revert "当调用mk_media_source_close(ptr, 1);时，主动注销流 (#1401)" 
This reverts commit c97aa8483e.
 2022-02-09 14:21:35 +08:00
夏楚
c72cf4cbcc
整理命名空间 (#1409) 
* feat: remove using namespace mediakit in header files.

(cherry picked from commit d44aeb339a8a0e1f0455be82b21fe4b1b536299f)

* feat: remove using namespace mediakit in FFmpegSource.h

* feat: remove using namespace mediakit in RtpExt.h

* feat: remove using namespace mediakit in header files.

* feat: remove using namespace std in header files.

* feat: remove using namespace std in header files when zltoolkit remove std in header

* 补充命名空间

* 整理命名空间

* 整理命名空间2

* 修复macos ci

* 修复编译问题

* 修复编译问题2

* 修复编译问题3

Co-authored-by: Johnny <hellojinqiang@gmail.com>
Co-authored-by: Xiaofeng Wang <wasphin@gmail.com>
 2022-02-02 20:34:50 +08:00
joshuafc
c97aa8483e
当调用mk_media_source_close(ptr, 1);时，主动注销流 (#1401) 
* 当调用mk_media_source_close(ptr, 1);时，主动注销流

主动调用上述函数时，期望不再等待RtmpSession.cpp:49处getPoller()->doDelayTask(continue_push_ms, [push_src]() { return 0; });捕获的指针，等待析构时反注册，而是立即反注册。

* `MediaSource::close`逻辑执行成功后执行`unregist`
 2022-01-27 14:56:18 +08:00
xiongziliang
3bf6ec8939 修复获取推流所有权导致引用计数紊乱的bug: #1397 2022-01-26 00:37:51 +08:00
ziyue
0ae9a8c8c8 Revert "添加递归溢出检测代码: #1363" 
This reverts commit 8937d9ea92.
 2022-01-24 11:38:36 +08:00
ziyue
8937d9ea92 添加递归溢出检测代码: #1363 2022-01-17 14:47:55 +08:00
ziyue
5b6ff0af27 完善mingw编译环境的适配 2022-01-11 14:09:57 +08:00
ziyue
f5efd232a9 rtsp/rtmp推流支持断连续推: #1240, #1300 2022-01-10 16:43:57 +08:00
alexliyu7352
a441168004
修正不使用resetWhenReplay选项时, MediaSource会重复注册的问题 (#1330) 2022-01-04 14:47:41 +08:00
ziyue
0b79de9d13 MediaSource: 禁止重复推送一个已经注册的流 2021-11-19 15:33:16 +08:00
ziyue
4067f2beb6 ps rtp推流接口(startSendRtp)支持推送本地mp4录像 2021-10-21 10:21:52 +08:00
xiongziliang
7d1b2583e6 优化代码 2021-09-28 22:44:02 +08:00
ziyue
04bf829540 非rtsp协议减少一帧延时 2021-08-30 18:05:21 +08:00
ziyue
10522e4ea5 完善getOriginUrl接口 2021-08-16 17:31:13 +08:00
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
xiongziliang
45c5f1ec4c 避免死锁 2020-04-06 21:23:35 +08:00
xiongziliang
e5d5cabf89 部分恢复录制相关接口 2020-04-05 09:26:29 +08:00
xiongziliang
7019e4717c 整理授权协议 2020-04-04 20:30:09 +08:00
xiongziliang
cefb2a7cc4 hls/mp4录制不再能随时开启或关闭 2020-04-04 14:33:12 +08:00
xiongziliang
a581f78d12 优化点播相关代码 2020-04-04 08:30:20 +08:00
xiongziliang
6e5cd0345d 优化点播相关代码 2020-04-03 23:27:16 +08:00
xiongziliang
42eece5b9a mp4点播无人观看时自动关闭 2020-04-03 22:39:44 +08:00
xiongziliang
46be8a38e7 重写MP4点播 2020-04-03 20:45:58 +08:00
xiongziliang
ace200716a 修复无人播放事件触发延时不准确的bug 2020-03-23 10:21:17 +08:00
xiongziliang
e4e5400641 优化虚拟主机相关 2020-03-12 12:47:15 +08:00
xiongziliang
f384f5e025 解决死锁问题 2020-03-04 21:57:31 +08:00
xiongziliang
6a97fcb3de 媒体注册、重置事件改成同步触发 2020-02-01 22:57:48 +08:00
xiongziliang
54736859d4 基本完成hls相关的主要事件 2019-12-29 10:49:04 +08:00
xiongziliang
1afacdcff8 初步添加HlsMediaSource 2019-12-28 18:50:56 +08:00
xiongziliang
94806b2cd6 初步实现hls播放器个数计数 2019-12-28 16:48:11 +08:00
xiongziliang
e663ddd9a6 简化事件参数 2019-12-24 14:08:16 +08:00
xiongziliang
6eb4d5916d 修复bug 2019-12-04 19:19:03 +08:00
xiongziliang
b3fcb4c038 重写mp4录制驱动机制 2019-12-04 18:36:30 +08:00
xiongziliang
de33d6a847 整理文件录制 2019-12-04 10:45:38 +08:00
xiongziliang
5249c24430 整理MediaSource代码 2019-12-03 16:10:02 +08:00
3503207480@qq.com
036b36f012 注释，说明 
注释，说明
 2019-08-30 11:17:27 +08:00
xiongziliang
7adddc361c 异步触发kBroadcastStreamNoneReader事件，修复#44 2019-07-11 14:38:54 +08:00
xiongziliang
bf39cf3e33 整理优化代码 2019-06-28 16:48:02 +08:00
xiongziliang
c454240c83 完善事件取消监听机制 2019-06-06 15:29:36 +08:00
xiongziliang
a39c4c1344 完善错误提示 2019-05-29 18:08:50 +08:00
xiongziliang
f8f3c5dd19 优化虚拟主机相关 2019-05-29 09:30:39 +08:00
xiongziliang
d0deea8b58 优化虚拟主机相关 2019-05-29 09:28:35 +08:00
xiongziliang
a109d966c8 优化虚拟主机相关 2019-05-29 09:26:16 +08:00
xiongziliang
c1b6df7bc7 优化虚拟主机相关 2019-05-29 09:24:02 +08:00
xiongziliang
a100ee0acd 支持全局的禁用虚拟主机 2019-05-28 17:14:36 +08:00
xiongziliang
94ccd27f47 等待流注册时间可配置化 2019-05-28 09:25:41 +08:00
xiongziliang
72581cf415 bug fixed 2019-05-27 22:51:16 +08:00
xiongziliang
0dc7cbb879 精简等待监听流异步注册后回复事件相关代码 2019-05-27 22:32:07 +08:00
xiongziliang
6d3d0272a6 删除冗余文件 
更新licence日期
 2019-05-08 15:40:07 +08:00