From 80a1d4bdbbf0bd674cf156cf4469248f4717c93d Mon Sep 17 00:00:00 2001 From: Artem Titov Date: Tue, 7 Apr 2020 18:13:04 +0000 Subject: [PATCH] Revert "Temporarily disable DCHECKs on linux in VideoReceiveStream and" This reverts commit 3cb88f1759cda989ca6e5346333e1b02c4d838bf. Reason for revert: Speculative revert: breaks downstream project Original change's description: > Temporarily disable DCHECKs on linux in VideoReceiveStream and > ReceiveStatisticsProxy. > > No-Try: true > Tbr: mbonadei@webrtc.org > Bug: webrtc:11490 > Change-Id: I9f8b25a094820f5ee1601b9971e00adbc7ba6b0f > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/172936 > Reviewed-by: Tommi > Commit-Queue: Tommi > Cr-Commit-Position: refs/heads/master@{#31011} TBR=mbonadei@webrtc.org,tommi@webrtc.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: webrtc:11490 Change-Id: I34126619663a12bbc90ec426b562e1372ec3848c Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/173083 Reviewed-by: Artem Titov Reviewed-by: Mirko Bonadei Commit-Queue: Artem Titov Cr-Commit-Position: refs/heads/master@{#31021} --- video/receive_statistics_proxy.cc | 6 ------ video/video_receive_stream.cc | 3 --- 2 files changed, 9 deletions(-) diff --git a/video/receive_statistics_proxy.cc b/video/receive_statistics_proxy.cc index 223b94341d..acea4e3ddc 100644 --- a/video/receive_statistics_proxy.cc +++ b/video/receive_statistics_proxy.cc @@ -121,10 +121,7 @@ ReceiveStatisticsProxy::ReceiveStatisticsProxy( sum_missed_render_deadline_ms_(0), timing_frame_info_counter_(kMovingMaxWindowMs), worker_thread_(worker_thread) { - // TODO(webrtc:11489): Update downstream tests. -#if !defined(WEBRTC_LINUX) RTC_DCHECK(worker_thread); -#endif decode_queue_.Detach(); incoming_render_queue_.Detach(); stats_.ssrc = config->rtp.remote_ssrc; @@ -662,10 +659,7 @@ ReceiveStatisticsProxy::GetCurrentEstimatedPlayoutNtpTimestampMs( } VideoReceiveStream::Stats ReceiveStatisticsProxy::GetStats() const { - // TODO(webrtc:11489): Update downstream tests. -#if !defined(WEBRTC_LINUX) RTC_DCHECK_RUN_ON(&main_thread_); -#endif // Like VideoReceiveStream::GetStats, called on the worker thread from // StatsCollector::ExtractMediaInfo via worker_thread()->Invoke(). diff --git a/video/video_receive_stream.cc b/video/video_receive_stream.cc index 6d434bba7b..5d371a59dd 100644 --- a/video/video_receive_stream.cc +++ b/video/video_receive_stream.cc @@ -447,10 +447,7 @@ void VideoReceiveStream::Stop() { } VideoReceiveStream::Stats VideoReceiveStream::GetStats() const { - // TODO(webrtc:11489): Update downstream tests. -#if !defined(WEBRTC_LINUX) RTC_DCHECK_RUN_ON(&worker_sequence_checker_); -#endif VideoReceiveStream::Stats stats = stats_proxy_.GetStats(); stats.total_bitrate_bps = 0; StreamStatistician* statistician =