For #1998, fix fetch remote payload bug. 4.0.56

ossrs · Nov 13, 2020 · 5d27c62 · 5d27c62
1 parent 4650d47
commit 5d27c62
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp
@@ -2957,15 +2957,15 @@ srs_error_t SrsRtcConnection::negotiate_play_capability(SrsRequest* req, const S
         }
 
         std::vector<SrsRtcTrackDescription*> track_descs;
-        SrsMediaPayloadType* remote_payload = NULL;
+        SrsMediaPayloadType remote_payload(0);
         if (remote_media_desc.is_audio()) {
             // TODO: check opus format specific param
             vector<SrsMediaPayloadType> payloads = remote_media_desc.find_media_with_encoding_name("opus");
             if (payloads.empty()) {
                 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");
         } else if (remote_media_desc.is_video()) {
             // TODO: check opus format specific param
@@ -2974,23 +2974,25 @@ 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");
             }
 
+            remote_payload = payloads.at(0);
             for (int j = 0; j < (int)payloads.size(); j++) {
                 SrsMediaPayloadType& payload = payloads.at(j);
 
                 // If exists 42e01f profile, choose it; otherwise, use the first payload.
                 if (!has_42e01f || srs_sdp_has_h264_profile(payload, "42e01f")) {
-                    remote_payload = &payloads.at(j);
+                    remote_payload = payload;
                     break;
                 }
             }
+
             track_descs = source->get_track_desc("video", "H264");
         }
 
         for (int i = 0; i < (int)track_descs.size(); ++i) {
             SrsRtcTrackDescription* track = track_descs[i]->copy();
 
             // 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_;
             uint32_t publish_ssrc = track->ssrc_;

diff --git a/trunk/src/core/srs_core_version4.hpp b/trunk/src/core/srs_core_version4.hpp
@@ -24,6 +24,6 @@
 #ifndef SRS_CORE_VERSION4_HPP
 #define SRS_CORE_VERSION4_HPP
 
-#define SRS_VERSION4_REVISION 55
+#define SRS_VERSION4_REVISION 56
 
 #endif