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

Change ThreadChecker to SequencedTaskChecker in VideoReceiveStream

Browse Source 
In preparation of running DirectTransport on a TaskQueue in unit-tests, change the thread-checkers to sequence-checkers. This is necessary for Mac and iOS, where the TaskQueue is guaranteed to run sequentially, but not guaranteed to do so on only one thread.

TODO: Add the relevant BUGs.

BUG=None

Review-Url: https://codereview.webrtc.org/2997853002
Cr-Commit-Position: refs/heads/master@{#19408}
This commit is contained in:
eladalon 2017-08-18 04:02:48 -07:00 committed by Commit Bot
parent 5afa3f2690
commit a28122f5cd
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
webrtc/video/video_receive_stream.cc
View File

@ -205,7 +205,7 @@ VideoReceiveStream::VideoReceiveStream(
RTC_DCHECK(process_thread_);
RTC_DCHECK(call_stats_);
module_process_thread_checker_.DetachFromThread();
module_process_sequence_checker_.Detach();
RTC_DCHECK(!config_.decoders.empty());
std::set<int> decoder_payload_types;
@ -236,7 +236,7 @@ VideoReceiveStream::VideoReceiveStream(
}
VideoReceiveStream::~VideoReceiveStream() {
RTC_DCHECK_RUN_ON(&worker_thread_checker_);
RTC_DCHECK_CALLED_SEQUENTIALLY(&worker_sequence_checker_);
LOG(LS_INFO) << "~VideoReceiveStream: " << config_.ToString();
Stop();
@ -244,7 +244,7 @@ VideoReceiveStream::~VideoReceiveStream() {
}
void VideoReceiveStream::SignalNetworkState(NetworkState state) {
RTC_DCHECK_RUN_ON(&worker_thread_checker_);
RTC_DCHECK_CALLED_SEQUENTIALLY(&worker_sequence_checker_);
rtp_video_stream_receiver_.SignalNetworkState(state);
}
@ -253,12 +253,12 @@ bool VideoReceiveStream::DeliverRtcp(const uint8_t* packet, size_t length) {
}
void VideoReceiveStream::SetSync(Syncable* audio_syncable) {
RTC_DCHECK_RUN_ON(&worker_thread_checker_);
RTC_DCHECK_CALLED_SEQUENTIALLY(&worker_sequence_checker_);
rtp_stream_sync_.ConfigureSync(audio_syncable);
}
void VideoReceiveStream::Start() {
RTC_DCHECK_RUN_ON(&worker_thread_checker_);
RTC_DCHECK_CALLED_SEQUENTIALLY(&worker_sequence_checker_);
if (decode_thread_.IsRunning())
return;
@ -313,7 +313,7 @@ void VideoReceiveStream::Start() {
}
void VideoReceiveStream::Stop() {
RTC_DCHECK_RUN_ON(&worker_thread_checker_);
RTC_DCHECK_CALLED_SEQUENTIALLY(&worker_sequence_checker_);
rtp_video_stream_receiver_.StopReceive();
frame_buffer_->Stop();
@ -450,12 +450,12 @@ void VideoReceiveStream::OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) {
}
int VideoReceiveStream::id() const {
RTC_DCHECK_RUN_ON(&worker_thread_checker_);
RTC_DCHECK_CALLED_SEQUENTIALLY(&worker_sequence_checker_);
return config_.rtp.remote_ssrc;
}
rtc::Optional<Syncable::Info> VideoReceiveStream::GetInfo() const {
RTC_DCHECK_RUN_ON(&module_process_thread_checker_);
RTC_DCHECK_CALLED_SEQUENTIALLY(&module_process_sequence_checker_);
Syncable::Info info;
RtpReceiver* rtp_receiver = rtp_video_stream_receiver_.GetRtpReceiver();
@ -485,7 +485,7 @@ uint32_t VideoReceiveStream::GetPlayoutTimestamp() const {
}
void VideoReceiveStream::SetMinimumPlayoutDelay(int delay_ms) {
RTC_DCHECK_RUN_ON(&module_process_thread_checker_);
RTC_DCHECK_CALLED_SEQUENTIALLY(&module_process_sequence_checker_);
video_receiver_.SetMinimumPlayoutDelay(delay_ms);
}

6
webrtc/video/video_receive_stream.h
View File

@ -21,7 +21,7 @@
#include "webrtc/modules/rtp_rtcp/include/flexfec_receiver.h"
#include "webrtc/modules/video_coding/frame_buffer2.h"
#include "webrtc/modules/video_coding/video_coding_impl.h"
#include "webrtc/rtc_base/thread_checker.h"
#include "webrtc/rtc_base/sequenced_task_checker.h"
#include "webrtc/system_wrappers/include/clock.h"
#include "webrtc/video/receive_statistics_proxy.h"
#include "webrtc/video/rtp_streams_synchronizer.h"
@ -118,8 +118,8 @@ class VideoReceiveStream : public webrtc::VideoReceiveStream,
static void DecodeThreadFunction(void* ptr);
bool Decode();
rtc::ThreadChecker worker_thread_checker_;
rtc::ThreadChecker module_process_thread_checker_;
rtc::SequencedTaskChecker worker_sequence_checker_;
rtc::SequencedTaskChecker module_process_sequence_checker_;
TransportAdapter transport_adapter_;
const VideoReceiveStream::Config config_;