aunix/ZLMediaKit
1
0
Fork 0
mirror of https://gitee.com/xia-chu/ZLMediaKit.git synced 2026-05-23 01:57:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,780 Commits 16 Branches 0 Tags 156 MiB
30f4a267c2
Commit Graph

3780 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
yinxiang
30f4a267c2
Pre Merge pull request !24 from yinxiang/hls_record 2023-01-10 09:11:04 +00:00
夏楚
873b390fbc
add default pipeline template yaml 2023-01-10 09:11:03 +00:00
xiongziliang
44f4e9acd4 openRtpServer udp多端口模式默认绑定发送端地址，防止多路同时推流时ssrc冲突问题 2023-01-08 21:35:50 +08:00
xiongziliang
fcf70c6ef1 startSendRtpPassive接口支持同时接收流 2023-01-08 21:24:29 +08:00
xiongziliang
0374e7a660 startSendRtp接口支持同时接收流：#2109,#2149 2023-01-07 22:36:30 +08:00
Dw9
3b3a83b524
修复MediaSource在startSendRtp后无法注销的bug (#2187) 2023-01-07 21:31:46 +08:00
ziyue
f5755a17e7 合并 #2183 2023-01-02 12:08:20 +08:00
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
8bcc2cddc8 Build without usrsctp 2022-12-30 08:51:37 +03:00
Alexandr
dc26bbf145 protected virtual bool sendRtspResponse(...) 2022-12-30 08:50:30 +03:00
yinxiang
338ddaf3b9
!1 合并hls录像部分代码 
Merge pull request !1 from yinxiang/hls_record
 2022-12-28 03:08:34 +00:00
renlu
82af21f910 添加hls录像功能 2022-12-28 11:02:02 +08:00
yinxiang
cf0da71845
!16 合并作者最新提交 
Merge pull request !16 from yinxiang/v1.1.2_20221130
 2022-12-28 02:11:02 +00: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
renlu
60ef4f50c8 修改不录像的设备的无人观看时长为130秒，以后就不需要改配置文件了。 2022-12-16 10:12:36 +08:00
xiongguangjie
96f549ab32 avoid bug for #2159 2022-12-15 19:17:09 +08:00
monktan89
f6a36180b4 修复webrtc转发可能内存越界的bug: #2159 2022-12-14 15:08:59 +08:00
monktan89
56ccd4332a 提高rtsp播放器兼容性: #2159 2022-12-14 15:08:24 +08:00
renlu
272b65bb4e 无人观看断流的时候，继续判断是否在录像，如果在录像，不断流 2022-12-09 11:24:17 +08:00
Dw9
9d40c82141 修复手机推rtc,其他协议拉流画面旋转 2022-12-08 21:52:55 +08:00
renlu
fe22ed258a 添加设备是否正在录像的日志。 2022-12-08 16:53:42 +08:00
renlu
7c05c474e9 去掉读m3u8文件，并删除直播的三个ts文件的操作。 2022-12-08 10:21:47 +08:00
renlu
c28e96c3af 从直播到录像，不删除直播的8个切片。 2022-12-08 09:47:33 +08:00
renlu
0d40bf9272 去掉延时30s再删除直播的ts的操作。从直播到录像直接删除直播的8个ts切片。 2022-12-07 08:52:01 +08:00
renlu
696e28765b 添加配置项 非录像状态下的无人观看延时时长。 2022-12-06 14:26:57 +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
renlu
7801467e36 修改文件编码各位为UFT-8 BOM 2022-12-02 11:01:15 +08:00
yinxiang
429a6ff0a1
!14 合并作者截止20221130的更新 
Merge pull request !14 from yinxiang/master
 2022-12-02 02:32:22 +00:00
yinxiang
fd040192b1 Merge branch 'v1.1.2_20221130' of gitee.com:gwds_1/ZLMediaKit into master 
Signed-off-by: yinxiang <9886575+renluyx@user.noreply.gitee.com>
 2022-12-02 02:31:27 +00:00
monktan89
a12b7c8021 修正代码拼写错误 2022-11-30 18:24:35 +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
Johnny
59ecdd13e5 fix: WebRtcTransport 切换 poller 线程时，创建 WebRtcSession 不需要加锁 2022-11-28 17:54:16 +08:00
johzzy
bc4fa2bc53
fix(rtcp/bye): 收到rtcp bye时不断开webrtc连接 (#2123) 
bye(203) 会在 sender audio track mute 时出现, 不能作为 shutdown 的依据
 2022-11-28 17:52:37 +08:00
renlu
99e420d784 修复析构中调用getOwnerPoller抛异常导致崩溃的bug 2022-11-28 16:47:21 +08:00
renlu
64ee0bcaf2 修改Bug: 从直播到录像，缺少第一个ts文件。 2022-11-28 16:31:00 +08:00
ziyue
6c655810ec 修复on_err事件死循环的bug: #2121 2022-11-28 14:28:56 +08:00
Dw9
fef9d31631
webrtc支持通过http参数指定是否优先tcp模式 (#2105) 
* webrtc push/play支持通过http参数指定tcp

* force_tcp改成perferred_tcp

Co-authored-by: xiongziliang <771730766@qq.com>
 2022-11-27 12:43:16 +08:00
xiongziliang
50fa671564 修复析构中调用getOwnerPoller抛异常导致崩溃的bug:#2117 2022-11-26 10:16:47 +08:00
yinxiang
68358155c9
!12 合并作者最新提交 
Merge pull request !12 from yinxiang/master
 2022-11-22 03:18:30 +00:00
yinxiang
b940e13d2d Merge branch 'v1.1.1_20221122' of gitee.com:gwds_1/ZLMediaKit into master 
Signed-off-by: yinxiang <9886575+renluyx@user.noreply.gitee.com>
 2022-11-22 03:17:32 +00:00
renlu
5364d8a001 删除直播生成的8个ts文件。以免多次播放导致ts文件累积过多占用内存。 2022-11-21 17:10:36 +08:00
ziyue
9fd5152aa1 确保webrtc关闭udp模式时可用 2022-11-19 09:52:10 +08:00
ziyue
d910c80a00 优化webrtc iceandidate端口相关代码 2022-11-19 09:46:04 +08:00
ziyue
a9e53aae70 Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit 2022-11-19 09:38:44 +08:00