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

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: fixed tests. Cleaned up 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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 void Start(int width, int height, int framerate, 53 void Start(int width, int height, int framerate,
54 webrtc::AndroidVideoCapturer* capturer) override; 54 webrtc::AndroidVideoCapturer* capturer) override;
55 void Stop() override; 55 void Stop() override;
56 56
57 std::string GetSupportedFormats() override; 57 std::string GetSupportedFormats() override;
58 58
59 // Called from VideoCapturerAndroid::NativeObserver on a Java thread. 59 // Called from VideoCapturerAndroid::NativeObserver on a Java thread.
60 void OnCapturerStarted(bool success); 60 void OnCapturerStarted(bool success);
61 void OnMemoryBufferFrame(void* video_frame, int length, int width, 61 void OnMemoryBufferFrame(void* video_frame, int length, int width,
62 int height, int rotation, int64_t timestamp_ns); 62 int height, int rotation, int64_t timestamp_ns);
63 void OnTextureFrame(int width, int height, int64_t timestamp_ns, 63 void OnTextureFrame(int width, int height, int rotation, int64_t timestamp_ns,
nisse-chromium (ooo August 14) 2015/12/08 08:46:34 The rotation has to be one of the values in webrtc
perkj_chrome 2015/12/09 21:00:40 It is the same as OnMemoryBufferFrame and is chec
nisse-chromium (ooo August 14) 2015/12/10 09:04:57 I see.
64 const NativeHandleImpl& handle); 64 const NativeHandleImpl& handle);
65 void OnOutputFormatRequest(int width, int height, int fps); 65 void OnOutputFormatRequest(int width, int height, int fps);
66 66
67 protected: 67 protected:
68 ~AndroidVideoCapturerJni(); 68 ~AndroidVideoCapturerJni();
69 69
70 private: 70 private:
71 void ReturnBuffer(int64_t time_stamp); 71 void ReturnBuffer(int64_t time_stamp);
72 JNIEnv* jni(); 72 JNIEnv* jni();
73 73
(...skipping 27 matching lines...) Expand all
101 rtc::scoped_ptr<rtc::GuardedAsyncInvoker> invoker_ GUARDED_BY(capturer_lock_); 101 rtc::scoped_ptr<rtc::GuardedAsyncInvoker> invoker_ GUARDED_BY(capturer_lock_);
102 102
103 static jobject application_context_; 103 static jobject application_context_;
104 104
105 RTC_DISALLOW_COPY_AND_ASSIGN(AndroidVideoCapturerJni); 105 RTC_DISALLOW_COPY_AND_ASSIGN(AndroidVideoCapturerJni);
106 }; 106 };
107 107
108 } // namespace webrtc_jni 108 } // namespace webrtc_jni
109 109
110 #endif // TALK_APP_WEBRTC_JAVA_JNI_ANDROIDVIDEOCAPTURER_JNI_H_ 110 #endif // TALK_APP_WEBRTC_JAVA_JNI_ANDROIDVIDEOCAPTURER_JNI_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698