amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-23 11:17:09 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
3,864 Commits 16 Branches 0 Tags 225 MiB
38ab3e0df4
Commit Graph

2014 Commits

Author SHA1 Message Date
ziyue
08c47ff4f0 Merge branch 'feature/editable_rtsp_sdp' of github.com:a-ucontrol/ZLMediaKit 2023-01-02 11:59:56 +08:00
ziyue
77e46353ce 新增支持mjpeg es rtp流 
mpegts/g711 payload改成固定模式
 2022-12-30 18:04:15 +08:00
ziyue
ae950606cb 修复JPEGTrack无法就绪的bug 2022-12-30 18:03:21 +08:00
Ikko Ashimine
fda77f0daf !23 fix typo in RtspSession.cpp 
* fix typo in RtspSession.cpp
 2022-12-30 17:25:58 +08:00
Alexandr
afa6465178 Changes to MP4Muxer for CodecJPEG 2022-12-30 08:56:57 +03:00
Alexandr
dc26bbf145 protected virtual bool sendRtspResponse(...) 2022-12-30 08:50:30 +03:00
a-ucontrol
eed5f02380
rtsp/rtp 新增支持mjpeg编码 (#2166) 
* Trying to send mjpeg via MultiMediaSourceMuxer

* Improved JPEGRtpEncoder::inputFrame code but still not working

* 优化代码

* 完善jpeg相关逻辑

* Micro fix

* FrameJPEG renamed to JPEGFrame according to ZLM style

* Modified  JPEGRtpEncoder::inputFrame and JPEGRtpEncoder::rtp_send_jpeg

* getVideoHeight(), getVideoWidth() and getVideoFps() in JPEGTrack

* mjpeg rtp打包避免内存拷贝/修复mjpeg rtp解包huffman_table size字段错误的bug

* 支持mjpeg pix type

* 优化性能

* add bom header
 2022-12-21 15:32:16 +08:00
monktan89
56ccd4332a 提高rtsp播放器兼容性: #2159 2022-12-14 15:08:24 +08:00
xiongziliang
04422b31b6 完善非法url提示:#2129 2022-12-04 16:21:08 +08:00
老衲不出家
f05a9501fa
Unified code style (#2137) 2022-12-02 14:43:06 +08:00
monktan89
68ea5465cc 修复addStreamProxy后，马上startSendRtp，触发的无人观看事件回调是MediaSourceNull的信息，导致无法关闭流bug(#2120) 2022-11-29 11:33:16 +08:00
mtdxc
754073918a
Header refactor (#2115) 
* 优化MultiMediaSourceMuxer头文件包含

* 将MediaSinkDelegate和Demux移到MediaSink中

* MediaSource头文件重构, 独立出PacketCache.h
精简Frame和Track的头文件

* Rtmp头文件重构

* Rtsp头文件重构

* webrtc头文件重构

* 规范.h头文件包含，并将其移到.cpp中:
- 尽量不包含Common\config.h
- Util\File.h
- Rtsp/RtspPlayer.h
- Rtmp/RtmpPlayer.h

* 删除多余的Stamp.h和Base64包含
 2022-11-29 11:07:13 +08:00
xiongziliang
50fa671564 修复析构中调用getOwnerPoller抛异常导致崩溃的bug:#2117 2022-11-26 10:16:47 +08:00
ziyue
188ee1f61a 消除编译警告 2022-11-19 09:37:49 +08:00
ziyue
68948288e0 TcpSession/UdpSession统一为Session类 2022-11-19 09:33:10 +08:00
ziyue
fc433de9ac 适配webrtc AV1编码: #2091 2022-11-18 16:47:02 +08:00
ziyue
255ccb4265 精简rtp服务器相关代码 2022-11-18 16:43:00 +08:00
ziyue
df14924a99 优化rtmp服务器兼容性: #2078 2022-11-15 20:53:24 +08:00
ziyue
034e29b25a 修复rtsp basic鉴权相关bug: #2087 2022-11-15 20:52:27 +08:00
xiongguangjie
87353534af fix rtp server process removed server not clear 2022-11-14 14:04:57 +08:00
xiongziliang
9bb6a2f828 全面整理转协议相关配置文件 2022-11-12 23:56:28 +08:00
xiongziliang
946945ce7b 优化代码 
整理代码
 2022-11-12 22:06:09 +08:00
samosirl
6ffbcbfde5
优化Ehome协议兼容性 (#2063) 2022-11-12 21:03:54 +08:00
xiongziliang
b54f50c7c0 修复hls流注销时相关bug:#2082 2022-11-12 09:57:47 +08:00
夏楚
a37268f003 格式化代码 2022-11-12 01:52:49 +00:00
xiongguangjie
bc63142712 add rtp server timeout hook 2022-11-10 16:58:02 +08:00
Aven
af554bc376
update media-server (#2075) 
* fix c2065 and c2051 error on windows, and the head file mpeg-ts-proto.h is also deprecated

* update media-server to 357ef88
 2022-11-09 17:44:38 +08:00
xiongziliang
44fd6b86bc 完善版本信息 2022-11-06 00:38:14 +08:00
xiongziliang
0053148139 优化MultiMediaSourceMuxer相关代码 2022-11-05 20:47:33 +08:00
ziyue
2b804514e1 修复mp4点播流线程安全检查失败bug 2022-11-01 22:02:28 +08:00
ziyue
5877d3942e RtpServer确保超时回收 2022-11-01 17:54:41 +08:00
ziyue
2cdeddeb2c RtpServer支持udp与tcp模式并存 2022-11-01 17:27:27 +08:00
ziyue
60d96f4f3b 优化FrameDispatcher相关代码 2022-11-01 16:52:52 +08:00
ziyue
d04761c2c6 Merge branch 'FrameDispatcher_addDelegate_refactor' of github.com:mtdxc/ZLMediaKit 2022-11-01 16:36:43 +08:00
ziyue
bfe118d94e 修复RtpProcess析构导致的线程问题 2022-11-01 16:05:23 +08:00
ziyue
f5a032c9a0 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit 2022-11-01 14:08:36 +08:00
cqm
dde352542b private FrameWriterInterfaceHelper 2022-11-01 12:03:49 +08:00
cqm
ac3d7bd21f add addDelegate with std::function, remove FrameWriterInterfaceHelper 2022-11-01 12:03:04 +08:00
ziyue
520945c2e9 提高线程安全性 2022-11-01 10:53:38 +08:00
xiongguangjie
d2c64b1f09 Merge remote-tracking branch 'origin/master' 2022-10-31 19:04:04 +08:00
xiongguangjie
613aae8bc3 rtp server only tcp mode is none use udp server 2022-10-31 18:47:42 +08:00
ziyue
918b1fce6c 修复hls/ts拉流崩溃问题：#2057 2022-10-30 23:50:20 +08:00
xiongziliang
9498b96b95 确保rtp推流线程安全性 2022-10-30 21:36:35 +08:00
xiongziliang
80eb6dc402 协议解析最大支持4MB分包: #2026 2022-10-29 22:57:32 +08:00
xiongguangjie
0a71e06d4a united some code style 2022-10-19 14:55:39 +08:00
xiongguangjie
7b87985f74 Merge remote-tracking branch 'origin/master' 2022-10-19 14:27:49 +08:00
xiongguangjie
0d2e035215 rtsp and rtp h264 lowlatency mode config 2022-10-19 14:20:53 +08:00
ziyue
ff6e9f4fc7 修复流注销时，hls无法播完最后一个切片的问题: #1955 2022-10-18 19:23:20 +08:00
ziyue
ac1abb34da 新增媒体流flush机制：#1996 2022-10-16 19:54:17 +08:00
ziyue
80eef693c6 精确mp4录制时长：#1795 2022-10-16 16:44:54 +08:00
xiongguangjie
bbdcc44eb0 mute audio maker avoid uint32_t cycle and 8k aac a frame is 128ms 2022-10-11 16:53:27 +08:00
ziyue
2b64245c14 优化代码 2022-10-08 10:47:09 +08:00
xiongziliang
c790254f46 修复关闭mp4录制不能触发无人观看事件问题：#2010 2022-10-06 13:06:54 +08:00
ziyue
34838b1b26 rtmp点播采用简单握手，发送心跳包，兼容fms服务器: #2007 2022-09-30 13:36:43 +08:00
xiongguangjie
bfebcd62c7 rtp packet sort set init seq 2022-09-28 15:29:11 +08:00
xiongguangjie
9f716dd8b8 fix gb startsendpassive use random port return immediately not wait 2022-09-26 15:50:02 +08:00
夏楚
037dd646d1
Merge pull request #1994 from Dw9/master 
修复rtsp 推pcm L16, 空指针的异常
 2022-09-26 10:27:30 +08:00
Dw9
6f1a45db8a 修复推rtsp L16崩溃 2022-09-25 12:13:09 +08:00
夏楚
b9a4b3e71a
消除编译警告 2022-09-24 19:07:45 +08:00
ziyue
15affeff1d 优化关闭媒体源相关逻辑: #1963 2022-09-18 20:36:47 +08:00
xiongziliang
12551be33c 提炼ProtocolOption赋值相关逻辑 2022-09-16 23:31:37 +08:00
custompal
08789454c3
rtsp支持指定播放单一track (#1937) 2022-09-13 16:27:00 +08:00
夏楚
4a35ddbddb
Merge pull request #1942 from mtdxc/reduce_code 
简化代码
 2022-09-09 11:10:55 +08:00
custompal
d853075175
RtpServer新增tcp主动模式支持 (#1938) 2022-09-09 10:56:28 +08:00
cqm
999e0b274e 简化代码: 
- MediaSource引入shortUrl和getUrl来简化日志输出
- WebApi引入fillSockInfo
 2022-09-07 11:47:15 +08:00
WuPeng
f765e5365b 修正在指定配置文件forwarded_ip_header的值后，无法获取不通过代理播放的客户端IP。 2022-09-06 21:13:11 +08:00
ziyue
4f47b7a5fe 修复getMediaPlayerList获取http-flv播放器列表时崩溃的问题 2022-09-05 14:59:46 +08:00
xiongziliang
5825f8b469 修复错误注释 2022-09-03 16:32:10 +08:00
xiongziliang
06c6654ed5 精简代码 2022-09-03 16:32:10 +08:00
xiongziliang
c8ea6490cd 修复直接拉流代理时同协议流无法注册的问题 2022-09-03 16:32:10 +08:00
xiongziliang
20f1275c58 rtsp拉流、rtp单端口推流新增支持获取丢包率: #1877 2022-09-03 16:32:09 +08:00
PioLing
0948a3df31
支持在addStreamProxy和on_publish中控制单个流是否开启时间戳覆盖 (#1930) 2022-09-03 09:54:09 +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
xiongziliang
f0ae5a1bd7 优化日志提示 2022-08-27 11:00:24 +08:00
xiongziliang
0cab9c8d16 rtp发送去除重连机制 2022-08-27 10:59:15 +08:00
xiongziliang
6a4297845f 新增发送rtp被动关闭hook 2022-08-27 10:53:47 +08:00
xiongziliang
c2ab45f78d 完善线程安全设计 2022-08-27 10:17:06 +08:00
rqb500
00acea369e
修复接收rtsp、gb28181等rtp流转为其他协议播放时可能卡顿的bug (#1906) 
* 修复获取ntp_stamp时计算溢出的bug
 2022-08-26 11:42:40 +08:00
ziyue
44ba971cb6 Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit 2022-08-23 14:13:36 +08:00
ziyue
208b0865bd 修复全局变量初始化顺序错乱导致崩溃的问题 2022-08-23 14:11:32 +08:00
Xiaofeng Wang
a06b4321be cmake: fix install cxx api headers 
Close #1882
 2022-08-22 13:11:17 +08:00
xiongziliang
c6a0e3ad66 rtp发送启停支持触发观看人数统计事件 2022-08-20 13:16:25 +08:00
xiongziliang
9f0c15a4f0 startSendRtp接口支持rtcp接收超时主动停止 2022-08-20 12:48:27 +08:00
Dw9
30984d2076
mp4录制支持作为观看者参与播放人数统计 (#1880) 2022-08-16 11:47:24 +08:00
ziyue
6382fcb3be 确保on_publish事件回调时线程安全 2022-08-11 18:36:17 +08:00
ziyue
b34db64961 修复非法aac rtp包导致的除0崩溃问题: #1869 2022-08-10 10:44:34 +08:00
ziyue
795b4dbbd3 修复http文件服务器对特殊字符文件不兼容的bug:#1866 2022-08-10 10:37:49 +08:00
ziyue
099845b329 FMP4Packet时间戳类型改成64位 2022-08-08 17:57:29 +08:00
ziyue
35791aac89 优化代码，去除编译警告，修复拼写错误 2022-08-08 17:36:07 +08:00
ziyue
9c3b8a6a95 时间戳改为64位 2022-08-08 17:13:39 +08:00
ziyue
143580d780 修复编译警告 2022-08-08 15:28:43 +08:00
ziyue
663d167837 格式化代码 2022-08-05 17:55:48 +08:00
ziyue
ba947cb6b5 调整switch case语句缩进 2022-08-05 17:42:17 +08:00
ziyue
f85de2e108 精简复用rtp encoder创建相关代码 2022-08-05 17:36:51 +08:00
ziyue
ec3fe4350a 修复开启时间戳覆盖后崩溃的bug: #1848 2022-08-02 11:06:33 +08:00
Xiaofeng Wang
70c7a7aa57 依赖 ZLMediaKit 的模块需要继承宏定义以及依赖 2022-08-01 17:48:11 +08:00
ziyue
316301e910 确保rtsp直接拉流代理支持GOP缓存: #1843 2022-08-01 11:35:38 +08:00
ziyue
afcf247464 完善mpegts/ps容器对aac音频的兼容: #1801 2022-07-29 18:05:16 +08:00