Index: webrtc/api/androidvideocapturer.h |
diff --git a/webrtc/api/androidvideocapturer.h b/webrtc/api/androidvideocapturer.h |
index 4c73f3159874e76323fdee76a04702c6d575969d..bd0dd7c304bbda050f34fa67fcde72a89a1f484f 100644 |
--- a/webrtc/api/androidvideocapturer.h |
+++ b/webrtc/api/androidvideocapturer.h |
@@ -48,13 +48,6 @@ class AndroidVideoCapturer : public cricket::VideoCapturer { |
// Called from JNI when the capturer has been started. |
void OnCapturerStarted(bool success); |
- // Called from JNI when a new frame has been captured. |
- // Argument |buffer| is intentionally by value, for use with rtc::Bind. |
- void OnIncomingFrame( |
- const rtc::scoped_refptr<webrtc::VideoFrameBuffer>& buffer, |
- int rotation, |
- int64_t time_stamp); |
- |
// Called from JNI to request a new video format. |
void OnOutputFormatRequest(int width, int height, int fps); |
@@ -64,6 +57,11 @@ class AndroidVideoCapturer : public cricket::VideoCapturer { |
bool GetBestCaptureFormat(const cricket::VideoFormat& desired, |
cricket::VideoFormat* best_format) override; |
+ // Expose these protected methods as public, to be used by the |
+ // AndroidVideoCapturerJni. |
+ using VideoCapturer::AdaptFrame; |
+ using VideoCapturer::OnFrame; |
+ |
private: |
// cricket::VideoCapturer implementation. |
// Video frames will be delivered using |
@@ -80,9 +78,6 @@ class AndroidVideoCapturer : public cricket::VideoCapturer { |
rtc::ThreadChecker thread_checker_; |
- class FrameFactory; |
- FrameFactory* frame_factory_; // Owned by cricket::VideoCapturer. |
- |
cricket::CaptureState current_state_; |
}; |