admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replaced DestructAndGetRtpStateTask with lambda.

Browse Source 
Slight change in functionality: send_stream_ member is no longer moved
to the QueuedTask. This means that a possible race on access to
send_stream_ will not cause nullpointer dereferencing until the posted
task has been run. Most usages of send_stream_ are protected by
thread_checker_, but not DeliverRtcp and EnableEncodedFrameRecording.

This change in behavior should be be able to cause new failures, but it
could potentially make existing race conditions less likely to happen.

Bug: None
Change-Id: Ife42071a4aa2811fcaf2f3ef21ca1888e6640ca3
Reviewed-on: https://webrtc-review.googlesource.com/59800
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22327}
This commit is contained in:
Sebastian Jansson 2018-03-05 19:09:11 +01:00 committed by Commit Bot
parent e4d79c73cc
commit 1b2e90beb6
1 changed files with 7 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
video/video_send_stream.cc
View File

@ -421,36 +421,6 @@ class VideoSendStreamImpl : public webrtc::BitrateAllocatorObserver,
std::vector<bool> loss_mask_vector_;
};
class VideoSendStream::DestructAndGetRtpStateTask : public rtc::QueuedTask {
public:
DestructAndGetRtpStateTask(
VideoSendStream::RtpStateMap* state_map,
VideoSendStream::RtpPayloadStateMap* payload_state_map,
std::unique_ptr<VideoSendStreamImpl> send_stream,
rtc::Event* done_event)
: state_map_(state_map),
payload_state_map_(payload_state_map),
send_stream_(std::move(send_stream)),
done_event_(done_event) {}
~DestructAndGetRtpStateTask() override { RTC_CHECK(!send_stream_); }
private:
bool Run() override {
send_stream_->Stop();
*state_map_ = send_stream_->GetRtpStates();
*payload_state_map_ = send_stream_->GetRtpPayloadStates();
send_stream_.reset();
done_event_->Set();
return true;
}
VideoSendStream::RtpStateMap* state_map_;
VideoSendStream::RtpPayloadStateMap* payload_state_map_;
std::unique_ptr<VideoSendStreamImpl> send_stream_;
rtc::Event* done_event_;
};
// CheckEncoderActivityTask is used for tracking when the encoder last produced
// and encoded video frame. If the encoder has not produced anything the last
// kEncoderTimeOutMs we also want to stop sending padding.
@ -643,10 +613,13 @@ void VideoSendStream::StopPermanentlyAndGetRtpStates(
RTC_DCHECK_RUN_ON(&thread_checker_);
video_stream_encoder_->Stop();
send_stream_->DeRegisterProcessThread();
worker_queue_->PostTask(
std::unique_ptr<rtc::QueuedTask>(new DestructAndGetRtpStateTask(
rtp_state_map, payload_state_map, std::move(send_stream_),
&thread_sync_event_)));
worker_queue_->PostTask([this, rtp_state_map, payload_state_map]() {
send_stream_->Stop();
*rtp_state_map = send_stream_->GetRtpStates();
*payload_state_map = send_stream_->GetRtpPayloadStates();
send_stream_.reset();
thread_sync_event_.Set();
});
thread_sync_event_.Wait(rtc::Event::kForever);
}