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

Remove a thread checker for a decoder thread from IncomingVideoStream.

Browse Source 
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}
This commit is contained in:
Tommi 2016-06-27 09:54:45 +02:00
parent 56c0b20490
commit 7893e9a267
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
webrtc/common_video/include/incoming_video_stream.h
View File

@ -42,7 +42,6 @@ class IncomingVideoStream : public rtc::VideoSinkInterface<VideoFrame> {
rtc::ThreadChecker main_thread_checker_;
rtc::ThreadChecker render_thread_checker_;
rtc::ThreadChecker decoder_thread_checker_;
rtc::CriticalSection buffer_critsect_;
rtc::PlatformThread incoming_render_thread_;

4
webrtc/common_video/incoming_video_stream.cc
View File

@ -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_);