external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 20:01:56 +00:00
Code Issues Releases Wiki Activity

For #1998, fix fetch remote payload bug. 4.0.56

Browse source
This commit is contained in:
winlin 2020-11-13 08:48:51 +08:00
parent 4650d47082
commit 5d27c62e95
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
trunk/src/app/srs_app_rtc_conn.cpp
View file

@ -2957,7 +2957,7 @@ srs_error_t SrsRtcConnection::negotiate_play_capability(SrsRequest* req, const S
} }
std::vector<SrsRtcTrackDescription*> track_descs; std::vector<SrsRtcTrackDescription*> track_descs;
SrsMediaPayloadType* remote_payload = NULL; SrsMediaPayloadType remote_payload(0);
if (remote_media_desc.is_audio()) { if (remote_media_desc.is_audio()) {
// TODO: check opus format specific param // TODO: check opus format specific param
vector<SrsMediaPayloadType> payloads = remote_media_desc.find_media_with_encoding_name("opus"); vector<SrsMediaPayloadType> payloads = remote_media_desc.find_media_with_encoding_name("opus");
@ -2965,7 +2965,7 @@ srs_error_t SrsRtcConnection::negotiate_play_capability(SrsRequest* req, const S
return srs_error_new(ERROR_RTC_SDP_EXCHANGE, "no valid found opus payload type"); return srs_error_new(ERROR_RTC_SDP_EXCHANGE, "no valid found opus payload type");
} }
remote_payload = &payloads.at(0); remote_payload = payloads.at(0);
track_descs = source->get_track_desc("audio", "opus"); track_descs = source->get_track_desc("audio", "opus");
} else if (remote_media_desc.is_video()) { } else if (remote_media_desc.is_video()) {
// TODO: check opus format specific param // TODO: check opus format specific param
@ -2974,15 +2974,17 @@ srs_error_t SrsRtcConnection::negotiate_play_capability(SrsRequest* req, const S
return srs_error_new(ERROR_RTC_SDP_EXCHANGE, "no valid found h264 payload type"); return srs_error_new(ERROR_RTC_SDP_EXCHANGE, "no valid found h264 payload type");
} }
remote_payload = payloads.at(0);
for (int j = 0; j < (int)payloads.size(); j++) { for (int j = 0; j < (int)payloads.size(); j++) {
SrsMediaPayloadType& payload = payloads.at(j); SrsMediaPayloadType& payload = payloads.at(j);
// If exists 42e01f profile, choose it; otherwise, use the first payload. // If exists 42e01f profile, choose it; otherwise, use the first payload.
if (!has_42e01f || srs_sdp_has_h264_profile(payload, "42e01f")) { if (!has_42e01f || srs_sdp_has_h264_profile(payload, "42e01f")) {
remote_payload = &payloads.at(j); remote_payload = payload;
break; break;
} }
} }
track_descs = source->get_track_desc("video", "H264"); track_descs = source->get_track_desc("video", "H264");
} }
@ -2990,7 +2992,7 @@ srs_error_t SrsRtcConnection::negotiate_play_capability(SrsRequest* req, const S
SrsRtcTrackDescription* track = track_descs[i]->copy(); SrsRtcTrackDescription* track = track_descs[i]->copy();
// Use remote/source/offer PayloadType. // Use remote/source/offer PayloadType.
track->media_->pt_ = remote_payload->payload_type_; track->media_->pt_ = remote_payload.payload_type_;
track->mid_ = remote_media_desc.mid_; track->mid_ = remote_media_desc.mid_;
uint32_t publish_ssrc = track->ssrc_; uint32_t publish_ssrc = track->ssrc_;

2
trunk/src/core/srs_core_version4.hpp
View file

@ -24,6 +24,6 @@
#ifndef SRS_CORE_VERSION4_HPP #ifndef SRS_CORE_VERSION4_HPP
#define SRS_CORE_VERSION4_HPP #define SRS_CORE_VERSION4_HPP
#define SRS_VERSION4_REVISION 55 #define SRS_VERSION4_REVISION 56
#endif #endif