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

Allow SynchronizedFrameDecodeScheduler::Stop to be run multiple times

Browse Source 
Stop being called twice can happen in tests since the VideoReceiveStream
destructor calls Stop so any test calling Stop may invoke it twice. This
is a general problem that all things that the VideoReceiveStream have to
able to be stopped multiple times.

Bug: b/270932185
Change-Id: Ic25810d5ab73e8a07cf3b16685c578f4c0aa7fbd
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/295580
Auto-Submit: Evan Shrubsole <eshr@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Evan Shrubsole <eshr@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#39452}
This commit is contained in:
Evan Shrubsole 2023-02-28 16:01:05 +00:00 committed by WebRTC LUCI CQ
parent 34d339f12b
commit 57fe5cd7db
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
video/decode_synchronizer.cc
View File

@ -66,6 +66,7 @@ DecodeSynchronizer::SynchronizedFrameDecodeScheduler::ScheduledRtpTimestamp() {
DecodeSynchronizer::ScheduledFrame
DecodeSynchronizer::SynchronizedFrameDecodeScheduler::ReleaseNextFrame() {
RTC_DCHECK(!stopped_);
RTC_DCHECK(next_frame_);
auto res = std::move(*next_frame_);
next_frame_.reset();
@ -82,6 +83,7 @@ void DecodeSynchronizer::SynchronizedFrameDecodeScheduler::ScheduleFrame(
uint32_t rtp,
FrameDecodeTiming::FrameSchedule schedule,
FrameReleaseCallback cb) {
RTC_DCHECK(!stopped_);
RTC_DCHECK(!next_frame_) << "Can not schedule two frames at once.";
next_frame_ = ScheduledFrame(rtp, std::move(schedule), std::move(cb));
sync_->OnFrameScheduled(this);
@ -92,6 +94,9 @@ void DecodeSynchronizer::SynchronizedFrameDecodeScheduler::CancelOutstanding() {
}
void DecodeSynchronizer::SynchronizedFrameDecodeScheduler::Stop() {
if (stopped_) {
return;
}
CancelOutstanding();
stopped_ = true;
sync_->RemoveFrameScheduler(this);
@ -107,7 +112,7 @@ DecodeSynchronizer::DecodeSynchronizer(Clock* clock,
DecodeSynchronizer::~DecodeSynchronizer() {
RTC_DCHECK_RUN_ON(worker_queue_);
RTC_DCHECK(schedulers_.empty());
RTC_CHECK(schedulers_.empty());
}
std::unique_ptr<FrameDecodeScheduler>