amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-24 11:40:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Compare commits

base: amass:87708dafb7336353c75e83fb04732ec5f14d26f7
Branches Tags
amass:master
amass:feature/transcode2
amass:feature/dynamic_library
amass:push_force_replace
amass:feature/dynamic_codec
amass:7.0
amass:feature/log_context
amass:feature/transcode
amass:feature/async_write_file
amass:feature/hls_record_disk
amass:6.0
amass:5.0
amass:4.0
amass:3.0
amass:2.0
amass:1.0
...
compare: amass:02480ac7f6456221ac2edaa023a9baee58e3173d
Branches Tags
amass:master
amass:feature/transcode2
amass:feature/dynamic_library
amass:push_force_replace
amass:feature/dynamic_codec
amass:7.0
amass:feature/log_context
amass:feature/transcode
amass:feature/async_write_file
amass:feature/hls_record_disk
amass:6.0
amass:5.0
amass:4.0
amass:3.0
amass:2.0
amass:1.0

3 Commits
87708dafb7 ... 02480ac7f6

Author SHA1 Message Date
johzzy
02480ac7f6
Merge 9de09a4f68 into de7afaf992 2024-09-27 11:45:34 +08:00
xiongguangjie
de7afaf992
Avoid negative PTS in the RTSP protocol (#3929 #3815)
Some checks failed
Android / build (push) Has been cancelled
Details
CodeQL / Analyze (cpp) (push) Has been cancelled
Details
CodeQL / Analyze (javascript) (push) Has been cancelled
Details
Docker / build (push) Has been cancelled
Details
Linux / build (push) Has been cancelled
Details
macOS / build (push) Has been cancelled
Details
Windows / build (push) Has been cancelled
Details 
Optimaztion for issue #3815 ffmpeg rtsp pull stream has negative pts
 2024-09-26 10:59:41 +08:00
Johnny
9de09a4f68 support http://www.webrtc.org/experiments/rtp-hdrext/video-layers-allocation00 2024-04-23 17:19:50 +08:00
3 changed files with 7 additions and 4 deletions
Show Stats Expand all files Collapse all files

6
src/Rtsp/RtspMediaSourceImp.cpp
View File

@ -54,7 +54,9 @@ void RtspMediaSource::onWrite(RtpPacket::Ptr rtp, bool keyPos) {
assert(rtp->type >= 0 && rtp->type < TrackMax); assert(rtp->type >= 0 && rtp->type < TrackMax);
auto &track = _tracks[rtp->type]; auto &track = _tracks[rtp->type];
auto stamp = rtp->getStampMS(); auto stamp = rtp->getStampMS();
if (track) { bool is_video = rtp->type == TrackVideo;
// 音频总是更新，视频在关键包时更新
if (track && ((keyPos && _have_video && is_video) || (!is_video))) {
track->_seq = rtp->getSeq(); track->_seq = rtp->getSeq();
track->_time_stamp = rtp->getStamp() * uint64_t(1000) / rtp->sample_rate; track->_time_stamp = rtp->getStamp() * uint64_t(1000) / rtp->sample_rate;
track->_ssrc = rtp->getSSRC(); track->_ssrc = rtp->getSSRC();
@ -77,7 +79,7 @@ void RtspMediaSource::onWrite(RtpPacket::Ptr rtp, bool keyPos) {
regist(); regist();
} }
} }
bool is_video = rtp->type == TrackVideo;
PacketCache<RtpPacket>::inputPacket(stamp, is_video, std::move(rtp), keyPos); PacketCache<RtpPacket>::inputPacket(stamp, is_video, std::move(rtp), keyPos);
} }

2
src/Rtsp/RtspSession.cpp
View File

@ -833,7 +833,7 @@ void RtspSession::handleReq_Play(const Parser &parser) {
rtp_info << "url=" << track->getControlUrl(_content_base) << ";" rtp_info << "url=" << track->getControlUrl(_content_base) << ";"
<< "seq=" << track->_seq << ";" << "seq=" << track->_seq << ";"
<< "rtptime=" << (int) (track->_time_stamp * (track->_samplerate / 1000)) << ","; << "rtptime=" << (int64_t)(track->_time_stamp) * (int64_t)(track->_samplerate/ 1000) << ",";
} }
rtp_info.pop_back(); rtp_info.pop_back();

3
webrtc/RtpExt.h
View File

@ -35,7 +35,8 @@ namespace mediakit {
XX(video_orientation, "urn:3gpp:video-orientation") \ XX(video_orientation, "urn:3gpp:video-orientation") \
XX(toffset, "urn:ietf:params:rtp-hdrext:toffset") \ XX(toffset, "urn:ietf:params:rtp-hdrext:toffset") \
XX(av1, "https://aomediacodec.github.io/av1-rtp-spec/#dependency-descriptor-rtp-header-extension") \ XX(av1, "https://aomediacodec.github.io/av1-rtp-spec/#dependency-descriptor-rtp-header-extension") \
XX(encrypt, "urn:ietf:params:rtp-hdrext:encrypt") XX(encrypt, "urn:ietf:params:rtp-hdrext:encrypt") \
XX(video_layers_allocation00, "http://www.webrtc.org/experiments/rtp-hdrext/video-layers-allocation00") \
enum class RtpExtType : uint8_t { enum class RtpExtType : uint8_t {
padding = 0, padding = 0,