zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor order change to Call::DestroyVideoSendStream.

Browse Source 
Move StopPermanentlyAndGetRtpStates closer to being the last step of
the destruction process.

Bug: webrtc:11993
Change-Id: I83d86c505b05f5c10d0ce802494baba9aa645027
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/239182
Auto-Submit: Tomas Gunnarsson <tommi@webrtc.org>
Reviewed-by: Niels Moller <nisse@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#35774}
This commit is contained in:
Tommi
2022-01-24 14:04:55 +01:00
committed by WebRTC LUCI CQ
parent 29159ca979
commit 3088941a5e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
call/call.cc
View File

@ -1080,10 +1080,6 @@ void Call::DestroyVideoSendStream(webrtc::VideoSendStream* send_stream) {
VideoSendStream* send_stream_impl = VideoSendStream* send_stream_impl =
static_cast<VideoSendStream*>(send_stream); static_cast<VideoSendStream*>(send_stream);
VideoSendStream::RtpStateMap rtp_states;
VideoSendStream::RtpPayloadStateMap rtp_payload_states;
send_stream_impl->StopPermanentlyAndGetRtpStates(&rtp_states,
&rtp_payload_states);
auto it = video_send_ssrcs_.begin(); auto it = video_send_ssrcs_.begin();
while (it != video_send_ssrcs_.end()) { while (it != video_send_ssrcs_.end()) {
@ -1103,6 +1099,10 @@ void Call::DestroyVideoSendStream(webrtc::VideoSendStream* send_stream) {
if (video_send_streams_.empty()) if (video_send_streams_.empty())
video_send_streams_empty_.store(true, std::memory_order_relaxed); video_send_streams_empty_.store(true, std::memory_order_relaxed);
VideoSendStream::RtpStateMap rtp_states;
VideoSendStream::RtpPayloadStateMap rtp_payload_states;
send_stream_impl->StopPermanentlyAndGetRtpStates(&rtp_states,
&rtp_payload_states);
for (const auto& kv : rtp_states) { for (const auto& kv : rtp_states) {
suspended_video_send_ssrcs_[kv.first] = kv.second; suspended_video_send_ssrcs_[kv.first] = kv.second;
} }