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

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

Issue 1362503003: Use suffixed {uint,int}{8,16,32,64}_t types. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase + revert basictypes.h (to be landed separately just in case of a revert due to unexpected us… Created 5 years, 2 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 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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 54
55 std::string GetSupportedFormats() override; 55 std::string GetSupportedFormats() override;
56 56
57 // Called from VideoCapturerAndroid::NativeObserver on a Java thread. 57 // Called from VideoCapturerAndroid::NativeObserver on a Java thread.
58 void OnCapturerStarted(bool success); 58 void OnCapturerStarted(bool success);
59 void OnIncomingFrame(void* video_frame, 59 void OnIncomingFrame(void* video_frame,
60 int length, 60 int length,
61 int width, 61 int width,
62 int height, 62 int height,
63 int rotation, 63 int rotation,
64 int64 time_stamp); 64 int64_t time_stamp);
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 time_stamp); 71 void ReturnBuffer(int64_t time_stamp);
72 JNIEnv* jni(); 72 JNIEnv* jni();
73 73
74 // Helper function to make safe asynchronous calls to |capturer_|. The calls 74 // Helper function to make safe asynchronous calls to |capturer_|. The calls
75 // are not guaranteed to be delivered. 75 // are not guaranteed to be delivered.
76 template <typename... Args> 76 template <typename... Args>
77 void AsyncCapturerInvoke( 77 void AsyncCapturerInvoke(
78 const char* method_name, 78 const char* method_name,
79 void (webrtc::AndroidVideoCapturer::*method)(Args...), 79 void (webrtc::AndroidVideoCapturer::*method)(Args...),
80 Args... args); 80 Args... args);
81 81
(...skipping 13 matching lines...) Expand all
95 rtc::scoped_ptr<rtc::GuardedAsyncInvoker> invoker_ GUARDED_BY(capturer_lock_); 95 rtc::scoped_ptr<rtc::GuardedAsyncInvoker> invoker_ GUARDED_BY(capturer_lock_);
96 96
97 static jobject application_context_; 97 static jobject application_context_;
98 98
99 RTC_DISALLOW_COPY_AND_ASSIGN(AndroidVideoCapturerJni); 99 RTC_DISALLOW_COPY_AND_ASSIGN(AndroidVideoCapturerJni);
100 }; 100 };
101 101
102 } // namespace webrtc_jni 102 } // namespace webrtc_jni
103 103
104 #endif // TALK_APP_WEBRTC_JAVA_JNI_ANDROIDVIDEOCAPTURER_JNI_H_ 104 #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