Commit Graph

333 Commits

Author SHA1 Message Date
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
ziyue
f5f58196b5 修改常量命名 2021-10-16 16:58:03 +08:00
haorui wang
adc6f652bd
修复zlm推流FMS,修正zlm的RTMP协议 (#1140)
* 修复zlm推流FMS,修正zlm的RTMP协议
Co-authored-by: 夏楚 <771730766@qq.com>
2021-09-29 16:57:19 +08:00
xiongziliang
b1666eb651 实现媒体源pause/speed接口:#1129 2021-09-29 00:16:56 +08:00
ziyue
e9008afca0 addTrack/inputFrame接口支持返回值;新增全局添加静音音频接口 2021-09-27 13:12:53 +08:00
ziyue
4dbe0a1d3e 合并pr:#1025 2021-08-12 20:37:46 +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
ziyue
4b34e58d3c 移除MultiMuxerPrivate对象,修复rtp发送时无sps pps帧的问题 2021-07-20 12:42:53 +08:00
ziyue
c8f00cefa0 完善获取flv是否包含音视频相关逻辑 2021-07-15 11:29:21 +08:00