amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-28 22:26:32 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
3,760 Commits 16 Branches 0 Tags 225 MiB
fb5b31a85f
Commit Graph

274 Commits

Author SHA1 Message Date
xiongguangjie
a52e9d6ba8 fix h264 no idr nal sps pps sei i slices 2023-02-04 18:17:06 +08:00
ziyue
ae950606cb 修复JPEGTrack无法就绪的bug 2022-12-30 18:03:21 +08: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
老衲不出家
f05a9501fa
Unified code style (#2137) 2022-12-02 14:43:06 +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
ziyue
fc433de9ac 适配webrtc AV1编码: #2091 2022-11-18 16:47:02 +08:00
ziyue
034e29b25a 修复rtsp basic鉴权相关bug: #2087 2022-11-15 20:52:27 +08:00
ziyue
60d96f4f3b 优化FrameDispatcher相关代码 2022-11-01 16:52:52 +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
xiongguangjie
0a71e06d4a united some code style 2022-10-19 14:55:39 +08:00
xiongguangjie
0d2e035215 rtsp and rtp h264 lowlatency mode config 2022-10-19 14:20:53 +08:00
ziyue
ac1abb34da 新增媒体流flush机制：#1996 2022-10-16 19:54:17 +08:00
ziyue
b34db64961 修复非法aac rtp包导致的除0崩溃问题: #1869 2022-08-10 10:44:34 +08:00
ziyue
35791aac89 优化代码，去除编译警告，修复拼写错误 2022-08-08 17:36:07 +08:00
ziyue
9c3b8a6a95 时间戳改为64位 2022-08-08 17:13:39 +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
ziyue
ec7fe5cc9a 整理frame相关代码，完善FrameStamp重载函数 2022-07-22 16:20:47 +08:00
xiongguangjie
14da5ab2d8
when start send rtp wait key rtp previous drop (#1789) 2022-07-09 22:30:43 +08:00
Dw9
c4988e7cfc 修复mk_track_create创建的track无法初始化复用器的bug(#1784, #1778 ) 2022-07-07 16:56:54 +08:00
xiongguangjie
d622481619 fix multi aac frame in one frame result flv.js play audio error 2022-06-26 00:54:31 +08:00
xiongziliang
fd4145a622 完善对rtp负载为空处理逻辑：#1661 2022-05-28 10:34:54 +08:00
ziyue
cb0e5c6c57 全面更新整理c sdk 2022-05-25 15:51:24 +08:00
xiongziliang
24472ee346 修复aac adts头大于7个字节时的兼容性问题 2022-04-16 14:13:55 +08:00
ziyue
5144b84ee7 添加bom头 2022-04-10 23:58:56 +08:00
alexliyu7352
f128b35b18
解决多pps问题 
解决某些流因为多pps而导致不能播放的问题.
 2022-04-10 23:43:44 +08:00
alexliyu7352
08de795220
Update H264.h 2022-04-10 23:38:42 +08:00
alexliyu7352
78d32702e2
修复由于识别不出关键帧而导致hls不能切片. (#1551) 
2.修复由于丢弃sei帧导致ffplay不能正常播放
 2022-04-09 10:22:41 +08:00
ziyue
cb00dbab0f 在track就绪前，强制split frame，防止sps pps未被获取到 2022-02-17 14:32:49 +08:00
夏楚
c72cf4cbcc
整理命名空间 (#1409) 
* feat: remove using namespace mediakit in header files.

(cherry picked from commit d44aeb339a8a0e1f0455be82b21fe4b1b536299f)

* feat: remove using namespace mediakit in FFmpegSource.h

* feat: remove using namespace mediakit in RtpExt.h

* feat: remove using namespace mediakit in header files.

* feat: remove using namespace std in header files.

* feat: remove using namespace std in header files when zltoolkit remove std in header

* 补充命名空间

* 整理命名空间

* 整理命名空间2

* 修复macos ci

* 修复编译问题

* 修复编译问题2

* 修复编译问题3

Co-authored-by: Johnny <hellojinqiang@gmail.com>
Co-authored-by: Xiaofeng Wang <wasphin@gmail.com>
 2022-02-02 20:34:50 +08:00
ziyue
4f27894302 添加bom头 2022-01-24 14:25:37 +08:00
ziyue
bc583e80b5 合并pr: #1391 2022-01-24 14:23:36 +08:00
xgj
341459fbf5 fix non rtc push rtc play g711 audio loss 2022-01-24 11:57:24 +08:00
ziyue
75465311d9 修复丢包导致aac确实导致内存越界的bug: #1363 2022-01-14 13:09:47 +08:00
Dw9
819599ac25
修复获取帧率逻辑 (#1293) 2022-01-09 14:50:54 +08:00
xiongziliang
f4d8eb4515 Rtmp: 获取h264sps/aac config失败时打印rtmp包内容 2022-01-08 16:28:13 +08:00
ziyue
5a592e6db6 优化循环池性能 2022-01-06 14:30:44 +08:00
ziyue
89870190e9 MPEG: 整合复用ts/ps生成代码 2021-12-28 21:21:01 +08:00
xiongziliang
8b24088ab1 Refine: h264 rtp encoder不再过滤sei、aud帧 2021-11-28 21:15:03 +08:00
Xiaofeng Wang
9aaf3ce2ff
优先使用静态 payload type 值 (#1206) 2021-11-10 14:45:37 +08:00
ziyue
1513e9a857 Revert "忽略某些流声明存在却没实质数据的track" 
This reverts commit b42072405e.
 2021-11-10 14:18:55 +08:00
ziyue
b42072405e 忽略某些流声明存在却没实质数据的track 2021-10-28 10:53:07 +08:00
ziyue
350a0e3f81 防止内存越界 2021-10-27 13:26:53 +08:00
ziyue
b438ecb88c 兼容不规范的aac rtsp推流 2021-10-27 13:23:27 +08:00
ziyue
e9008afca0 addTrack/inputFrame接口支持返回值；新增全局添加静音音频接口 2021-09-27 13:12:53 +08:00
hejilin
dcb775c6e8 去除非第三方库的编译告警 2021-09-16 16:00:46 +08:00
ziyue
186c15364a 精简Frame对象实例化相关代码 2021-09-02 10:56:21 +08:00
ziyue
bb63273c73 计算dts逻辑兼容一些奇怪的rtsp流:#1031 2021-08-23 21:48:30 +08:00