diff options
| author | wu@webrtc.org <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-03-27 17:03:58 +0000 |
|---|---|---|
| committer | wu@webrtc.org <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-03-27 17:03:58 +0000 |
| commit | c8079d8b9dab16606ba32c1950d6a5c44ccbfc8e (patch) | |
| tree | b0ee9b7d9c48adc1e383eef4c835c428e3d3d258 /media/webrtc/webrtcvideoengine.h | |
| parent | 3865f242aa057847ca2c3728d24874882ef227ee (diff) | |
| download | talk-c8079d8b9dab16606ba32c1950d6a5c44ccbfc8e.tar.gz | |
(Auto)update libjingle 63837929-> 63884381
git-svn-id: http://webrtc.googlecode.com/svn/trunk/talk@5800 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'media/webrtc/webrtcvideoengine.h')
| -rw-r--r-- | media/webrtc/webrtcvideoengine.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/media/webrtc/webrtcvideoengine.h b/media/webrtc/webrtcvideoengine.h index 1d36ab1..968d2c0 100644 --- a/media/webrtc/webrtcvideoengine.h +++ b/media/webrtc/webrtcvideoengine.h @@ -292,9 +292,7 @@ class WebRtcVideoMediaChannel : public talk_base::MessageHandler, uint32 send_ssrc() const { return 0; } bool GetRenderer(uint32 ssrc, VideoRenderer** renderer); bool GetVideoAdapter(uint32 ssrc, CoordinatedVideoAdapter** video_adapter); - void SendFrame(VideoCapturer* capturer, const VideoFrame* frame); - bool SendFrame(WebRtcVideoChannelSendInfo* channel_info, - const VideoFrame* frame, bool is_screencast); + void OnFrameFromCapturer(VideoCapturer* capturer, const VideoFrame* frame); // Thunk functions for use with HybridVideoEngine void OnLocalFrame(VideoCapturer* capturer, const VideoFrame* frame) { @@ -416,6 +414,9 @@ class WebRtcVideoMediaChannel : public talk_base::MessageHandler, // to one send channel, i.e. the last send channel. void MaybeDisconnectCapturer(VideoCapturer* capturer); + void SendFrame(VideoCapturer* capturer, const VideoFrame* frame); + bool SendFrame(WebRtcVideoChannelSendInfo* channel_info, + const VideoFrame* frame, bool is_screencast); bool RemoveRecvStreamInternal(uint32 ssrc); // Global state. |