xia-chu
|
e00fe51b26
|
关闭测试代码
|
2021-04-15 19:40:17 +08:00 |
|
xia-chu
|
46e3538dca
|
Merge branch 'dev' of https://gitee.com/xiongguangjie/ZLMediaKit into dev
|
2021-04-15 16:22:21 +08:00 |
xgj
|
3150ccdb70
|
add some comment
|
2021-04-15 14:08:25 +08:00 |
|
Your Name
|
bffee09639
|
fix more slice nal one frame result rtp mark error and sps pps rtp not has a mark
|
2021-04-15 13:54:03 +08:00 |
xgj
|
6e4dfaf53f
|
fix webrtc h264 rtp Packetizer error
|
2021-04-15 00:15:41 +08:00 |
|
xia-chu
|
765db1eb8b
|
添加rtcp fci相关代码
|
2021-04-14 18:39:21 +08:00 |
|
xia-chu
|
a4ba0c2b60
|
Merge branch 'dev' of https://gitee.com/xia-chu/ZLMediaKit into dev
|
2021-04-14 09:26:11 +08:00 |
|
xia-chu
|
c4fd9e294a
|
Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev
|
2021-04-14 09:25:56 +08:00 |
|
xiongziliang
|
37096f8ed0
|
完善rtcp的定义
|
2021-04-13 22:27:57 +08:00 |
|
xia-chu
|
29c8c9bf26
|
Merge remote-tracking branch 'origin/dev' into dev
|
2021-04-13 18:51:16 +08:00 |
|
xia-chu
|
f939e0a894
|
添加一些rtcp fci相关定义
|
2021-04-13 18:50:20 +08:00 |
|
夏楚
|
136d126e74
|
Update RtpReceiver.cpp
|
2021-04-13 08:28:23 +08:00 |
|
xia-chu
|
46b84fcf39
|
Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into dev
|
2021-04-12 13:48:34 +08:00 |
|
xia-chu
|
8a51bd2d9e
|
新增rtp ssrc异常处理逻辑
|
2021-04-11 20:35:00 +08:00 |
|
xiongziliang
|
753fe05813
|
采用pts
|
2021-04-11 12:07:04 +08:00 |
|
xiongziliang
|
8b7289a689
|
rtsp推流支持关闭直接代理模式
|
2021-04-11 12:06:40 +08:00 |
|
xiongziliang
|
012f58d27c
|
添加rtp 调试接口
|
2021-04-11 01:15:02 +08:00 |
|
xiongziliang
|
b2afae0e8a
|
暂时屏蔽一些日志
|
2021-04-07 21:02:28 +08:00 |
|
xia-chu
|
155c59e17e
|
添加rtc类型的推流
|
2021-04-07 18:17:49 +08:00 |
|
xia-chu
|
f374f72312
|
添加rtcp bye相关代码
|
2021-04-07 16:58:05 +08:00 |
|
xiongziliang
|
2abb5078f9
|
实现rtc转rtsp
|
2021-04-03 09:34:49 +08:00 |
ziyue
|
33d2e71368
|
合并代码，去除冗余代码
|
2021-04-02 16:23:40 +08:00 |
|
xiongziliang
|
a328520c9c
|
buf fixed
|
2021-04-01 22:24:35 +08:00 |
|
xiongziliang
|
2434470fb8
|
G711强制规格
|
2021-04-01 22:20:29 +08:00 |
|
xiongziliang
|
d2fec801c9
|
兼容不规范的rtmp推流器：#764
|
2021-04-01 22:03:21 +08:00 |
|
xiongziliang
|
075756c4c6
|
提升兼容性：#789
|
2021-04-01 21:46:02 +08:00 |
|
ziyue
|
2065b6fea8
|
去掉最大枚举定义
|
2021-03-30 11:51:19 +08:00 |
|
ziyue
|
a7a94f0885
|
sdp相关的代码移动到主目录
|
2021-03-30 10:59:15 +08:00 |
|
xiongziliang
|
81f29fea61
|
基本完成sdp的解析和生成
|
2021-03-28 18:10:43 +08:00 |
|
xiongziliang
|
8aa3ff425b
|
完善sdp相关定义
|
2021-03-27 22:23:38 +08:00 |
|
ziyue
|
2f0bdf2724
|
修复32位编译时，websocket相关bug
|
2021-03-21 18:22:32 +08:00 |
|
xiongziliang
|
f2edf354de
|
rtmp支持更新config帧
|
2021-03-21 16:50:15 +08:00 |
|
ziyue
|
c5b0485519
|
修复sps太长生成sdp异常的问题
|
2021-03-18 16:10:46 +08:00 |
|
ziyue
|
51ac93a08c
|
rtp超时检测最多暂停5分钟
更新zltoolkit
|
2021-03-16 15:37:34 +08:00 |
|
ziyue
|
060b654252
|
修改rtp超时检测相关http api,rtp超时检测最多暂停5分钟
|
2021-03-16 11:31:41 +08:00 |
|
xiongziliang
|
a0fc494ee3
|
Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit
|
2021-03-14 10:34:33 +08:00 |
|
xiongziliang
|
be8403c31c
|
完善代码
|
2021-03-14 10:29:17 +08:00 |
sunhui
|
f5e8bae760
|
解决不指定流或者TCP暂停断流问题
|
2021-03-10 23:17:15 +08:00 |
|
xiongziliang
|
c0f4899950
|
录制接口支持指定切片时间大小:#747
|
2021-03-07 10:41:57 +08:00 |
|
xiongziliang
|
5b4fe604cb
|
修复编译警告
|
2021-03-07 10:05:23 +08:00 |
|
xiongziliang
|
43828d4390
|
兼容某些rtmp流
|
2021-03-07 10:04:27 +08:00 |
|
xia-chu
|
9b7c9b9109
|
兼容sdp不规范的rtsp流
|
2021-02-28 21:02:23 +08:00 |
|
xiongziliang
|
fb3603b433
|
兼容一些不规范的流
|
2021-02-28 20:58:30 +08:00 |
|
xiongziliang
|
56f044f8ed
|
修复线程安全bug
|
2021-02-28 20:58:25 +08:00 |
|
xia-chu
|
8d50d3c397
|
分包逻辑添加边界检测代码
|
2021-02-21 22:24:46 +08:00 |
|
xia-chu
|
0c728827aa
|
添加全局内存统计功能
|
2021-02-21 21:28:17 +08:00 |
|
xia-chu
|
a19f67679a
|
兼容一些rtsp流 #735
|
2021-02-21 21:27:26 +08:00 |
|
xia-chu
|
19f3b1bd6f
|
防止打印过多调试信息
|
2021-02-21 21:26:45 +08:00 |
|
xia-chu
|
8d122625c5
|
修复28181相关bug：#731
|
2021-02-09 14:19:07 +08:00 |
|
xia-chu
|
b7f4eae2bc
|
修复bug
|
2021-02-09 14:01:10 +08:00 |
|
xia-chu
|
e4904623a7
|
修复rtmp兼容性bug
|
2021-02-07 23:01:22 +08:00 |
|
xia-chu
|
1f52c727ca
|
修复编译警告
|
2021-02-07 22:56:36 +08:00 |
|
xia-chu
|
a142665375
|
确保线程安全
|
2021-02-07 22:02:03 +08:00 |
|
xia-chu
|
75d97b9221
|
优化H264 rtp相关代码
|
2021-02-07 18:29:48 +08:00 |
|
xia-chu
|
80bcf53ccf
|
更新ZLToolKit并适配代码
|
2021-02-06 20:10:34 +08:00 |
|
xia-chu
|
14b318525e
|
添加rtp rtmp个数统计
|
2021-02-06 20:10:33 +08:00 |
|
xia-chu
|
62ba87dd0f
|
优化frame性能及整理代码
|
2021-02-06 20:10:33 +08:00 |
|
xia-chu
|
c5cfbce241
|
优化rtp性能
|
2021-02-06 20:10:33 +08:00 |
|
xia-chu
|
b0e1d5d6aa
|
重写rtp去冲突逻辑
|
2021-02-06 20:10:32 +08:00 |
|
xia-chu
|
d6fc56d950
|
时间戳异常时,确保合并帧逻辑正常：#724
|
2021-02-06 20:10:32 +08:00 |
|
xia-chu
|
52480717e3
|
p帧时间戳异常时确保rtmp播放正常:#724
|
2021-02-06 20:10:32 +08:00 |
|
xia-chu
|
34bbfc8bcb
|
修复编译警告
|
2021-02-06 20:10:32 +08:00 |
|
xia-chu
|
bc6286553a
|
优化rtmp性能
|
2021-02-06 20:10:31 +08:00 |
|
xia-chu
|
827158af73
|
防止未开启录制功能时，使用该功能导致的bug
|
2021-02-06 20:10:31 +08:00 |
|
xia-chu
|
2b3ce0ec63
|
流量统计事件确保0字节时也能触发
|
2021-02-06 20:10:31 +08:00 |
|
xia-chu
|
39229f9e39
|
修复rtp padding相关bug:#722
|
2021-02-06 20:10:30 +08:00 |
|
xia-chu
|
3298184c5c
|
添加打印rtp详情功能
|
2021-02-06 20:10:30 +08:00 |
|
xia-chu
|
1539e4ed60
|
优化rtsp性能
|
2021-02-06 20:10:30 +08:00 |
|
xia-chu
|
e4126809a6
|
实现28181 rtcp保活:#429
|
2021-02-06 20:10:29 +08:00 |
|
xiongziliang
|
e695d76ce9
|
整理代码
|
2021-01-31 21:09:25 +08:00 |
|
xiongziliang
|
ddd3438fc3
|
添加bom头
|
2021-01-31 20:46:55 +08:00 |
|
xiongziliang
|
eef5407aab
|
性能优化
|
2021-01-31 20:36:19 +08:00 |
|
xiongziliang
|
8db9f86a0a
|
防止重复添加RtcpContext
|
2021-01-31 20:26:11 +08:00 |
|
xiongziliang
|
51435d955c
|
优化rtp统计性能
|
2021-01-31 20:22:01 +08:00 |
|
xiongziliang
|
070bf19cb5
|
重写rtp框架
|
2021-01-31 20:03:51 +08:00 |
|
xiongziliang
|
4d6d56f2b7
|
消除编译警告
|
2021-01-31 19:38:01 +08:00 |
|
xiongziliang
|
5c6560f55d
|
重写rtcp框架
|
2021-01-31 19:33:33 +08:00 |
|
xiongziliang
|
629c39685b
|
rtp打包添加mark位:#713
|
2021-01-31 19:18:20 +08:00 |
|
xiongziliang
|
ae8588089d
|
修复windows下组播拉流失败的问题:#708
|
2021-01-31 19:08:58 +08:00 |
|
xiongziliang
|
837597e162
|
防止可能内存越界的问题
|
2021-01-31 18:25:12 +08:00 |
|
xiongziliang
|
0f39565f67
|
修复http直播不发送content-type的问题
|
2021-01-31 18:24:03 +08:00 |
|
xiongziliang
|
272d1a8bd9
|
兼容一些rtmp推流器: #692
|
2021-01-23 10:06:38 +08:00 |
|
xiongziliang
|
aa45590c13
|
添加对象统计接口
|
2021-01-23 09:44:37 +08:00 |
|
xiongziliang
|
291caf537a
|
H265 rtp支持聚合包
|
2021-01-23 09:43:16 +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 |
|
xiongziliang
|
4cae88e242
|
调整代码
|
2021-01-17 10:28:52 +08:00 |
|
xiongziliang
|
d879c5901d
|
延迟清空状态
|
2021-01-17 10:28:06 +08:00 |
|
xiongziliang
|
c445ad2cdf
|
修复rtsp播放器在处理rtp包时，清空状态导致的bug
|
2021-01-17 10:25:00 +08:00 |
|
xiongziliang
|
2dd87c8b59
|
修复直接拉流代理失效的bug
|
2021-01-17 10:22:51 +08:00 |
|
xiongziliang
|
a9be01fbec
|
播放flv流时,非AAC与H264编码时,打印警告日志
|
2021-01-09 19:03:02 +08:00 |
|
夏楚
|
48a1f6ea6c
|
兼容rtp时间戳一直为0的流
|
2021-01-09 17:53:21 +08:00 |
|
xia-chu
|
0e3c21932d
|
修复编译失败的问题
|
2021-01-03 15:55:26 +08:00 |
|
xiongziliang
|
4b22e189d5
|
轮流发送rtcp与GET_PARAMETER保活:#642
|
2021-01-02 22:32:13 +08:00 |
monktan
|
3ddc14d35d
|
合并pr(#661): 减少unsport code打印，新增git信息获取
(cherry picked from commit 47f2f5b349)
|
2021-01-02 22:02:23 +08:00 |
|
xiongziliang
|
d37607026f
|
修复编译警告
|
2021-01-02 21:58:14 +08:00 |
|
xiongziliang
|
9715787060
|
bug fixed
|
2021-01-02 21:26:23 +08:00 |
|
xiongziliang
|
13221ad796
|
http回复根据状态码自动生成status message: #602
|
2021-01-02 21:24:06 +08:00 |
|
xiongziliang
|
c69e9b8ec1
|
主动发送rtp接口(startSendRtp)支持返回本地端口: #538
|
2021-01-02 20:43:02 +08:00 |