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

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

Issue 1377783002: Revert of Android VideoCapturer: Send ByteBuffer instead of byte[] (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: 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 jstring device_name); // Name of the camera to use. 54 jstring device_name); // Name of the camera to use.
55 55
56 void Start(int width, int height, int framerate, 56 void Start(int width, int height, int framerate,
57 webrtc::AndroidVideoCapturer* capturer) override; 57 webrtc::AndroidVideoCapturer* capturer) override;
58 void Stop() override; 58 void Stop() override;
59 59
60 std::string GetSupportedFormats() override; 60 std::string GetSupportedFormats() override;
61 61
62 // Called from VideoCapturerAndroid::NativeObserver on a Java thread. 62 // Called from VideoCapturerAndroid::NativeObserver on a Java thread.
63 void OnCapturerStarted(bool success); 63 void OnCapturerStarted(bool success);
64 void OnIncomingFrame(const uint8_t* video_frame, 64 void OnIncomingFrame(void* video_frame,
65 int length, 65 int length,
66 int width, 66 int width,
67 int height, 67 int height,
68 int rotation, 68 int rotation,
69 int64 time_stamp); 69 int64 time_stamp);
70 void OnOutputFormatRequest(int width, int height, int fps); 70 void OnOutputFormatRequest(int width, int height, int fps);
71 protected: 71 protected:
72 AndroidVideoCapturerJni(JNIEnv* jni, jobject j_video_capturer); 72 AndroidVideoCapturerJni(JNIEnv* jni, jobject j_video_capturer);
73 ~AndroidVideoCapturerJni(); 73 ~AndroidVideoCapturerJni();
74 74
(...skipping 26 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