Index: webrtc/media/engine/webrtcvideoengine2.cc |
diff --git a/webrtc/media/engine/webrtcvideoengine2.cc b/webrtc/media/engine/webrtcvideoengine2.cc |
index 3cacc7da82ba3ee32cdfa69abf271635df9ec98b..43b3b44f4be39cbc03e535a9d427982828caf6e0 100644 |
--- a/webrtc/media/engine/webrtcvideoengine2.cc |
+++ b/webrtc/media/engine/webrtcvideoengine2.cc |
@@ -524,14 +524,14 @@ UnsignalledSsrcHandler::Action DefaultUnsignalledSsrcHandler::OnUnsignalledSsrc( |
return kDeliverPacket; |
} |
-rtc::VideoSinkInterface<VideoFrame>* |
+rtc::VideoSinkInterface<webrtc::VideoFrame>* |
DefaultUnsignalledSsrcHandler::GetDefaultSink() const { |
return default_sink_; |
} |
void DefaultUnsignalledSsrcHandler::SetDefaultSink( |
VideoMediaChannel* channel, |
- rtc::VideoSinkInterface<VideoFrame>* sink) { |
+ rtc::VideoSinkInterface<webrtc::VideoFrame>* sink) { |
default_sink_ = sink; |
if (default_recv_ssrc_ != 0) { |
channel->SetSink(default_recv_ssrc_, default_sink_); |
@@ -1066,7 +1066,7 @@ bool WebRtcVideoChannel2::SetVideoSend( |
uint32_t ssrc, |
bool enable, |
const VideoOptions* options, |
- rtc::VideoSourceInterface<cricket::VideoFrame>* source) { |
+ rtc::VideoSourceInterface<webrtc::VideoFrame>* source) { |
TRACE_EVENT0("webrtc", "SetVideoSend"); |
RTC_DCHECK(ssrc != 0); |
LOG(LS_INFO) << "SetVideoSend (ssrc= " << ssrc << ", enable = " << enable |
@@ -1307,8 +1307,9 @@ bool WebRtcVideoChannel2::RemoveRecvStream(uint32_t ssrc) { |
return true; |
} |
-bool WebRtcVideoChannel2::SetSink(uint32_t ssrc, |
- rtc::VideoSinkInterface<VideoFrame>* sink) { |
+bool WebRtcVideoChannel2::SetSink( |
+ uint32_t ssrc, |
+ rtc::VideoSinkInterface<webrtc::VideoFrame>* sink) { |
LOG(LS_INFO) << "SetSink: ssrc:" << ssrc << " " |
<< (sink ? "(ptr)" : "nullptr"); |
if (ssrc == 0) { |
@@ -1598,7 +1599,7 @@ WebRtcVideoChannel2::WebRtcVideoSendStream::~WebRtcVideoSendStream() { |
} |
void WebRtcVideoChannel2::WebRtcVideoSendStream::OnFrame( |
- const VideoFrame& frame) { |
+ const webrtc::VideoFrame& frame) { |
TRACE_EVENT0("webrtc", "WebRtcVideoSendStream::OnFrame"); |
webrtc::VideoFrame video_frame(frame.video_frame_buffer(), |
frame.rotation(), |
@@ -1637,7 +1638,7 @@ void WebRtcVideoChannel2::WebRtcVideoSendStream::OnFrame( |
bool WebRtcVideoChannel2::WebRtcVideoSendStream::SetVideoSend( |
bool enable, |
const VideoOptions* options, |
- rtc::VideoSourceInterface<cricket::VideoFrame>* source) { |
+ rtc::VideoSourceInterface<webrtc::VideoFrame>* source) { |
TRACE_EVENT0("webrtc", "WebRtcVideoSendStream::SetVideoSend"); |
RTC_DCHECK_RUN_ON(&thread_checker_); |
@@ -2393,7 +2394,7 @@ bool WebRtcVideoChannel2::WebRtcVideoReceiveStream::IsDefaultStream() const { |
} |
void WebRtcVideoChannel2::WebRtcVideoReceiveStream::SetSink( |
- rtc::VideoSinkInterface<cricket::VideoFrame>* sink) { |
+ rtc::VideoSinkInterface<webrtc::VideoFrame>* sink) { |
rtc::CritScope crit(&sink_lock_); |
sink_ = sink; |
} |