Reverted: WHIP: Fix bug for converting WHIP to RTMP/HLS. v5.0.204 v6.0.107#3911
Merged
xiaozhihong merged 6 commits intoossrs:developfrom Dec 29, 2023
Merged
Reverted: WHIP: Fix bug for converting WHIP to RTMP/HLS. v5.0.204 v6.0.107#3911xiaozhihong merged 6 commits intoossrs:developfrom
xiaozhihong merged 6 commits intoossrs:developfrom
Conversation
49e3ff2 to
29b3904
Compare
29b3904 to
b72cd2f
Compare
Member
Author
|
Merge into versions 5.0 and 6.0.
|
xiaozhihong
reviewed
Dec 18, 2023
xiaozhihong
reviewed
Dec 18, 2023
xiaozhihong
approved these changes
Dec 28, 2023
Member
Author
|
Please be aware that this merge request has been revoked due to issues after merging into 5.0. The pull request has been resubmitted: #3920
|
xiaozhihong
added a commit
to xiaozhihong/srs
that referenced
this pull request
Jan 3, 2024
…rs#3911) 1. When converting RTC to RTMP, it is necessary to synchronize the audio and video timestamps. When the synchronization status changes, whether it is unsynchronized or synchronized, print logs to facilitate troubleshooting of such issues. 2. Chrome uses the STAP-A packet, which means a single RTP packet contains SPS/PPS information. OBS WHIP, on the other hand, sends SPS and PPS in separate RTP packets. Therefore, SPS and PPS are in two independent RTP packets, and SRS needs to cache these two packets. --------- Co-authored-by: john <hondaxiao@tencent.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Co-authored-by: john hondaxiao@tencent.com