From 1b5e5db842971340eb9128985ddbaf0225a9d0b1 Mon Sep 17 00:00:00 2001 From: Magnus Jedvert Date: Thu, 23 Aug 2018 12:39:22 +0200 Subject: [PATCH] Remove SequencedTaskChecker from Y4mFileReader SequencedTaskChecker is not part of rtc_base_approved and will not work in Chromium. This CL simply removes it since it was just a precaution and is not necessary for the tool. The thread assumptions are stated in the class comment. TBR=phensman@webrtc.org Bug: webrtc:9642 Change-Id: I871ac361975595d8ed07b2e2447e3581c9ba9968 Reviewed-on: https://webrtc-review.googlesource.com/95648 Reviewed-by: Magnus Jedvert Commit-Queue: Magnus Jedvert Cr-Commit-Position: refs/heads/master@{#24401} --- rtc_tools/BUILD.gn | 1 - rtc_tools/y4m_file_reader.cc | 2 -- rtc_tools/y4m_file_reader.h | 2 -- 3 files changed, 5 deletions(-) diff --git a/rtc_tools/BUILD.gn b/rtc_tools/BUILD.gn index f6b03daed5..e707bfca16 100644 --- a/rtc_tools/BUILD.gn +++ b/rtc_tools/BUILD.gn @@ -69,7 +69,6 @@ rtc_static_library("y4m_file_reader") { "../api/video:video_frame", "../api/video:video_frame_i420", "../rtc_base:rtc_base_approved", - "../rtc_base:sequenced_task_checker", "//third_party/abseil-cpp/absl/types:optional", ] } diff --git a/rtc_tools/y4m_file_reader.cc b/rtc_tools/y4m_file_reader.cc index e2bc399fa8..ea8a741c65 100644 --- a/rtc_tools/y4m_file_reader.cc +++ b/rtc_tools/y4m_file_reader.cc @@ -20,7 +20,6 @@ #include "api/video/i420_buffer.h" #include "rtc_base/logging.h" #include "rtc_base/refcountedobject.h" -#include "rtc_base/sequenced_task_checker.h" #include "rtc_base/string_to_number.h" #include "rtc_base/stringencode.h" #include "rtc_base/stringutils.h" @@ -184,7 +183,6 @@ size_t Y4mFile::number_of_frames() const { rtc::scoped_refptr Y4mFile::GetFrame( size_t frame_index) const { - RTC_DCHECK_CALLED_SEQUENTIALLY(&thread_checker_); RTC_CHECK_LT(frame_index, frame_positions_.size()); fsetpos(file_, &frame_positions_[frame_index]); diff --git a/rtc_tools/y4m_file_reader.h b/rtc_tools/y4m_file_reader.h index b11beef28c..cb86c9e26b 100644 --- a/rtc_tools/y4m_file_reader.h +++ b/rtc_tools/y4m_file_reader.h @@ -17,7 +17,6 @@ #include "api/video/video_frame.h" #include "rtc_base/refcount.h" -#include "rtc_base/sequenced_task_checker.h" namespace webrtc { namespace test { @@ -89,7 +88,6 @@ class Y4mFile : public Video { const int height_; const float fps_; const std::vector frame_positions_; - const rtc::SequencedTaskChecker thread_checker_; FILE* const file_; };