mirror of
https://github.com/ossrs/srs.git
synced 2025-02-15 04:42:04 +00:00
Merge
This commit is contained in:
commit
30b1fa650c
1 changed files with 2 additions and 2 deletions
|
@ -469,7 +469,7 @@ srs_error_t SrsRtcPlayStream::initialize(SrsRequest* req, std::map<uint32_t, Srs
|
||||||
void SrsRtcPlayStream::on_stream_change(SrsRtcStreamDescription* desc)
|
void SrsRtcPlayStream::on_stream_change(SrsRtcStreamDescription* desc)
|
||||||
{
|
{
|
||||||
// Refresh the relation for audio.
|
// Refresh the relation for audio.
|
||||||
// TODO: FIMXE: Match by label?
|
// TODO: FIXME: Match by label?
|
||||||
if (desc && desc->audio_track_desc_ && audio_tracks_.size() == 1) {
|
if (desc && desc->audio_track_desc_ && audio_tracks_.size() == 1) {
|
||||||
uint32_t ssrc = desc->audio_track_desc_->ssrc_;
|
uint32_t ssrc = desc->audio_track_desc_->ssrc_;
|
||||||
SrsRtcAudioSendTrack* track = audio_tracks_.begin()->second;
|
SrsRtcAudioSendTrack* track = audio_tracks_.begin()->second;
|
||||||
|
@ -479,7 +479,7 @@ void SrsRtcPlayStream::on_stream_change(SrsRtcStreamDescription* desc)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Refresh the relation for video.
|
// Refresh the relation for video.
|
||||||
// TODO: FIMXE: Match by label?
|
// TODO: FIXME: Match by label?
|
||||||
if (desc && desc->video_track_descs_.size() == 1 && desc->video_track_descs_.size() == 1) {
|
if (desc && desc->video_track_descs_.size() == 1 && desc->video_track_descs_.size() == 1) {
|
||||||
SrsRtcTrackDescription* vdesc = desc->video_track_descs_.at(0);
|
SrsRtcTrackDescription* vdesc = desc->video_track_descs_.at(0);
|
||||||
uint32_t ssrc = vdesc->ssrc_;
|
uint32_t ssrc = vdesc->ssrc_;
|
||||||
|
|
Loading…
Reference in a new issue