cqm
|
03526f141e
|
Merge branch 'master' of https://github.com/ZLMediaKit/ZLMediaKit into feature/transcode2
# Conflicts:
# conf/config.ini
# src/Codec/Transcode.cpp
# src/Common/MediaSource.h
# src/Common/MultiMediaSourceMuxer.cpp
# src/Common/MultiMediaSourceMuxer.h
# src/Common/macros.h
# webrtc/WebRtcPusher.cpp
# webrtc/WebRtcTransport.cpp
# webrtc/WebRtcTransport.h
|
2026-04-03 09:56:05 +08:00 |
|
mtdxc
|
b003eb3eec
|
各协议全面支持vp8/vp9/av1编码，ertmp新增支持opus编码 (#4498)
实现功能：
- rtp 增加vp8，vp9和av1编码支持
- 实现MP4录像所需的extra_data接口
- 扩展rtmp增加对opus、vp8、vp9和av1的支持
已知问题：
- 开启enhance rtmp后，ffmpeg暂时不支持播放vp8编码格式，其他格式的支持
- vp9和av1开始播放时容易遇到卡顿情况，过几秒后好了，原因暂时未知
---------
Co-authored-by: xia-chu <771730766@qq.com>
|
2025-10-16 19:26:46 +08:00 |
|
cqm
|
89e21038c2
|
Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit into feature/transcode2
# Conflicts:
# src/Common/MediaSource.h
# src/Common/config.h
# src/Rtsp/RtspMediaSourceImp.h
# src/Rtsp/RtspMediaSourceMuxer.h
# src/Rtsp/RtspMuxer.cpp
# webrtc/WebRtcTransport.cpp
|
2024-09-22 11:40:39 +08:00 |
|
alex
|
4152dcd409
|
AI automatically translates all comments in the code into English (#3917)
|
2024-09-19 14:53:50 +08:00 |
|
cqm
|
2ffdfab71e
|
Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit into transcode2
# Conflicts:
# CMakeLists.txt
# conf/config.ini
# src/Common/MediaSink.cpp
# src/Common/MediaSink.h
# src/Common/MediaSource.cpp
# src/Common/MultiMediaSourceMuxer.h
# src/Common/config.cpp
# src/Common/config.h
# src/Extension/AAC.cpp
# src/Extension/AAC.h
# src/Rtsp/RtpCodec.h
# src/Rtsp/RtspMuxer.cpp
# src/Rtsp/RtspMuxer.h
# webrtc/Nack.cpp
# webrtc/WebRtcTransport.cpp
|
2024-07-15 08:47:30 +08:00 |
|
xia-chu
|
25c99470ee
|
feat: add support of codec plugin
|
2023-12-10 11:09:04 +08:00 |
|