Commit Graph

323 Commits

Author SHA1 Message Date
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
ziyue fe42ea30fc 整理flv复用器 2021-07-15 11:16:11 +08:00
yangkun 03f6f4c4c0 fix publish type 2021-07-09 14:58:58 +08:00
ziyue 3165a2f81c 修改服务器版本信息声明相关代码 2021-06-29 11:16:05 +08:00
ziyue 307be4339f Merge branch 'dev' of https://github.com/xia-chu/ZLMediaKit into dev_test 2021-06-23 17:32:09 +08:00
xiongziliang ce2122d3b6 优化rtmp chunk相关处理代码 2021-06-22 10:39:16 +08:00
ziyue caecfc3fda Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit into dev 2021-06-21 17:51:15 +08:00
ziyue f8467f21fb 推流失败时打印日志 2021-06-17 11:34:24 +08:00
ziyue a67246f57e Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev 2021-06-16 10:40:17 +08:00
baiyfcu ca192a4286 H265 I帧多slice情况下导致花屏问题
H265 I帧分片多包情况下,GPO缓冲只保存了I帧最后一个分片导致花屏
2021-06-09 09:51:28 +08:00
ziyue 0593f65fcb 完善代码 2021-06-08 14:50:12 +08:00