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

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

Issue 1687273002: Revert of Make cricket::VideoCapturer implement VideoSourceInterface (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 10 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
« no previous file with comments | « webrtc/media/base/videobroadcaster.h ('k') | webrtc/media/base/videocapturer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/media/base/videobroadcaster.cc
diff --git a/webrtc/media/base/videobroadcaster.cc b/webrtc/media/base/videobroadcaster.cc
deleted file mode 100644
index e369ee07c632480404080415271572d593c87f06..0000000000000000000000000000000000000000
--- a/webrtc/media/base/videobroadcaster.cc
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-#include "webrtc/media/base/videobroadcaster.h"
-
-#include "webrtc/base/checks.h"
-
-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);
-
- SinkPair* sink_pair = FindSinkPair(sink);
- if (!sink_pair) {
- sinks_.push_back(SinkPair(sink, wants));
- } else {
- sink_pair->wants = wants;
- }
-
- // Rotation must be applied by the source if one sink wants it.
- current_wants_.rotation_applied = false;
- for (auto& sink_pair : sinks_) {
- current_wants_.rotation_applied |= sink_pair.wants.rotation_applied;
- }
-}
-
-void VideoBroadcaster::RemoveSink(
- VideoSinkInterface<cricket::VideoFrame>* sink) {
- RTC_DCHECK(thread_checker_.CalledOnValidThread());
- RTC_DCHECK(sink != nullptr);
- RTC_DCHECK(FindSinkPair(sink));
-
- sinks_.erase(std::remove_if(sinks_.begin(), sinks_.end(),
- [sink](const SinkPair& sink_pair) {
- return sink_pair.sink == sink;
- }),
- sinks_.end());
-}
-
-bool VideoBroadcaster::frame_wanted() const {
- RTC_DCHECK(thread_checker_.CalledOnValidThread());
- return !sinks_.empty();
-}
-
-VideoSinkWants VideoBroadcaster::wants() const {
- RTC_DCHECK(thread_checker_.CalledOnValidThread());
- return current_wants_;
-}
-
-void VideoBroadcaster::OnFrame(const cricket::VideoFrame& frame) {
- RTC_DCHECK(thread_checker_.CalledOnValidThread());
- for (auto& sink_pair : sinks_) {
- sink_pair.sink->OnFrame(frame);
- }
-}
-
-VideoBroadcaster::SinkPair* VideoBroadcaster::FindSinkPair(
- const VideoSinkInterface<cricket::VideoFrame>* sink) {
- auto sink_pair_it = std::find_if(
- sinks_.begin(), sinks_.end(),
- [sink](const SinkPair& sink_pair) { return sink_pair.sink == sink; });
- if (sink_pair_it != sinks_.end()) {
- return &*sink_pair_it;
- }
- return nullptr;
-}
-
-} // namespace rtc
« no previous file with comments | « webrtc/media/base/videobroadcaster.h ('k') | webrtc/media/base/videocapturer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698