webrtc/examples/androidnativeapi/jni/android_call_client.h
Mirko Bonadei 96ea8c00e7 Roll chromium_revision 67eba1f62b..3c3851d3ca (681379:681486) + JNI fix
Change log: 67eba1f62b..3c3851d3ca
Full diff: 67eba1f62b..3c3851d3ca

This CL also includes all the required updates to remove the jcaller
object from the parameter list of methods that don't need it.

Changed dependencies
* src/base: a0992bdcd3..4ee11af5ff
* src/build: e36ae524d9..4ae7e91430
* src/ios: a87556eeec..429f84ccae
* src/testing: f391f81ac8..313b861b55
* src/third_party: dc1d83593b..dc539d589f
* src/third_party/depot_tools: e3614ad6f5..c10743f873
* src/tools: 97c481e2cf..b74bc013c1
DEPS diff: 67eba1f62b..3c3851d3ca/DEPS

No update to Clang.

TBR=chromium-webrtc-autoroll@webrtc-ci.iam.gserviceaccount.com,
BUG=None

No-Try: True
Change-Id: I284a086d320c2df7a33152098a196f5af813375a
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/147261
Reviewed-by: Oleh Prypin <oprypin@webrtc.org>
Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28698}
2019-07-29 14:08:49 +00:00

76 lines
2.5 KiB
C++

/*
* Copyright 2018 The WebRTC Project Authors. All rights reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
* tree. An additional intellectual property rights grant can be found
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef EXAMPLES_ANDROIDNATIVEAPI_JNI_ANDROID_CALL_CLIENT_H_
#define EXAMPLES_ANDROIDNATIVEAPI_JNI_ANDROID_CALL_CLIENT_H_
#include <jni.h>
#include <memory>
#include <string>
#include "api/peer_connection_interface.h"
#include "api/scoped_refptr.h"
#include "rtc_base/critical_section.h"
#include "rtc_base/thread_checker.h"
#include "sdk/android/native_api/jni/scoped_java_ref.h"
#include "sdk/android/native_api/video/video_source.h"
namespace webrtc_examples {
class AndroidCallClient {
public:
AndroidCallClient();
~AndroidCallClient();
void Call(JNIEnv* env,
const webrtc::JavaRef<jobject>& local_sink,
const webrtc::JavaRef<jobject>& remote_sink);
void Hangup(JNIEnv* env);
// A helper method for Java code to delete this object. Calls delete this.
void Delete(JNIEnv* env);
webrtc::ScopedJavaLocalRef<jobject> GetJavaVideoCapturerObserver(JNIEnv* env);
private:
class PCObserver;
void CreatePeerConnectionFactory() RTC_RUN_ON(thread_checker_);
void CreatePeerConnection() RTC_RUN_ON(thread_checker_);
void Connect() RTC_RUN_ON(thread_checker_);
rtc::ThreadChecker thread_checker_;
bool call_started_ RTC_GUARDED_BY(thread_checker_);
const std::unique_ptr<PCObserver> pc_observer_;
rtc::scoped_refptr<webrtc::PeerConnectionFactoryInterface> pcf_
RTC_GUARDED_BY(thread_checker_);
std::unique_ptr<rtc::Thread> network_thread_ RTC_GUARDED_BY(thread_checker_);
std::unique_ptr<rtc::Thread> worker_thread_ RTC_GUARDED_BY(thread_checker_);
std::unique_ptr<rtc::Thread> signaling_thread_
RTC_GUARDED_BY(thread_checker_);
std::unique_ptr<rtc::VideoSinkInterface<webrtc::VideoFrame>> local_sink_
RTC_GUARDED_BY(thread_checker_);
std::unique_ptr<rtc::VideoSinkInterface<webrtc::VideoFrame>> remote_sink_
RTC_GUARDED_BY(thread_checker_);
rtc::scoped_refptr<webrtc::JavaVideoTrackSourceInterface> video_source_
RTC_GUARDED_BY(thread_checker_);
rtc::CriticalSection pc_mutex_;
rtc::scoped_refptr<webrtc::PeerConnectionInterface> pc_
RTC_GUARDED_BY(pc_mutex_);
};
} // namespace webrtc_examples
#endif // EXAMPLES_ANDROIDNATIVEAPI_JNI_ANDROID_CALL_CLIENT_H_