From 8fd93d4d96aa939a1439c581bee6c099031668ef Mon Sep 17 00:00:00 2001 From: "wu@webrtc.org" Date: Wed, 19 Oct 2011 00:16:36 +0000 Subject: [PATCH] Move DeliverCapturedFrame from private to protected. Review URL: http://webrtc-codereview.appspot.com/246001 git-svn-id: http://webrtc.googlecode.com/svn/trunk@765 4adac7df-926f-26a2-2b94-8c16560cd09d --- src/modules/video_capture/main/source/video_capture_impl.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/video_capture/main/source/video_capture_impl.h b/src/modules/video_capture/main/source/video_capture_impl.h index b751a77a1..454c4e05d 100644 --- a/src/modules/video_capture/main/source/video_capture_impl.h +++ b/src/modules/video_capture/main/source/video_capture_impl.h @@ -115,6 +115,9 @@ public: protected: VideoCaptureImpl(const WebRtc_Word32 id); virtual ~VideoCaptureImpl(); + WebRtc_Word32 DeliverCapturedFrame( + VideoFrame& captureFrame, WebRtc_Word32 width, WebRtc_Word32 height, + WebRtc_Word64 capture_time, VideoCodecType codec_type); WebRtc_Word32 _id; // Module ID WebRtc_UWord8* _deviceUniqueId; // current Device unique name; @@ -124,9 +127,6 @@ protected: private: void UpdateFrameCount(); WebRtc_UWord32 CalculateFrameRate(const TickTime& now); - WebRtc_Word32 DeliverCapturedFrame( - VideoFrame& captureFrame, WebRtc_Word32 width, WebRtc_Word32 height, - WebRtc_Word64 capture_time, VideoCodecType codec_type); CriticalSectionWrapper& _callBackCs;