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

Side by Side Diff: webrtc/media/base/videosourcebase.cc

Issue 2471783002: Revert of Delete all use of cricket::VideoFrame and cricket::WebRtcVideoFrame. (Closed)
Patch Set: Created 4 years, 1 month 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 | « webrtc/media/base/videosourcebase.h ('k') | webrtc/media/devices/gtkvideorenderer.h » ('j') | 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 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #include "webrtc/media/base/videosourcebase.h" 11 #include "webrtc/media/base/videosourcebase.h"
12 12
13 #include "webrtc/base/checks.h" 13 #include "webrtc/base/checks.h"
14 14
15 namespace rtc { 15 namespace rtc {
16 16
17 VideoSourceBase::VideoSourceBase() { 17 VideoSourceBase::VideoSourceBase() {
18 thread_checker_.DetachFromThread(); 18 thread_checker_.DetachFromThread();
19 } 19 }
20 20
21 void VideoSourceBase::AddOrUpdateSink( 21 void VideoSourceBase::AddOrUpdateSink(
22 VideoSinkInterface<webrtc::VideoFrame>* sink, 22 VideoSinkInterface<cricket::VideoFrame>* sink,
23 const VideoSinkWants& wants) { 23 const VideoSinkWants& wants) {
24 RTC_DCHECK(thread_checker_.CalledOnValidThread()); 24 RTC_DCHECK(thread_checker_.CalledOnValidThread());
25 RTC_DCHECK(sink != nullptr); 25 RTC_DCHECK(sink != nullptr);
26 26
27 SinkPair* sink_pair = FindSinkPair(sink); 27 SinkPair* sink_pair = FindSinkPair(sink);
28 if (!sink_pair) { 28 if (!sink_pair) {
29 sinks_.push_back(SinkPair(sink, wants)); 29 sinks_.push_back(SinkPair(sink, wants));
30 } else { 30 } else {
31 sink_pair->wants = wants; 31 sink_pair->wants = wants;
32 } 32 }
33 } 33 }
34 34
35 void VideoSourceBase::RemoveSink(VideoSinkInterface<webrtc::VideoFrame>* sink) { 35 void VideoSourceBase::RemoveSink(
36 VideoSinkInterface<cricket::VideoFrame>* sink) {
36 RTC_DCHECK(thread_checker_.CalledOnValidThread()); 37 RTC_DCHECK(thread_checker_.CalledOnValidThread());
37 RTC_DCHECK(sink != nullptr); 38 RTC_DCHECK(sink != nullptr);
38 RTC_DCHECK(FindSinkPair(sink)); 39 RTC_DCHECK(FindSinkPair(sink));
39 sinks_.erase(std::remove_if(sinks_.begin(), sinks_.end(), 40 sinks_.erase(std::remove_if(sinks_.begin(), sinks_.end(),
40 [sink](const SinkPair& sink_pair) { 41 [sink](const SinkPair& sink_pair) {
41 return sink_pair.sink == sink; 42 return sink_pair.sink == sink;
42 }), 43 }),
43 sinks_.end()); 44 sinks_.end());
44 } 45 }
45 46
46 VideoSourceBase::SinkPair* VideoSourceBase::FindSinkPair( 47 VideoSourceBase::SinkPair* VideoSourceBase::FindSinkPair(
47 const VideoSinkInterface<webrtc::VideoFrame>* sink) { 48 const VideoSinkInterface<cricket::VideoFrame>* sink) {
48 RTC_DCHECK(thread_checker_.CalledOnValidThread()); 49 RTC_DCHECK(thread_checker_.CalledOnValidThread());
49 auto sink_pair_it = std::find_if( 50 auto sink_pair_it = std::find_if(
50 sinks_.begin(), sinks_.end(), 51 sinks_.begin(), sinks_.end(),
51 [sink](const SinkPair& sink_pair) { return sink_pair.sink == sink; }); 52 [sink](const SinkPair& sink_pair) { return sink_pair.sink == sink; });
52 if (sink_pair_it != sinks_.end()) { 53 if (sink_pair_it != sinks_.end()) {
53 return &*sink_pair_it; 54 return &*sink_pair_it;
54 } 55 }
55 return nullptr; 56 return nullptr;
56 } 57 }
57 58
58 } // namespace rtc 59 } // namespace rtc
OLDNEW
« no previous file with comments | « webrtc/media/base/videosourcebase.h ('k') | webrtc/media/devices/gtkvideorenderer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698