Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reverted: WHIP: Fix bug for converting WHIP to RTMP/HLS. v5.0.204 v6.0.107 #3911

Merged
merged 6 commits into from
Dec 29, 2023

Conversation

winlinvip
Copy link
Member

@winlinvip winlinvip commented Dec 14, 2023

  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

@winlinvip winlinvip added the EnglishNative This issue is conveyed exclusively in English. label Dec 14, 2023
@winlinvip winlinvip marked this pull request as draft December 14, 2023 07:45
@winlinvip winlinvip marked this pull request as ready for review December 14, 2023 09:17
@winlinvip
Copy link
Member Author

winlinvip commented Dec 14, 2023

Merge into versions 5.0 and 6.0.

TRANS_BY_GPT4

@winlinvip winlinvip linked an issue Dec 14, 2023 that may be closed by this pull request
@xiaozhihong xiaozhihong changed the title WHIP: Fix bug for converting WHIP to RTMP/HLS. WHIP: Fix bug for converting WHIP to RTMP/HLS. v5.0.204 v6.0.107 Dec 29, 2023
@xiaozhihong xiaozhihong added the RefinedByAI Refined by AI/GPT. label Dec 29, 2023
@xiaozhihong xiaozhihong merged commit 7859a82 into ossrs:develop Dec 29, 2023
17 checks passed
@winlinvip winlinvip deleted the bugfix/obs-whip branch December 30, 2023 00:51
@winlinvip winlinvip changed the title WHIP: Fix bug for converting WHIP to RTMP/HLS. v5.0.204 v6.0.107 Reverted: WHIP: Fix bug for converting WHIP to RTMP/HLS. v5.0.204 v6.0.107 Dec 30, 2023
@winlinvip
Copy link
Member Author

winlinvip commented Dec 30, 2023

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

TRANS_BY_GPT4

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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
EnglishNative This issue is conveyed exclusively in English. RefinedByAI Refined by AI/GPT.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

WHIP: OBS playback fails if attempted before publishing.
2 participants