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

Side by Side Diff: webrtc/api/videotracksource.cc

Issue 2487633002: Reland of Delete all use of cricket::VideoFrame and cricket::WebRtcVideoFrame. (Closed)
Patch Set: Rebase, and update rtcstatscollector_unittest.cc. 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/api/videotracksource.h ('k') | webrtc/examples/peerconnection/client/linux/main_wnd.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 2016 The WebRTC project authors. All Rights Reserved. 2 * Copyright 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/api/videotracksource.h" 11 #include "webrtc/api/videotracksource.h"
12 12
13 #include <string> 13 #include <string>
14 14
15 namespace webrtc { 15 namespace webrtc {
16 16
17 VideoTrackSource::VideoTrackSource( 17 VideoTrackSource::VideoTrackSource(
18 rtc::VideoSourceInterface<cricket::VideoFrame>* source, 18 rtc::VideoSourceInterface<VideoFrame>* source,
19 bool remote) 19 bool remote)
20 : source_(source), state_(kInitializing), remote_(remote) { 20 : source_(source), state_(kInitializing), remote_(remote) {
21 worker_thread_checker_.DetachFromThread(); 21 worker_thread_checker_.DetachFromThread();
22 } 22 }
23 23
24 void VideoTrackSource::SetState(SourceState new_state) { 24 void VideoTrackSource::SetState(SourceState new_state) {
25 if (state_ != new_state) { 25 if (state_ != new_state) {
26 state_ = new_state; 26 state_ = new_state;
27 FireOnChanged(); 27 FireOnChanged();
28 } 28 }
29 } 29 }
30 30
31 void VideoTrackSource::OnSourceDestroyed() { 31 void VideoTrackSource::OnSourceDestroyed() {
32 source_ = nullptr; 32 source_ = nullptr;
33 } 33 }
34 34
35 void VideoTrackSource::AddOrUpdateSink( 35 void VideoTrackSource::AddOrUpdateSink(
36 rtc::VideoSinkInterface<cricket::VideoFrame>* sink, 36 rtc::VideoSinkInterface<VideoFrame>* sink,
37 const rtc::VideoSinkWants& wants) { 37 const rtc::VideoSinkWants& wants) {
38 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); 38 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread());
39 if (!source_) { 39 if (!source_) {
40 return; 40 return;
41 } 41 }
42 source_->AddOrUpdateSink(sink, wants); 42 source_->AddOrUpdateSink(sink, wants);
43 } 43 }
44 44
45 void VideoTrackSource::RemoveSink( 45 void VideoTrackSource::RemoveSink(rtc::VideoSinkInterface<VideoFrame>* sink) {
46 rtc::VideoSinkInterface<cricket::VideoFrame>* sink) {
47 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); 46 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread());
48 if (!source_) { 47 if (!source_) {
49 return; 48 return;
50 } 49 }
51 source_->RemoveSink(sink); 50 source_->RemoveSink(sink);
52 } 51 }
53 52
54 } // namespace webrtc 53 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/api/videotracksource.h ('k') | webrtc/examples/peerconnection/client/linux/main_wnd.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698