Commit Graph

4356 Commits

Author SHA1 Message Date
alex
3c98bc54a3
Merge 610ac62e90 into cc590254a6 2024-10-28 11:01:25 +08:00
alex
610ac62e90 Translate comments in src/Record/HlsMakerImp.cpp 2024-10-28 11:01:24 +08:00
alex
4d1b39387a
Merge branch 'ZLMediaKit:master' into master 2024-10-28 11:00:46 +08:00
xiongguangjie
cc590254a6 fix compile error for ci
Some checks failed
Android / build (push) Has been cancelled
CodeQL / Analyze (cpp) (push) Has been cancelled
CodeQL / Analyze (javascript) (push) Has been cancelled
Docker / build (push) Has been cancelled
Linux / build (push) Has been cancelled
macOS / build (push) Has been cancelled
Windows / build (push) Has been cancelled
2024-10-28 10:59:37 +08:00
xiongguangjie
b9a1f0d9b5 update zltoolkit fix #3979 2024-10-28 10:59:37 +08:00
xia-chu
18d5fb71f3 增强hls点播功能,每个切片文件夹生成一个m3u8索引文件
Some checks failed
Android / build (push) Has been cancelled
CodeQL / Analyze (cpp) (push) Has been cancelled
CodeQL / Analyze (javascript) (push) Has been cancelled
Docker / build (push) Has been cancelled
Linux / build (push) Has been cancelled
macOS / build (push) Has been cancelled
Windows / build (push) Has been cancelled
2024-10-26 16:42:06 +08:00
alex
efd14aba92
Merge branch 'ZLMediaKit:master' into master 2024-10-26 16:02:14 +08:00
xia-chu
34dbbab4bb hls开启点播后,确保媒体注销时写入m3u8文件至当前文件夹 2024-10-26 16:37:04 +08:00
xia-chu
30c6f975f1 增强hls点播功能,每个切片文件夹生成一个m3u8索引文件 2024-10-26 14:59:16 +08:00
sbkyy
5c80c75ed9
修复video stack相关功能bug
Some checks are pending
Android / build (push) Waiting to run
CodeQL / Analyze (cpp) (push) Waiting to run
CodeQL / Analyze (javascript) (push) Waiting to run
Docker / build (push) Waiting to run
Linux / build (push) Waiting to run
macOS / build (push) Waiting to run
Windows / build (push) Waiting to run
/index/api/stack/reset 在相同url和通分辨率多次调用channel析构没画面的问题
是在 VideoStackManager::parseParams 函数里 多次 (*params)[i * cols + j] =
nullptr; 导致 channel 计数器为0,析构没画面。

