Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(575)

Unified Diff: webrtc/api/androidvideocapturer.h

Issue 1973873003: Delete AndroidVideoCapturer::FrameFactory. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Move code to AndroidVideoCapturerJni. Make Matrix a class. Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | webrtc/api/androidvideocapturer.cc » ('j') | webrtc/api/java/jni/androidvideocapturer_jni.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_;
};
« no previous file with comments | « no previous file | webrtc/api/androidvideocapturer.cc » ('j') | webrtc/api/java/jni/androidvideocapturer_jni.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698