diff --git a/AUTHORS b/AUTHORS index fcc45452..d5a5358a 100644 --- a/AUTHORS +++ b/AUTHORS @@ -107,4 +107,22 @@ WuPeng [huangcaichun](https://github.com/huangcaichun) [jamesZHANG500](https://github.com/jamesZHANG500) [weidelong](https://github.com/wdl1697454803) -[小强先生](https://github.com/linshangqiang) \ No newline at end of file +[小强先生](https://github.com/linshangqiang) +[李之阳](https://github.com/leo94666) +[sgzed](https://github.com/sgzed) +[gaoshan](https://github.com/foobra) +[zhang2349](https://github.com/zhang2349) +[benshi](https://github.com/BenLocal) +[autoantwort](https://github.com/autoantwort) +[u7ko4](https://github.com/u7ko4) +[WengQiang](https://github.com/Tsubaki-01) +[wEnchanters](https://github.com/wEnchanters) +[sbkyy](https://github.com/sbkyy) +[wuxingzhong](https://github.com/wuxingzhong) +[286897655](https://github.com/286897655) +[ss002012](https://github.com/ss002012) +[a839419160](https://github.com/a839419160) +[oldma3095](https://github.com/oldma3095) +[Dary](https://github.com/watersounds) +[N.z](https://github.com/neesonqk) +[yanggs](https://github.com/callinglove) \ No newline at end of file diff --git a/README.md b/README.md index b9ff11a0..678b0a56 100644 --- a/README.md +++ b/README.md @@ -147,6 +147,33 @@ - 支持溯源模式的集群部署，溯源方式支持rtsp/rtmp/hls/http-ts, 边沿站支持hls, 源站支持多个(采用round robin方式溯源) - rtsp/rtmp/webrtc推流异常断开后，可以在超时时间内重连推流，播放器无感知 +## 闭源专业版 +在最新开源代码的基础，新增以下闭源专业版，详询邮箱：<1213642868@qq.com> +- 转码版本 + - 1、音视频间任意转码(包括h265/h264/opus/g711/aac/g722/g722.1/mp3/svac等。 + - 2、基于配置文件的转码，支持设置比特率，codec类型等参数。 + - 3、基于http api的动态增减转码，支持设置比特率，分辨率倍数，codec类型、滤镜等参数。 + - 4、支持硬件、软件自适应转码。 + - 5、支持按需转码，有人观看才转码，支持透明转码模式，业务无需感知转码的存在，业务代码无需做任何调整。 + - 6、支持负载过高时，转码主动降低帧率且不花屏。 + - 7、支持滤镜，支持添加osd文本以及logo角标等能力。 + - 8、支持全GPU硬件编解码与滤镜，防止显存与内存频繁拷贝。 + - 9、支持视频全GPU(cuda)推理插件，支持人员、车辆等目标AI识别。 + +- JT1078部标版本 + - 1、支持接收jt1078推流转其他协议；自适应音视频共享seq和单独seq模式。 + - 2、新增支持jt1078级联，支持jt1078对讲。 + - 3、jt1078相关接口和用法与GB28181用法一致，保持兼容。 + - 4、支持h264/h265/g711/aac/mp3/g721/g722/g723/g729/g726/adpcm等编码。 + +- IPTV版本 + - 1、支持rtsp-ts/hls/http-ts/rtp组播/udp组播拉流转协议，支持ts透传模式，无需解复用转rtsp-ts/hls/http-ts/srt协议。 + - 2、支持接收rtsp-ts/srt推流，支持ts透传模式，无需解复用转rtsp-ts/hls/http-ts/srt协议。 + - 3、上述功能同时支持解复用ts为es流再转rtsp/rtmp/flv/http-ts/hls/hls-fmp4/mp4/fmp4/webrtc等协议。 + +- VP9/AV1版本 + - 全面新增支持av1/vp9编码，rtmp/rtsp/ts/ps/hls/mp4/fmp4等协议全面支持av1/vp9。 + ## 编译以及测试 **编译前务必仔细参考wiki:[快速开始](https://github.com/ZLMediaKit/ZLMediaKit/wiki/%E5%BF%AB%E9%80%9F%E5%BC%80%E5%A7%8B)操作!!!** @@ -381,6 +408,9 @@ bash build_docker_images.sh [ss002012](https://github.com/ss002012) [a839419160](https://github.com/a839419160) [oldma3095](https://github.com/oldma3095) +[Dary](https://github.com/watersounds) +[N.z](https://github.com/neesonqk) +[yanggs](https://github.com/callinglove) 同时感谢JetBrains对开源项目的支持，本项目使用CLion开发与调试： diff --git a/README_en.md b/README_en.md index 1065e5b2..4e87aa25 100644 --- a/README_en.md +++ b/README_en.md @@ -139,7 +139,36 @@ - Supports on-demand demultiplexing and protocol conversion, reducing CPU usage by only enabling it when someone is watching - Supports cluster deployment in traceable mode, with RTSP/RTMP/HLS/HTTP-TS support for traceable mode and HLS support for edge stations and multiple sources for source stations (using round-robin tracing) - Can reconnect to streaming after abnormal disconnection in RTSP/RTMP/WebRTC pushing within a timeout period, with no impact on the player. - + +## Closed-Source Professional Edition +Based on the latest open-source code, the following closed-source professional editions have been added. For details, please contact: 1213642868@qq.com + +- Transcoding Version + - Supports arbitrary audio and video transcoding, including H.265/H.264/Opus/G.711/AAC/G.722/G.722.1/MP3/SVAC, etc. + - Configuration file-based transcoding, allowing customization of bitrate, codec type, and other parameters. + - Dynamic transcoding management via HTTP API, supporting settings for bitrate, resolution scaling, codec type, filters, etc. + - Supports adaptive hardware and software transcoding. + - Supports on-demand transcoding, only transcoding when a viewer is present. It also supports transparent transcoding mode, requiring no modifications to business logic. + - Supports automatic frame rate reduction under high load conditions to prevent video artifacts. + - Supports filters, including OSD text overlay and logo watermarking. + - Supports full GPU hardware encoding/decoding and filtering, minimizing frequent memory transfers between VRAM and RAM. + - Supports full GPU (CUDA) inference plugins, enabling AI-based object detection for people, vehicles, and other targets. + +- JT1078 Version + - Supports JT1078 stream ingestion and protocol conversion, with adaptive audio-video shared sequence and individual sequence modes. + - Adds JT1078 cascading support and JT1078 intercom support. + - JT1078 APIs and usage remain consistent with GB28181, ensuring compatibility. + - Supports H.264/H.265/G.711/AAC/MP3/G.721/G.722/G.723/G.729/G.726/ADPCM encoding. + +- IPTV Version + - Supports RTSP-TS/HLS/HTTP-TS/RTP multicast/UDP multicast stream ingestion and protocol conversion. Supports TS passthrough mode, eliminating the need for demuxing when converting to RTSP-TS/HLS/HTTP-TS/SRT. + - Supports RTSP-TS/SRT stream ingestion and TS passthrough mode, avoiding the need for demuxing when converting to RTSP-TS/HLS/HTTP-TS/SRT. + - All the above features also support demuxing TS into ES streams and converting them to RTSP/RTMP/FLV/HTTP-TS/HLS/HLS-FMP4/MP4/FMP4/WebRTC. + +- VP9/AV1 Version + Fully supports AV1/VP9 encoding, with RTMP/RTSP/TS/PS/HLS/MP4/FMP4 protocol compatibility for AV1/VP9. + + ## System Requirements - Compiler with c++11 support, such as GCC 4.8+, Clang 3.3+, or VC2015+. @@ -542,6 +571,9 @@ Thanks to all those who have supported this project in various ways, including b [ss002012](https://github.com/ss002012) [a839419160](https://github.com/a839419160) [oldma3095](https://github.com/oldma3095) +[Dary](https://github.com/watersounds) +[N.z](https://github.com/neesonqk) +[yanggs](https://github.com/callinglove) Also thank to JetBrains for their support for open source project, we developed and debugged zlmediakit with CLion: