Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(118)

Unified Diff: webrtc/media/base/videobroadcaster.cc

Issue 1973873003: Delete AndroidVideoCapturer::FrameFactory. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Address nits. Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/media/base/videobroadcaster.cc
diff --git a/webrtc/media/base/videobroadcaster.cc b/webrtc/media/base/videobroadcaster.cc
index 18c38b731d197316c52203a4d72eec217691ab31..5b084484b1336e8c8052973ac981d8251eb5feed 100644
--- a/webrtc/media/base/videobroadcaster.cc
+++ b/webrtc/media/base/videobroadcaster.cc
@@ -16,14 +16,9 @@
namespace rtc {
-VideoBroadcaster::VideoBroadcaster() {
- thread_checker_.DetachFromThread();
-}
-
void VideoBroadcaster::AddOrUpdateSink(
VideoSinkInterface<cricket::VideoFrame>* sink,
const VideoSinkWants& wants) {
- RTC_DCHECK(thread_checker_.CalledOnValidThread());
RTC_DCHECK(sink != nullptr);
rtc::CritScope cs(&sinks_and_wants_lock_);
VideoSourceBase::AddOrUpdateSink(sink, wants);
@@ -32,7 +27,6 @@ void VideoBroadcaster::AddOrUpdateSink(
void VideoBroadcaster::RemoveSink(
VideoSinkInterface<cricket::VideoFrame>* sink) {
- RTC_DCHECK(thread_checker_.CalledOnValidThread());
RTC_DCHECK(sink != nullptr);
rtc::CritScope cs(&sinks_and_wants_lock_);
VideoSourceBase::RemoveSink(sink);
@@ -40,13 +34,11 @@ void VideoBroadcaster::RemoveSink(
}
bool VideoBroadcaster::frame_wanted() const {
- RTC_DCHECK(thread_checker_.CalledOnValidThread());
rtc::CritScope cs(&sinks_and_wants_lock_);
return !sink_pairs().empty();
}
VideoSinkWants VideoBroadcaster::wants() const {
- RTC_DCHECK(thread_checker_.CalledOnValidThread());
rtc::CritScope cs(&sinks_and_wants_lock_);
return current_wants_;
}
@@ -63,8 +55,6 @@ void VideoBroadcaster::OnFrame(const cricket::VideoFrame& frame) {
}
void VideoBroadcaster::UpdateWants() {
- RTC_DCHECK(thread_checker_.CalledOnValidThread());
-
VideoSinkWants wants;
wants.rotation_applied = false;
for (auto& sink : sink_pairs()) {

Powered by Google App Engine
This is Rietveld 408576698