7341ab8e25
Reason for revert: Breaks chrome, see https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Builder/builds/19019/steps/compile/logs/stdio Analysis: Chrome uses cricket::VideoFrame, without explicitly including webrtc/media/base/videoframe.h, and breaks when that file is no longer included by any other webrtc headers. Will reland after updating Chrome. Original issue's description: > Delete all use of cricket::VideoFrame and cricket::WebRtcVideoFrame. > > Replaced with webrtc::VideoFrame. > > TBR=mflodman@webrtc.org > BUG=webrtc:5682 > > Committed: https://crrev.com/45c8b8940042bd2574c39920804ade8343cefdba > Cr-Commit-Position: refs/heads/master@{#14885} TBR=perkj@webrtc.org,pthatcher@webrtc.org,tkchin@webrtc.org,mflodman@webrtc.org,stefan@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:5682 Review-Url: https://codereview.webrtc.org/2471783002 Cr-Commit-Position: refs/heads/master@{#14886}
55 lines
1.4 KiB
C++
55 lines
1.4 KiB
C++
/*
|
|
* Copyright 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/api/videotracksource.h"
|
|
|
|
#include <string>
|
|
|
|
namespace webrtc {
|
|
|
|
VideoTrackSource::VideoTrackSource(
|
|
rtc::VideoSourceInterface<cricket::VideoFrame>* source,
|
|
bool remote)
|
|
: source_(source), state_(kInitializing), remote_(remote) {
|
|
worker_thread_checker_.DetachFromThread();
|
|
}
|
|
|
|
void VideoTrackSource::SetState(SourceState new_state) {
|
|
if (state_ != new_state) {
|
|
state_ = new_state;
|
|
FireOnChanged();
|
|
}
|
|
}
|
|
|
|
void VideoTrackSource::OnSourceDestroyed() {
|
|
source_ = nullptr;
|
|
}
|
|
|
|
void VideoTrackSource::AddOrUpdateSink(
|
|
rtc::VideoSinkInterface<cricket::VideoFrame>* sink,
|
|
const rtc::VideoSinkWants& wants) {
|
|
RTC_DCHECK(worker_thread_checker_.CalledOnValidThread());
|
|
if (!source_) {
|
|
return;
|
|
}
|
|
source_->AddOrUpdateSink(sink, wants);
|
|
}
|
|
|
|
void VideoTrackSource::RemoveSink(
|
|
rtc::VideoSinkInterface<cricket::VideoFrame>* sink) {
|
|
RTC_DCHECK(worker_thread_checker_.CalledOnValidThread());
|
|
if (!source_) {
|
|
return;
|
|
}
|
|
source_->RemoveSink(sink);
|
|
}
|
|
|
|
} // namespace webrtc
|