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

Side by Side Diff: talk/app/webrtc/java/jni/androidvideocapturer_jni.h

Issue 1493913007: VideoCapturerAndroid, handle cvo correctly (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased Created 5 years 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2015 Google Inc. 3 * Copyright 2015 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 void Start(int width, int height, int framerate, 55 void Start(int width, int height, int framerate,
56 webrtc::AndroidVideoCapturer* capturer) override; 56 webrtc::AndroidVideoCapturer* capturer) override;
57 void Stop() override; 57 void Stop() override;
58 58
59 std::string GetSupportedFormats() override; 59 std::string GetSupportedFormats() override;
60 60
61 // Called from VideoCapturerAndroid::NativeObserver on a Java thread. 61 // Called from VideoCapturerAndroid::NativeObserver on a Java thread.
62 void OnCapturerStarted(bool success); 62 void OnCapturerStarted(bool success);
63 void OnMemoryBufferFrame(void* video_frame, int length, int width, 63 void OnMemoryBufferFrame(void* video_frame, int length, int width,
64 int height, int rotation, int64_t timestamp_ns); 64 int height, int rotation, int64_t timestamp_ns);
65 void OnTextureFrame(int width, int height, int64_t timestamp_ns, 65 void OnTextureFrame(int width, int height, int rotation, int64_t timestamp_ns,
66 const NativeHandleImpl& handle); 66 const NativeHandleImpl& handle);
67 void OnOutputFormatRequest(int width, int height, int fps); 67 void OnOutputFormatRequest(int width, int height, int fps);
68 68
69 protected: 69 protected:
70 ~AndroidVideoCapturerJni(); 70 ~AndroidVideoCapturerJni();
71 71
72 private: 72 private:
73 void ReturnBuffer(int64_t time_stamp); 73 void ReturnBuffer(int64_t time_stamp);
74 JNIEnv* jni(); 74 JNIEnv* jni();
75 75
(...skipping 28 matching lines...) Expand all
104 rtc::scoped_ptr<rtc::GuardedAsyncInvoker> invoker_ GUARDED_BY(capturer_lock_); 104 rtc::scoped_ptr<rtc::GuardedAsyncInvoker> invoker_ GUARDED_BY(capturer_lock_);
105 105
106 static jobject application_context_; 106 static jobject application_context_;
107 107
108 RTC_DISALLOW_COPY_AND_ASSIGN(AndroidVideoCapturerJni); 108 RTC_DISALLOW_COPY_AND_ASSIGN(AndroidVideoCapturerJni);
109 }; 109 };
110 110
111 } // namespace webrtc_jni 111 } // namespace webrtc_jni
112 112
113 #endif // TALK_APP_WEBRTC_JAVA_JNI_ANDROIDVIDEOCAPTURER_JNI_H_ 113 #endif // TALK_APP_WEBRTC_JAVA_JNI_ANDROIDVIDEOCAPTURER_JNI_H_
OLDNEW
« no previous file with comments | « talk/app/webrtc/java/jni/androidmediaencoder_jni.cc ('k') | talk/app/webrtc/java/jni/androidvideocapturer_jni.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698