Commit Graph

342 Commits

Author SHA1 Message Date
ziyue 520945c2e9 提高线程安全性 2022-11-01 10:53:38 +08:00
ziyue ac1abb34da 新增媒体流flush机制:#1996 2022-10-16 19:54:17 +08:00
ziyue 34838b1b26 rtmp点播采用简单握手,发送心跳包,兼容fms服务器: #2007 2022-09-30 13:36:43 +08:00
ziyue 15affeff1d 优化关闭媒体源相关逻辑: #1963 2022-09-18 20:36:47 +08:00
cqm 999e0b274e 简化代码:
- MediaSource引入shortUrl和getUrl来简化日志输出
- WebApi引入fillSockInfo
2022-09-07 11:47:15 +08:00
ziyue 4f47b7a5fe 修复getMediaPlayerList获取http-flv播放器列表时崩溃的问题 2022-09-05 14:59:46 +08:00
xiongziliang 06c6654ed5 精简代码 2022-09-03 16:32:10 +08:00
custompal 0d6509ce03 统一部分变量名和代码样式风格 2022-08-30 21:24:25 +08:00
custompal 04aa3ef41f 增加获取媒体流播放器列表功能 2022-08-30 21:05:19 +08:00
xiongzilaing 679c79802f 整理媒体事件相关代码,删除无须重载时的多余代码逻辑 2022-08-28 17:25:56 +08:00
ziyue 5babe63cdb 修复Windows编译问题 2022-07-29 15:47:06 +08:00
ziyue 7d8b212a3c 修复rtmp汇报窗口太小导致循环递归的bug:#1839 2022-07-29 12:02:00 +08:00
ziyue b19574cea7 防止内存越界 2022-07-18 15:41:18 +08:00
xiongguangjie 4108e81d2f avoid multi rtmp player metadata 2022-07-07 17:44:19 +08:00
xiongziliang 121b78e5dd 推流器主动断开时,避免开启断流续推功能 2022-07-02 15:36:44 +08:00
xiongziliang 7a24a22661 完善推流判断逻辑 2022-07-02 13:13:16 +08:00
xiongguangjie 87dd1c7f7f avoid loopback ffmpeg push stream exit receive deleteStream message after broken pipe 2022-07-02 12:33:32 +08:00
xiongguangjie 266aaf9e0b fix rtsp and rtmp on_flow_report player or pusher judge error 2022-06-24 09:06:46 +08:00
baiyfcu 9acd1c2b36 修复on_flow_report player状态 2022-06-23 18:08:21 +08:00
xiongguangjie fe652e46b4 rtmp session when client stop publish not set push src null avoid judge player or pusher error 2022-06-16 10:57:48 +08:00
xiongziliang 97116e1208 完善getOwnerPoller相关逻辑 2022-06-11 13:08:58 +08:00
xiongziliang b23cbaa0f8 on_publish hook新增continue_push_ms参数,用于断连续推延时控制 2022-06-04 11:06:35 +08:00
xiongguangjie b61cce85bd
修复拉取srs rtmp 流 play 命令参数类型不对的bug(参考vlc -2000 为number 类型) (#1644) 2022-05-19 19:01:23 +08:00
ziyue a44334acaf 全面支持ipv6 2022-05-08 16:33:33 +08:00
alexliyu7352 c1d2adebae
rtmp拉流的兼容性改进 (#1595)
* 修复play指令的bug

* 修改MSG_AGGREGATE的时间戳处理逻辑

这里参考了ffmpeg的方式来计算时间戳.

* add bom
2022-04-28 14:13:09 +08:00
xiongziliang 974055fd17 确保推流器主动断开时,不开启断连续推特性: #1559 2022-04-16 21:37:07 +08:00
xiongziliang 4dc621e1bb 转协议选项抽象为ProtocolOption对象 2022-03-12 13:24:23 +08:00
ziyue d88fe077ed on_publish hook新增originType字段 2022-03-02 18:03:44 +08:00
ziyue 72caa43c97 主动关闭的流不支持断流续推: #1401 2022-02-09 14:31:40 +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
ziyue 412d280cd7 修复断连续推转协议失效的bug 2022-01-10 17:34:39 +08:00
ziyue f5efd232a9 rtsp/rtmp推流支持断连续推: #1240, #1300 2022-01-10 16:43:57 +08:00
ziyue 5a592e6db6 优化循环池性能 2022-01-06 14:30:44 +08:00
ziyue dce6b27f4f Http-FLV: http-flv直播采用绝对时间戳并支持las 2021-12-28 21:21:01 +08:00
ziyue 30b63ad656 Rtmp: rtmp分发改成绝对时间戳 2021-12-28 21:21:01 +08:00
xiongziliang 7f649b94e5 Rtmp: 修复openssl未开启导致链接失败的问题: #1301 2021-12-26 19:58:30 +08:00
xiongziliang 98d435ef50 Rtmp: 修复openssl未开启导致编译失败的问题: #1301 2021-12-26 18:34:55 +08:00
ziyue 4e01c29833 Rtmp: 优化复杂握手c0c1生成算法性能 2021-12-22 22:20:28 +08:00
ziyue ab14585a81 Rtmp: rtmp客户端支持复杂握手,兼容某些rtmp服务器 2021-12-22 22:06:19 +08:00
ziyue 3a99440296 Refine: 优化代码,减少拷贝 2021-11-23 15:59:18 +08:00
xiongziliang 97f7255f0a Performance: 使用循环池优化rtmp分发性能 2021-11-21 11:34:20 +08:00
xiongziliang 5404a5266a Performance: 使用循环池优化http-flv分发性能 2021-11-21 11:28:14 +08:00
ziyue afdc5e4267 Refine: 优化tcp/udp服务器异常管理断开机制 2021-11-19 15:26:33 +08:00
ziyue ac41a1e933 RtmpPlay: 兼容无metadata的rtmp流 2021-11-10 15:25:24 +08:00
ziyue b7e187d7af Player: 添加kWaitTrackReady选项决定播放器是否等待所有track ready再回调 2021-11-10 13:56:04 +08:00
ziyue e38f2253ff Demuxer: 解复用减少一次MediaSink的数据过滤 2021-11-10 13:44:29 +08:00
ziyue 817542cd0c Mutex: 删除一些不必要的互斥锁 2021-11-10 11:38:54 +08:00
ziyue fdfde17ec7 Demuxer/Player: 修改解复用与播放器底层逻辑,确保触发播放成功回调时不丢帧 2021-11-10 11:38:54 +08:00
ziyue 37fdb8d135 MediaSource: 继承改成私有 2021-11-10 11:38:54 +08:00
ziyue dad0c5e3cc MediaPusher: 抽象精简代码 2021-11-09 17:49:18 +08:00