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.

Sign up for GitHub

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

RTC: Fix video and audio track pt_ is not change in player before publisher. v5.0.207 v6.0.111 #3925

Merged
merged 3 commits into from
Feb 5, 2024
Merged

RTC: Fix video and audio track pt_ is not change in player before publisher. v5.0.207 v6.0.111 #3925

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f83c0c2
fixed video and audio track pt_ is not change in player before publisher
Jan 8, 2024
9bb540a
correct code style
xiaozhihong Feb 5, 2024
aa167d0
Update release to v5.0.207 v6.0.111
xiaozhihong Feb 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions trunk/src/app/srs_app_rtc_conn.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,6 +534,15 @@ void SrsRtcPlayStream::on_stream_change(SrsRtcSourceDescription* desc)
uint32_t ssrc = desc->audio_track_desc_->ssrc_;
SrsRtcAudioSendTrack* track = audio_tracks_.begin()->second;

if (track->track_desc_->media_->pt_of_publisher_ != desc->audio_track_desc_->media_->pt_) {
track->track_desc_->media_->pt_of_publisher_ = desc->audio_track_desc_->media_->pt_;
}

if (desc->audio_track_desc_->red_ && track->track_desc_->red_ &&
track->track_desc_->red_->pt_of_publisher_ != desc->audio_track_desc_->red_->pt_) {
track->track_desc_->red_->pt_of_publisher_ = desc->audio_track_desc_->red_->pt_;
}

audio_tracks_.clear();
audio_tracks_.insert(make_pair(ssrc, track));
}
Expand All @@ -547,6 +556,15 @@ void SrsRtcPlayStream::on_stream_change(SrsRtcSourceDescription* desc)
uint32_t ssrc = vdesc->ssrc_;
SrsRtcVideoSendTrack* track = video_tracks_.begin()->second;

if (track->track_desc_->media_->pt_of_publisher_ != vdesc->media_->pt_) {
track->track_desc_->media_->pt_of_publisher_ = vdesc->media_->pt_;
}

if (vdesc->red_ && track->track_desc_->red_ &&
track->track_desc_->red_->pt_of_publisher_ != vdesc->red_->pt_) {
track->track_desc_->red_->pt_of_publisher_ = vdesc->red_->pt_;
}

video_tracks_.clear();
video_tracks_.insert(make_pair(ssrc, track));
}
Expand Down
Loading