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

Unified Diff: talk/app/webrtc/videotrackrenderers.cc

Issue 1610243002: Move talk/app/webrtc to webrtc/api (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Removed processing of api.gyp for Chromium builds 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 | « talk/app/webrtc/videotrackrenderers.h ('k') | talk/app/webrtc/webrtcsdp.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: talk/app/webrtc/videotrackrenderers.cc
diff --git a/talk/app/webrtc/videotrackrenderers.cc b/talk/app/webrtc/videotrackrenderers.cc
deleted file mode 100644
index 81f6530c1f801965d5480080dc547f618710f3a9..0000000000000000000000000000000000000000
--- a/talk/app/webrtc/videotrackrenderers.cc
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * libjingle
- * Copyright 2012 Google Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
- * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "talk/app/webrtc/videotrackrenderers.h"
-#include "webrtc/media/webrtc/webrtcvideoframe.h"
-
-namespace webrtc {
-
-VideoTrackRenderers::VideoTrackRenderers() : enabled_(true) {
-}
-
-VideoTrackRenderers::~VideoTrackRenderers() {
-}
-
-void VideoTrackRenderers::AddRenderer(VideoRendererInterface* renderer) {
- if (!renderer) {
- return;
- }
- rtc::CritScope cs(&critical_section_);
- renderers_.insert(renderer);
-}
-
-void VideoTrackRenderers::RemoveRenderer(VideoRendererInterface* renderer) {
- rtc::CritScope cs(&critical_section_);
- renderers_.erase(renderer);
-}
-
-void VideoTrackRenderers::SetEnabled(bool enable) {
- rtc::CritScope cs(&critical_section_);
- enabled_ = enable;
-}
-
-bool VideoTrackRenderers::RenderFrame(const cricket::VideoFrame* frame) {
- {
- rtc::CritScope cs(&critical_section_);
- if (enabled_) {
- RenderFrameToRenderers(frame);
- return true;
- }
- }
-
- // Generate the black frame outside of the critical section. Note
- // that this may result in unexpected frame order, in the unlikely
- // case that RenderFrame is called from multiple threads without
- // proper serialization, and the track is switched from disabled to
- // enabled in the middle of the first call.
- cricket::WebRtcVideoFrame black(new rtc::RefCountedObject<I420Buffer>(
- static_cast<int>(frame->GetWidth()),
- static_cast<int>(frame->GetHeight())),
- frame->GetTimeStamp(),
- frame->GetVideoRotation());
- black.SetToBlack();
-
- {
- rtc::CritScope cs(&critical_section_);
- // Check enabled_ flag again, since the track might have been
- // enabled while we generated the black frame. I think the
- // enabled-ness ought to be applied at the track output, and hence
- // an enabled track shouldn't send any blacked out frames.
- RenderFrameToRenderers(enabled_ ? frame : &black);
-
- return true;
- }
-}
-
-// Called with critical_section_ already locked
-void VideoTrackRenderers::RenderFrameToRenderers(
- const cricket::VideoFrame* frame) {
- for (VideoRendererInterface* renderer : renderers_) {
- renderer->RenderFrame(frame);
- }
-}
-
-} // namespace webrtc
« no previous file with comments | « talk/app/webrtc/videotrackrenderers.h ('k') | talk/app/webrtc/webrtcsdp.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698