From 7893e9a267769940d6fd4276196208ee91d7afbf Mon Sep 17 00:00:00 2001 From: Tommi Date: Mon, 27 Jun 2016 09:54:45 +0200 Subject: [PATCH] Remove a thread checker for a decoder thread from IncomingVideoStream. The specific decoder thread may vary when using VideoToolbox. BUG=webrtc:6051 TBR=pbos@webrtc.org Review URL: https://codereview.webrtc.org/2100083002 . Cr-Commit-Position: refs/heads/master@{#13292} --- webrtc/common_video/include/incoming_video_stream.h | 1 - webrtc/common_video/incoming_video_stream.cc | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/webrtc/common_video/include/incoming_video_stream.h b/webrtc/common_video/include/incoming_video_stream.h index b551d4575a..a23ac05e9d 100644 --- a/webrtc/common_video/include/incoming_video_stream.h +++ b/webrtc/common_video/include/incoming_video_stream.h @@ -42,7 +42,6 @@ class IncomingVideoStream : public rtc::VideoSinkInterface { rtc::ThreadChecker main_thread_checker_; rtc::ThreadChecker render_thread_checker_; - rtc::ThreadChecker decoder_thread_checker_; rtc::CriticalSection buffer_critsect_; rtc::PlatformThread incoming_render_thread_; diff --git a/webrtc/common_video/incoming_video_stream.cc b/webrtc/common_video/incoming_video_stream.cc index 8deca0fc83..f5a52fcba3 100644 --- a/webrtc/common_video/incoming_video_stream.cc +++ b/webrtc/common_video/incoming_video_stream.cc @@ -29,7 +29,6 @@ IncomingVideoStream::IncomingVideoStream( RTC_DCHECK(external_callback_); render_thread_checker_.DetachFromThread(); - decoder_thread_checker_.DetachFromThread(); incoming_render_thread_.Start(); incoming_render_thread_.SetPriority(rtc::kRealtimePriority); @@ -50,7 +49,8 @@ IncomingVideoStream::~IncomingVideoStream() { } void IncomingVideoStream::OnFrame(const VideoFrame& video_frame) { - RTC_DCHECK_RUN_ON(&decoder_thread_checker_); + // Most of the time we'll be on a decoder thread here, but when using + // VideoToolbox on iOS, we'll get called on a thread from a thread pool. // Hand over or insert frame. rtc::CritScope csB(&buffer_critsect_);