Commit Graph

304 Commits

Author SHA1 Message Date
xiongziliang aa45590c13 添加对象统计接口 2021-01-23 09:44:37 +08:00
xia-chu f63b2b1863 去除编译警告,修复bug 2021-01-19 16:05:38 +08:00
xiongziliang 5d752c89b5 修复编译问题 2021-01-17 20:15:08 +08:00
xia-chu b6cbc87712 全面整理代码,去除编译警告 2021-01-17 18:31:50 +08:00
xia-chu 0e3c21932d 修复编译失败的问题 2021-01-03 15:55:26 +08:00
xiongziliang c69e9b8ec1 主动发送rtp接口(startSendRtp)支持返回本地端口: #538 2021-01-02 20:43:02 +08:00
夏楚 4244cbf29e
Merge pull request #656 from rmokerone/master
RTSP推流增加L16动态payload type支持(RFC 3551 Section 4.5.11, RFC 2586)
2020-12-27 21:00:34 +08:00
ziyue fd15fe70b2 合并 https://gitee.com/kingyuanyuan/ZLMediaKit 2020-12-27 18:41:53 +08:00
ziyue 2941068724 优化rtsp客户端代码 2020-12-27 18:11:10 +08:00
Liu Jiang 923768623a L16格式消除unknown codec提醒,添加只支持RTSP协议推流拉流提醒 2020-12-26 16:52:36 +08:00
xiongziliang 55cf411c1e 支持bitrate 2020-12-05 12:22:17 +08:00
xiongziliang c4c978be44 去除编译警告 2020-11-29 09:34:02 +08:00
xiongziliang e7569c8cbc 删除多余日志 2020-11-29 09:33:49 +08:00
hewenyuan 50927548e9 增加多路RTP视频流输出 2020-11-27 17:19:55 +08:00
xiongziliang f7433b0f90 头文件中隐藏不必要的宏,避免宏蔓延:#554 2020-11-21 22:39:32 +08:00
xiongziliang 1cc3add97f 提升按需转协议性能与体验 2020-11-15 00:59:31 +08:00
xiongziliang 0f54351811 按需转协议默认关闭(意即一直转协议) 2020-11-15 00:43:42 +08:00
xiongziliang bb9b39d821 添加按需转协议开关,默认一直转协议:#569 2020-11-15 00:40:46 +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 130c411ae4 修复添加track太晚导致的bug: #528 2020-10-20 10:21:35 +08:00
xiongziliang dfaa8b540c 使用临时变量和std::move减少智能指针的拷贝构造 2020-10-10 18:23:25 +08:00
xiongziliang a1de3bfd30 添加流创建时间、在线时间 2020-10-01 18:57:15 +08:00
xiongziliang 728dd3ec3c 合并pr:#509 2020-10-01 14:53:15 +08:00
xiongziliang eccb1a664c Merge branch 'dev' of https://github.com/chatop2020/ZLMediaKit 2020-10-01 13:39:19 +08:00
xiongziliang 7f3877e437 添加网速统计功能 2020-10-01 11:02:00 +08:00
qiuzhouwei 4132df89cd 增加了服务器id,修改了record.cpp中mp4录制的自定义录制路径,ffmpegsource中的超时时间,webhook中的唯一id等 2020-09-28 10:45:59 +08:00
xiongziliang bae52db6ba 修复关闭某些功能后,编译失败的问题 2020-09-27 16:54:55 +08:00
xiongziliang 5cd8e8ae1c 添加媒体生成源信息 2020-09-27 11:32:49 +08:00
xiongziliang 416d21df36 返回值去除std::move 2020-09-21 14:32:56 +08:00
xiongziliang 08a5891bdc 修复url解析相关bug 2020-09-20 20:15:39 +08:00
xiongziliang d971eccf92 新增支持HTTP-fMP4 WebSocket-fMP4直播 2020-09-20 19:45:37 +08:00
xiongziliang c76930e3cd 支持http-ts/websocket-ts直播 2020-09-20 00:21:46 +08:00
xiongziliang 0fce108de5 Merge branch 'feature/on-record-ts' of https://github.com/wasphin/ZLMediaKit into pr 2020-09-20 11:01:45 +08:00
xiongziliang 07ef417250 优化HLS直播相关代码 2020-09-20 10:13:15 +08:00
xiongziliang 9c873e1d19 去除转协议开关参数 2020-09-20 09:26:00 +08:00
wxf 748bb8e488 统一 mp4 及 ts 录像信息定义 2020-09-15 19:09:26 +08:00
wxf b22a6e3dbd 添加 ts 切片是否通知选项, 默认为不通知 2020-09-15 17:46:12 +08:00
wxf 188e087fc2 添加 hls ts 切片录制完成通知 2020-09-14 13:20:45 +08:00
xiongziliang 3b5053af50 修复关闭HLS后,编译失败的问题 2020-09-12 19:46:58 +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
Zhou Weimin 01284323eb 忽略AUD帧; 2020-09-12 13:45:16 +08:00
qingci 299b988ed1
Update MultiMediaSourceMuxer.cpp
{fix} fix _ps_rtp_sender not found in MultiMediaSourceMuxer.cpp [compile problem]
2020-09-10 19:28:30 +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 636068b2b8 精简代码,改善代码结构 2020-09-06 17:52:33 +08:00