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

Side by Side Diff: talk/app/webrtc/videotrackrenderers.cc

Issue 1575223003: Added mute logic to VideoTrackRenderers. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 11 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2012 Google Inc. 3 * Copyright 2012 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
11 * this list of conditions and the following disclaimer in the documentation 11 * this list of conditions and the following disclaimer in the documentation
12 * and/or other materials provided with the distribution. 12 * and/or other materials provided with the distribution.
13 * 3. The name of the author may not be used to endorse or promote products 13 * 3. The name of the author may not be used to endorse or promote products
14 * derived from this software without specific prior written permission. 14 * derived from this software without specific prior written permission.
15 * 15 *
16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO 18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28 #include "talk/app/webrtc/videotrackrenderers.h" 28 #include "talk/app/webrtc/videotrackrenderers.h"
29 #include "talk/media/base/videoframe.h" 29 #include "talk/media/webrtc/webrtcvideoframe.h"
30 30
31 namespace webrtc { 31 namespace webrtc {
32 32
33 VideoTrackRenderers::VideoTrackRenderers() : enabled_(true) { 33 VideoTrackRenderers::VideoTrackRenderers() : enabled_(true) {
34 } 34 }
35 35
36 VideoTrackRenderers::~VideoTrackRenderers() { 36 VideoTrackRenderers::~VideoTrackRenderers() {
37 } 37 }
38 38
39 void VideoTrackRenderers::AddRenderer(VideoRendererInterface* renderer) { 39 void VideoTrackRenderers::AddRenderer(VideoRendererInterface* renderer) {
40 if (!renderer) { 40 if (!renderer) {
41 return; 41 return;
42 } 42 }
43 rtc::CritScope cs(&critical_section_); 43 rtc::CritScope cs(&critical_section_);
44 renderers_.insert(renderer); 44 renderers_.insert(renderer);
45 } 45 }
46 46
47 void VideoTrackRenderers::RemoveRenderer(VideoRendererInterface* renderer) { 47 void VideoTrackRenderers::RemoveRenderer(VideoRendererInterface* renderer) {
48 rtc::CritScope cs(&critical_section_); 48 rtc::CritScope cs(&critical_section_);
49 renderers_.erase(renderer); 49 renderers_.erase(renderer);
50 } 50 }
51 51
52 void VideoTrackRenderers::SetEnabled(bool enable) { 52 void VideoTrackRenderers::SetEnabled(bool enable) {
53 rtc::CritScope cs(&critical_section_); 53 rtc::CritScope cs(&critical_section_);
54 enabled_ = enable; 54 enabled_ = enable;
55 } 55 }
56 56
57 // Create a black frame, with the same size, timestamp and rotation.
58 static cricket::VideoFrame* CreateBlackFrame(const cricket::VideoFrame* frame) {
perkj_webrtc 2016/01/13 09:44:40 static methods should be at the top of the file. A
59 cricket::VideoFrame* black = new cricket::WebRtcVideoFrame(
perkj_webrtc 2016/01/13 09:44:40 This looks like a memory leak. Ownership is not tr
nisse-webrtc 2016/01/13 10:33:16 The VideoFrameBuffer is reference counted, but I h
60 new rtc::RefCountedObject<I420Buffer>(frame->GetWidth(),
61 frame->GetHeight()),
62 frame->GetTimeStamp(), frame->GetVideoRotation());
63 black->SetToBlack();
64 return black;
65 }
66
57 bool VideoTrackRenderers::RenderFrame(const cricket::VideoFrame* frame) { 67 bool VideoTrackRenderers::RenderFrame(const cricket::VideoFrame* frame) {
58 rtc::CritScope cs(&critical_section_); 68 rtc::CritScope cs(&critical_section_);
59 if (!enabled_) { 69 if (!enabled_)
60 return true; 70 frame = CreateBlackFrame(frame);
61 } 71
62 for (VideoRendererInterface* renderer : renderers_) { 72 for (VideoRendererInterface* renderer : renderers_) {
63 renderer->RenderFrame(frame); 73 renderer->RenderFrame(frame);
64 } 74 }
65 return true; 75 return true;
66 } 76 }
67 77
68 } // namespace webrtc 78 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698