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

Revert "Temporarily disable DCHECKs on linux in VideoReceiveStream and"

Browse Source 
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 <tommi@webrtc.org>
> Commit-Queue: Tommi <tommi@webrtc.org>
> 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 <titovartem@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Artem Titov <titovartem@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31021}
This commit is contained in:
Artem Titov
2020-04-07 18:13:04 +00:00
committed by Mirko Bonadei
parent f03cbe9bee
commit 80a1d4bdbb
2 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
video/receive_statistics_proxy.cc
View File

@ -121,10 +121,7 @@ ReceiveStatisticsProxy::ReceiveStatisticsProxy(
sum_missed_render_deadline_ms_(0), sum_missed_render_deadline_ms_(0),
timing_frame_info_counter_(kMovingMaxWindowMs), timing_frame_info_counter_(kMovingMaxWindowMs),
worker_thread_(worker_thread) { worker_thread_(worker_thread) {
// TODO(webrtc:11489): Update downstream tests.
#if !defined(WEBRTC_LINUX)
RTC_DCHECK(worker_thread); RTC_DCHECK(worker_thread);
#endif
decode_queue_.Detach(); decode_queue_.Detach();
incoming_render_queue_.Detach(); incoming_render_queue_.Detach();
stats_.ssrc = config->rtp.remote_ssrc; stats_.ssrc = config->rtp.remote_ssrc;
@ -662,10 +659,7 @@ ReceiveStatisticsProxy::GetCurrentEstimatedPlayoutNtpTimestampMs(
} }
VideoReceiveStream::Stats ReceiveStatisticsProxy::GetStats() const { VideoReceiveStream::Stats ReceiveStatisticsProxy::GetStats() const {
// TODO(webrtc:11489): Update downstream tests.
#if !defined(WEBRTC_LINUX)
RTC_DCHECK_RUN_ON(&main_thread_); RTC_DCHECK_RUN_ON(&main_thread_);
#endif
// Like VideoReceiveStream::GetStats, called on the worker thread from // Like VideoReceiveStream::GetStats, called on the worker thread from
// StatsCollector::ExtractMediaInfo via worker_thread()->Invoke(). // StatsCollector::ExtractMediaInfo via worker_thread()->Invoke().

3
video/video_receive_stream.cc
View File

@ -447,10 +447,7 @@ void VideoReceiveStream::Stop() {
} }
VideoReceiveStream::Stats VideoReceiveStream::GetStats() const { VideoReceiveStream::Stats VideoReceiveStream::GetStats() const {
// TODO(webrtc:11489): Update downstream tests.
#if !defined(WEBRTC_LINUX)
RTC_DCHECK_RUN_ON(&worker_sequence_checker_); RTC_DCHECK_RUN_ON(&worker_sequence_checker_);
#endif
VideoReceiveStream::Stats stats = stats_proxy_.GetStats(); VideoReceiveStream::Stats stats = stats_proxy_.GetStats();
stats.total_bitrate_bps = 0; stats.total_bitrate_bps = 0;
StreamStatistician* statistician = StreamStatistician* statistician =