同时修复cpu占用过高问题。
2024-10-26 09:20:24 +08:00
xia-chu
4c90a1a95b Instantly enable recording support for GOP caching
Some checks failed
Android / build (push) Has been cancelled
CodeQL / Analyze (cpp) (push) Has been cancelled
CodeQL / Analyze (javascript) (push) Has been cancelled
Docker / build (push) Has been cancelled
Linux / build (push) Has been cancelled
macOS / build (push) Has been cancelled
Windows / build (push) Has been cancelled
2024-10-18 22:22:13 +08:00
xia-chu
6fcf7f81a4 The Docker image removes unnecessary dependencies 2024-10-18 21:53:46 +08:00
Lidaofu
fdbf77d46d
feat: add mk_load_mp4_file c api(#3964)
Some checks are pending
Android / build (push) Waiting to run
CodeQL / Analyze (cpp) (push) Waiting to run
CodeQL / Analyze (javascript) (push) Waiting to run
Docker / build (push) Waiting to run
Linux / build (push) Waiting to run
macOS / build (push) Waiting to run
Windows / build (push) Waiting to run
Co-authored-by: lidaofu <lidf@ahtelit.com>
Co-authored-by: xia-chu <771730766@qq.com>
2024-10-18 21:48:42 +08:00
xia-chu
61a93fab6a MP4 reader supports loading multi files
Some checks failed
Android / build (push) Has been cancelled
CodeQL / Analyze (cpp) (push) Has been cancelled
CodeQL / Analyze (javascript) (push) Has been cancelled
Docker / build (push) Has been cancelled
Linux / build (push) Has been cancelled
macOS / build (push) Has been cancelled
Windows / build (push) Has been cancelled
2024-10-13 02:09:39 +08:00
xia-chu
e4025a6811 Improve timestamp corrector 2024-10-13 00:23:34 +08:00
Xiaofeng Wang
351e8fbd43 Fixed the compilation issue on macOS15 M platform
Some checks failed
Android / build (push) Has been cancelled
CodeQL / Analyze (cpp) (push) Has been cancelled
CodeQL / Analyze (javascript) (push) Has been cancelled
Docker / build (push) Has been cancelled
Linux / build (push) Has been cancelled
macOS / build (push) Has been cancelled
Windows / build (push) Has been cancelled
https://github.com/ZLMediaKit/ZLToolKit/pull/252
2024-10-11 14:23:05 +08:00
xiongguangjie
6b2fcf7943
Fix the issue where the hls-fmp4 do not flush data in single audio cases (#3935 #3937)
Some checks failed
Android / build (push) Has been cancelled
CodeQL / Analyze (cpp) (push) Has been cancelled
CodeQL / Analyze (javascript) (push) Has been cancelled
Docker / build (push) Has been cancelled
Linux / build (push) Has been cancelled
macOS / build (push) Has been cancelled
Windows / build (push) Has been cancelled
2024-09-29 11:55:58 +08:00
xiongguangjie
87277ac91a
Optimaztion code for srt (#3934)
Some checks are pending
Android / build (push) Waiting to run
CodeQL / Analyze (cpp) (push) Waiting to run
CodeQL / Analyze (javascript) (push) Waiting to run
Docker / build (push) Waiting to run
Linux / build (push) Waiting to run
macOS / build (push) Waiting to run
Windows / build (push) Waiting to run
2024-09-28 10:11:39 +08:00
xiongguangjie
de7afaf992
Avoid negative PTS in the RTSP protocol (#3929 #3815)
Some checks failed
Android / build (push) Has been cancelled
CodeQL / Analyze (cpp) (push) Has been cancelled
CodeQL / Analyze (javascript) (push) Has been cancelled
Docker / build (push) Has been cancelled
Linux / build (push) Has been cancelled
macOS / build (push) Has been cancelled
Windows / build (push) Has been cancelled
Optimaztion for issue #3815 ffmpeg rtsp pull stream has negative pts
2024-09-26 10:59:41 +08:00
xia-chu
aca39bbfaa Support hot-reload of SSL certificates (#2835) 2024-09-22 18:38:53 +08:00
xia-chu
1753cbb81b Add compile options: -Wno-comment 2024-09-22 18:38:53 +08:00
Dw9
f3e2a29cbd
Fix crashes where iterators may be invalid (#3920)
Fix: #3885
2024-09-19 20:16:16 +08:00
alex
4152dcd409
AI automatically translates all comments in the code into English (#3917) 2024-09-19 14:53:50 +08:00
Dw9
046de691cb
Fix the issue of RTP sorting cache crashing when the sequence is reset (#3915) 2024-09-18 19:09:14 +08:00
PioLing
596531ecf5
Add golang sdk for mk_api (#3914) 2024-09-18 17:36:06 +08:00
xiongguangjie
8f03105baa
Fix bug #3894 of rtsp over http (#3903) 2024-09-17 09:44:22 +08:00
夏楚
2cc69d1be6
Fix H.265 multi-PPS frame compatibility issue (#3902) 2024-09-17 09:43:37 +08:00
Talus
7c914666f2
Fix issue where when RTP timestamp does not change and packet loss occurs, the rtp parser's CommonRtpDecoder never outputs again (#3891)
Co-authored-by: TalusL <liangzhuohua@genew.com>
2024-09-13 17:44:30 +08:00
Talus
e2ac6dc176
Accelerate the ready speed of certain media that actually only have a single video track but the metadata contains an audio track (#3885)
加快某些实际上只有单视频track但是metadata包含音频track的媒体Ready速度,比如GB28181 PS流
---------

Co-authored-by: TalusL <liangzhuohua@genew.com>
2024-09-13 14:59:46 +08:00
alex
7c5ba5a099
Add pps structure and parsing function (#3875) 2024-09-10 10:59:44 +08:00
老衲不出家
e322db0a04 兼容seq计数器重置不规范的rtp流 (#3860)
rtp seq在重置回退时,之前的逻辑会一直丢数据,修改后将兼容这种不规范的rtp流。
2024-09-05 17:28:33 +08:00
PioLing
ab22cac85b
新增兼容whip接口http头的 Authorization 的Bearer令牌 (#3849)
新增兼容whip接口http头的 Authorization 的Bearer令牌 转成 webhook 的 params的参数 ,
即也支持rtc应用业务层回调推流 Authorization Bearer鉴权
2024-08-29 10:58:51 +08:00
waken
df9dd3d17a
修复startSendRtp接口开启收流时vhost设置错误的问题 (#3848) 2024-08-28 12:28:01 +08:00
Lidaofu
c409fc5754
确保start_send_rtp相关c api线程安全,同时新增多个接口支持指定配置参数 (#3838)
修复被动tcp发送rtp问题 修改默认tcp send 5s超时设置 增加start_send更多参数配
2024-08-22 21:12:06 +08:00
wEnchanters
bd40c24745
startSendRtp接口支持指定接收流的app和vhost参数 (#3841) 2024-08-22 19:50:29 +08:00
xiongguangjie
cb1821cf88
Fix addStreamProxy retry bug (#3830 #3810 #3837)
Fix addStreamProxy retry bug( protocol option overwrite once play
success ), result in some media source not register; it's found by the
issue #3830 #3810
2024-08-22 11:11:04 +08:00
yujitai
6889afbc76
修复弱网丢包场景下rtp解码器可能不会输出配置帧的问题 (#3818)
在弱网丢包场景下,rtp解码器很可能进入gop dropped状态,需要等到idr到来才能继续输出帧,
这会导致idr前面的sps/pps无法被输出, 进而可能导致播放器渲染失败
2024-08-14 20:11:24 +08:00
xia-chu
c904019d7d 更新ZLToolKit 2024-08-10 11:12:42 +08:00
xiongguangjie
ba1a88f202
修复ffmpeg5以上默认不合并帧导致解码失败的bug (#3809 #3794)
FFmpegDecoder 默认合并帧,ffmpeg 5以上不支持将不完整的帧送入解码器中,根据 issue #3794 做出修改
2024-08-10 11:09:54 +08:00
Weng, Qiang
4d8b000198
player_opencv.c中brg24变量的内存对齐 (#3800)
在本地测试时发现,player_opencv.c程序如果不事先对brg24变量进行内存对齐,之后传入函数,运行到src/Codec/Transcode.cpp:FFmpegSws::inputFrame:sws_scale时可能会出现段错误
2024-08-10 11:06:33 +08:00
xia-chu
da704ab2f1 更新并适配ZLToolKit 2024-08-04 20:46:05 +08:00
xiongguangjie
47b8435d7c
修复addStreamProxy拉流代理同协议下开关问题 (#3779 #3770) 2024-08-02 21:32:32 +08:00
u7ko4
e3cad7f8fa
支持绑定到指定网卡 (#3760) 2024-08-01 11:03:26 +08:00
xia-chu
81aef25583 整理startSendRtp相关接口,新增支持udp被动模式
startSendPassive接口指定is_udp为1时则为开启udp被动模式, 被动模式下需要对方先发数据给zlmediakit,然后才能回复rtp数据;
同时在被动模式指定src_port时,不再等待对方连接成功后再返回(而是直接返回成功和端口号,失败通知请监听on_send_rtp_stopped hook)。
2024-07-28 23:37:13 +08:00
夏楚
fea7f3647e Update issue_lint.yml 2024-07-23 11:31:54 +08:00
xia-chu
3be77616e7 修复链接问题 2024-07-21 22:51:20 +08:00
xiongguangjie
8398ae17e4
compatible rtsp sdp parse no samplerate for audio (#3740)
兼容rtsp sdp协商中未声明采样率但是可以通过a 字段中fmtp中有config中解析出来的情况
2024-07-21 20:43:52 +08:00
xia-chu
9463d1291d 修复编译警告 2024-07-21 19:47:36 +08:00
xia-chu
6583e2869a 确保加载h264视频转流媒体时间戳精准 (#3691) 2024-07-21 19:21:23 +08:00
xia-chu
66065f5359 修复rtp推流协议为空的bug 2024-07-21 19:17:12 +08:00