| Index: webrtc/media/base/videobroadcaster.cc
|
| diff --git a/webrtc/media/base/videobroadcaster.cc b/webrtc/media/base/videobroadcaster.cc
|
| index 6d6ffa747c74fa212c97fa2639d5b591b65021d8..653829639c47cafd4960aa8dfb2e18e2bd46e17e 100644
|
| --- a/webrtc/media/base/videobroadcaster.cc
|
| +++ b/webrtc/media/base/videobroadcaster.cc
|
| @@ -22,7 +22,7 @@
|
| }
|
|
|
| void VideoBroadcaster::AddOrUpdateSink(
|
| - VideoSinkInterface<webrtc::VideoFrame>* sink,
|
| + VideoSinkInterface<cricket::VideoFrame>* sink,
|
| const VideoSinkWants& wants) {
|
| RTC_DCHECK(thread_checker_.CalledOnValidThread());
|
| RTC_DCHECK(sink != nullptr);
|
| @@ -32,7 +32,7 @@
|
| }
|
|
|
| void VideoBroadcaster::RemoveSink(
|
| - VideoSinkInterface<webrtc::VideoFrame>* sink) {
|
| + VideoSinkInterface<cricket::VideoFrame>* sink) {
|
| RTC_DCHECK(thread_checker_.CalledOnValidThread());
|
| RTC_DCHECK(sink != nullptr);
|
| rtc::CritScope cs(&sinks_and_wants_lock_);
|
| @@ -50,7 +50,7 @@
|
| return current_wants_;
|
| }
|
|
|
| -void VideoBroadcaster::OnFrame(const webrtc::VideoFrame& frame) {
|
| +void VideoBroadcaster::OnFrame(const cricket::VideoFrame& frame) {
|
| rtc::CritScope cs(&sinks_and_wants_lock_);
|
| for (auto& sink_pair : sink_pairs()) {
|
| if (sink_pair.wants.rotation_applied &&
|
| @@ -63,7 +63,7 @@
|
| continue;
|
| }
|
| if (sink_pair.wants.black_frames) {
|
| - sink_pair.sink->OnFrame(webrtc::VideoFrame(
|
| + sink_pair.sink->OnFrame(cricket::WebRtcVideoFrame(
|
| GetBlackFrameBuffer(frame.width(), frame.height()), frame.rotation(),
|
| frame.timestamp_us()));
|
| } else {
|
|
|