summaryrefslogtreecommitdiffstats
path: root/chromium/third_party/webrtc/examples/android/media_demo/jni/on_load.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/third_party/webrtc/examples/android/media_demo/jni/on_load.cc')
-rw-r--r--chromium/third_party/webrtc/examples/android/media_demo/jni/on_load.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chromium/third_party/webrtc/examples/android/media_demo/jni/on_load.cc b/chromium/third_party/webrtc/examples/android/media_demo/jni/on_load.cc
index 27a2394b3d5..9fc4ca92b21 100644
--- a/chromium/third_party/webrtc/examples/android/media_demo/jni/on_load.cc
+++ b/chromium/third_party/webrtc/examples/android/media_demo/jni/on_load.cc
@@ -38,7 +38,7 @@ JOWW(void, NativeWebRtcContextRegistry_register)(
jobject context) {
webrtc_examples::SetVoeDeviceObjects(g_vm);
webrtc_examples::SetVieDeviceObjects(g_vm);
- CHECK(webrtc::VideoEngine::SetAndroidObjects(g_vm) == 0,
+ CHECK(webrtc::VideoEngine::SetAndroidObjects(g_vm, context) == 0,
"Failed to register android objects to video engine");
CHECK(webrtc::VoiceEngine::SetAndroidObjects(g_vm, jni, context) == 0,
"Failed to register android objects to voice engine");
@@ -47,6 +47,8 @@ JOWW(void, NativeWebRtcContextRegistry_register)(
JOWW(void, NativeWebRtcContextRegistry_unRegister)(
JNIEnv* jni,
jclass) {
+ CHECK(webrtc::VideoEngine::SetAndroidObjects(NULL, NULL) == 0,
+ "Failed to unregister android objects from video engine");
CHECK(webrtc::VoiceEngine::SetAndroidObjects(NULL, NULL, NULL) == 0,
"Failed to unregister android objects from voice engine");
webrtc_examples::ClearVieDeviceObjects();