summaryrefslogtreecommitdiff
path: root/media
diff options
context:
space:
mode:
authorMoonchild <moonchild@palemoon.org>2021-03-11 06:43:10 +0000
committerMoonchild <moonchild@palemoon.org>2021-03-11 06:43:10 +0000
commitcc8a7e3f7b7d40967d2dd537b6343c87ba9138c7 (patch)
treebe5418a62494a956557ac0e769773ed2d558fdde /media
parentdce8a3300b191eeebee6f15f3f6e0f5a12a177b1 (diff)
downloaduxp-cc8a7e3f7b7d40967d2dd537b6343c87ba9138c7.tar.gz
Issue #1053 - Remove MOZ_WIDGET_ANDROID and IDB_MOBILE
Diffstat (limited to 'media')
-rwxr-xr-xmedia/webrtc/signaling/src/media-conduit/AudioConduit.cpp15
-rwxr-xr-xmedia/webrtc/signaling/src/media-conduit/VideoConduit.cpp13
2 files changed, 0 insertions, 28 deletions
diff --git a/media/webrtc/signaling/src/media-conduit/AudioConduit.cpp b/media/webrtc/signaling/src/media-conduit/AudioConduit.cpp
index e36b8b6cf4..42a50533a4 100755
--- a/media/webrtc/signaling/src/media-conduit/AudioConduit.cpp
+++ b/media/webrtc/signaling/src/media-conduit/AudioConduit.cpp
@@ -31,10 +31,6 @@
#include "webrtc/voice_engine/voice_engine_impl.h"
#include "webrtc/system_wrappers/interface/clock.h"
-#ifdef MOZ_WIDGET_ANDROID
-#include "AndroidJNIWrapper.h"
-#endif
-
namespace mozilla {
static const char* logTag ="WebrtcAudioSessionConduit";
@@ -261,17 +257,6 @@ MediaConduitErrorCode WebrtcAudioConduit::Init()
{
CSFLogDebug(logTag, "%s this=%p", __FUNCTION__, this);
-#ifdef MOZ_WIDGET_ANDROID
- jobject context = jsjni_GetGlobalContextRef();
- // get the JVM
- JavaVM *jvm = jsjni_GetVM();
-
- if (webrtc::VoiceEngine::SetAndroidObjects(jvm, (void*)context) != 0) {
- CSFLogError(logTag, "%s Unable to set Android objects", __FUNCTION__);
- return kMediaConduitSessionNotInited;
- }
-#endif
-
// Per WebRTC APIs below function calls return nullptr on failure
if(!(mVoiceEngine = webrtc::VoiceEngine::Create()))
{
diff --git a/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp b/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp
index 95f599be46..e6db06a685 100755
--- a/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp
+++ b/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp
@@ -25,10 +25,6 @@
#include "mozilla/Unused.h"
-#ifdef MOZ_WIDGET_ANDROID
-#include "AndroidJNIWrapper.h"
-#endif
-
// for ntohs
#ifdef _MSC_VER
#include "Winsock2.h"
@@ -323,15 +319,6 @@ WebrtcVideoConduit::InitMain()
}
}
-#ifdef MOZ_WIDGET_ANDROID
- // get the JVM
- JavaVM *jvm = jsjni_GetVM();
-
- if (webrtc::VideoEngine::SetAndroidObjects(jvm) != 0) {
- CSFLogError(logTag, "%s: could not set Android objects", __FUNCTION__);
- return kMediaConduitSessionNotInited;
- }
-#endif
#endif
return kMediaConduitNoError;
}