THENG
/
ZLMediaKit
mirror of https://gitcode.com/gh_mirrors/zlme/ZLMediaKit.git
6
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,126 Commits 17 Branches 0 Tags 222 MiB
Commit Graph

64 Commits

Author SHA1 Message Date
xia-chu 25c99470ee feat: add support of codec plugin 2023-12-10 11:09:04 +08:00
夏楚 bbe8f4a018
release 8.0 2023-12-09 16:23:51 +08:00
夏楚 5a2bf8d196
完成对enhanced rtmp videocodecid的兼容 (#2718) 
请查阅: https://github.com/veovera/enhanced-rtmp/issues/8
 2023-07-29 23:03:28 +08:00
xia-chu a86398b6db 优化与完善rtmp协议相关代码 
rtmp相关常量由宏改为枚举
明确rtmp包一些字段赋值含义
 2023-07-22 19:46:25 +08:00
夏楚 47add54465
新增支持enhanced-rtmp h265 推流 (#2694) 2023-07-22 17:31:39 +08:00
xia-chu 64b8079ac1 优化函数命名风格 
FindField改名为findSubString
 2023-06-10 14:55:40 +08:00
ljx0305 ca7efd5941
修正ssrc轮回为0时，ssrc重复分配为1的bug(#2327) 2023-03-24 16:19:22 +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
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 f85de2e108 精简复用rtp encoder创建相关代码 2022-08-05 17:36:51 +08:00
Dw9 c4988e7cfc 修复mk_track_create创建的track无法初始化复用器的bug(#1784, #1778 ) 2022-07-07 16:56:54 +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 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 07c5341fb0 兼容一些奇怪的rtsp流:#1031 2021-08-23 21:29:23 +08:00
ziyue 6df0ee69e0 修复rtsp aac config兼容性bug: #1011 2021-07-30 16:52:13 +08:00
xia-chu f63b2b1863 去除编译警告，修复bug 2021-01-19 16:05:38 +08:00
xia-chu b6cbc87712 全面整理代码，去除编译警告 2021-01-17 18:31:50 +08:00
Liu Jiang 66a3b7a9ca RTSP推流增加L16动态payload type支持(RFC 3551 Section 4.5.11, RFC 2586) 2020-12-26 15:08:01 +08:00
xiongziliang a22f97c777 rtsp/rtmp/mp4支持opus并整理代码 2020-08-01 10:22:12 +08:00
xiongziliang bc5931dce9 修复G711生成RTP类型无效的bug 2020-07-09 11:15:01 +08:00
xiongziliang 038979b716 修改rtmp metadata codec由字符为整形,兼容比较老的rtmp服务器 2020-06-28 21:49:08 +08:00
xiongziliang 0e47dc94f9 aac config不再限制两个字节：#336 2020-06-11 17:19:10 +08:00
xiongziliang 41509800bc 完善对无metadata的rtmp流的兼容性 2020-05-28 17:03:12 +08:00
xiongziliang 893564d0be 修复拼写错误 2020-05-25 13:51:00 +08:00
xiongziliang 477475a60f 批量添加bom头、批量替换tab字符 2020-05-18 15:31:49 +08:00
xiongziliang 3efda8fd0b 根据playload type生成track 2020-04-18 23:00:48 +08:00
xiongziliang bacf8f100b G711支持多种规格 2020-04-18 22:13:11 +08:00
xiongziliang 5c3418a412 合并 #278 2020-04-18 18:46:20 +08:00
baiyfcu 40afa204d5 增加rtmp/rtsp对音频G711A,G711U的支持 2020-04-17 17:47:10 +08:00
baiyfcu 340629cdc6 添加对g711A/U rtsp支持相关文件，api添加windows静态库编译选项，g711 RTMP支持尚未修改 2020-04-08 15:42:52 +08:00
xiongziliang 83400290a8 整理rtmp相关代码 2020-04-04 22:54:49 +08:00
xiongziliang 7019e4717c 整理授权协议 2020-04-04 20:30:09 +08:00
xiongziliang c145f5f8ba 修复#247 2020-03-26 17:12:21 +08:00
xiongziliang 10884340b0 优化rtp推流相关代码 2020-03-08 21:19:20 +08:00
xiongziliang ee66d945e8 更新media-server库 2019-12-12 22:25:55 +08:00
xiongziliang 54f2c0b53c 兼容一些奇怪sdp的rtsp url 2019-11-21 16:31:50 +08:00
xiongziliang e7bd5a4174 兼容一些奇怪的sdp 2019-11-21 15:11:43 +08:00
xiongziliang 68d29ba025 rtsp忽略无效的aac track 2019-10-14 16:52:15 +08:00
xiongziliang ba71bac475 提升sdp解析兼容性 2019-10-08 09:55:59 +08:00
xiongziliang e5cb5c56a1 提升sdp解析兼容性 2019-10-08 09:44:08 +08:00
xiongziliang eb12bc7397 提升sdp解析兼容性 2019-10-08 09:39:54 +08:00
xiongziliang 86fcf69f81 提高rtsp对H264编码的sdp的兼容性 2019-09-25 22:16:35 +08:00
xiongziliang cb7c72d9d9 修正metadata拼写错误，优化RtmpMediaSource注册机制，修复及时拉流不出画面的bug 2019-09-23 16:47:20 +08:00
xiongziliang d8de1e226c 完善对H265的sdp兼容性 2019-09-05 14:56:33 +08:00
xiongziliang 2020e23437 兼容某些不规范的sdp 2019-08-06 16:23:20 +08:00
zqsong 360eba2c68 MP4录制添加H265支持 2019-07-30 19:26:38 +08:00
xiongziliang e095a604ab 更新ssrc生成规则 2019-07-19 09:42:48 +08:00
xiongziliang 8bbd9d57c0 更改ssrc生成规则 2019-07-17 15:23:54 +08:00
xiongziliang 7aa0c2ae33 整理优化代码 2019-06-28 17:37:11 +08:00