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

Unified Diff: webrtc/sdk/android/src/jni/pc/sdpobserver_jni.h

Issue 2989323002: Revert of Break peerconnection_jni.cc into multiple files, in "pc" directory. (Closed)
Patch Set: Created 3 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/sdk/android/src/jni/pc/rtpsender_jni.cc ('k') | webrtc/sdk/android/src/jni/pc/statsobserver_jni.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/sdk/android/src/jni/pc/sdpobserver_jni.h
diff --git a/webrtc/sdk/android/src/jni/pc/sdpobserver_jni.h b/webrtc/sdk/android/src/jni/pc/sdpobserver_jni.h
deleted file mode 100644
index 0113954065c9df82c278231a90b4694f3fc350aa..0000000000000000000000000000000000000000
--- a/webrtc/sdk/android/src/jni/pc/sdpobserver_jni.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright 2017 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 WEBRTC_SDK_ANDROID_SRC_JNI_PC_SDPOBSERVER_JNI_H_
-#define WEBRTC_SDK_ANDROID_SRC_JNI_PC_SDPOBSERVER_JNI_H_
-
-#include <memory>
-#include <string>
-
-#include "webrtc/api/peerconnectioninterface.h"
-#include "webrtc/sdk/android/src/jni/jni_helpers.h"
-#include "webrtc/sdk/android/src/jni/pc/mediaconstraints_jni.h"
-
-namespace webrtc_jni {
-
-// Adapter for a Java StatsObserver presenting a C++
-// CreateSessionDescriptionObserver or SetSessionDescriptionObserver and
-// dispatching the callback from C++ back to Java.
-template <class T> // T is one of {Create,Set}SessionDescriptionObserver.
-class SdpObserverJni : public T {
- public:
- SdpObserverJni(JNIEnv* jni,
- jobject j_observer,
- MediaConstraintsJni* constraints)
- : constraints_(constraints),
- j_observer_global_(jni, j_observer),
- j_observer_class_(jni, GetObjectClass(jni, j_observer)) {}
-
- virtual ~SdpObserverJni() {}
-
- // Can't mark override because of templating.
- virtual void OnSuccess() {
- ScopedLocalRefFrame local_ref_frame(jni());
- jmethodID m = GetMethodID(jni(), *j_observer_class_, "onSetSuccess", "()V");
- jni()->CallVoidMethod(*j_observer_global_, m);
- CHECK_EXCEPTION(jni()) << "error during CallVoidMethod";
- }
-
- // Can't mark override because of templating.
- virtual void OnSuccess(webrtc::SessionDescriptionInterface* desc) {
- ScopedLocalRefFrame local_ref_frame(jni());
- jmethodID m = GetMethodID(jni(), *j_observer_class_, "onCreateSuccess",
- "(Lorg/webrtc/SessionDescription;)V");
- jobject j_sdp = NativeToJavaSessionDescription(jni(), desc);
- jni()->CallVoidMethod(*j_observer_global_, m, j_sdp);
- CHECK_EXCEPTION(jni()) << "error during CallVoidMethod";
- // OnSuccess transfers ownership of the description (there's a TODO to make
- // it use unique_ptr...).
- delete desc;
- }
-
- protected:
- // Common implementation for failure of Set & Create types, distinguished by
- // |op| being "Set" or "Create".
- void DoOnFailure(const std::string& op, const std::string& error) {
- jmethodID m = GetMethodID(jni(), *j_observer_class_, "on" + op + "Failure",
- "(Ljava/lang/String;)V");
- jstring j_error_string = JavaStringFromStdString(jni(), error);
- jni()->CallVoidMethod(*j_observer_global_, m, j_error_string);
- CHECK_EXCEPTION(jni()) << "error during CallVoidMethod";
- }
-
- JNIEnv* jni() { return AttachCurrentThreadIfNeeded(); }
-
- private:
- std::unique_ptr<MediaConstraintsJni> constraints_;
- const ScopedGlobalRef<jobject> j_observer_global_;
- const ScopedGlobalRef<jclass> j_observer_class_;
-};
-
-class CreateSdpObserverJni
- : public SdpObserverJni<webrtc::CreateSessionDescriptionObserver> {
- public:
- CreateSdpObserverJni(JNIEnv* jni,
- jobject j_observer,
- MediaConstraintsJni* constraints)
- : SdpObserverJni(jni, j_observer, constraints) {}
-
- void OnFailure(const std::string& error) override {
- ScopedLocalRefFrame local_ref_frame(jni());
- SdpObserverJni::DoOnFailure(std::string("Create"), error);
- }
-};
-
-class SetSdpObserverJni
- : public SdpObserverJni<webrtc::SetSessionDescriptionObserver> {
- public:
- SetSdpObserverJni(JNIEnv* jni,
- jobject j_observer,
- MediaConstraintsJni* constraints)
- : SdpObserverJni(jni, j_observer, constraints) {}
-
- void OnFailure(const std::string& error) override {
- ScopedLocalRefFrame local_ref_frame(jni());
- SdpObserverJni::DoOnFailure(std::string("Set"), error);
- }
-};
-
-} // namespace webrtc_jni
-
-#endif // WEBRTC_SDK_ANDROID_SRC_JNI_PC_SDPOBSERVER_JNI_H_
« no previous file with comments | « webrtc/sdk/android/src/jni/pc/rtpsender_jni.cc ('k') | webrtc/sdk/android/src/jni/pc/statsobserver_jni.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698