diff options
| author | andresp@webrtc.org <andresp@webrtc.org> | 2014-09-17 11:44:51 +0000 |
|---|---|---|
| committer | andresp@webrtc.org <andresp@webrtc.org> | 2014-09-17 11:44:51 +0000 |
| commit | 8d6e944bee3e0228ca0e52e23fabea8ed787d5ec (patch) | |
| tree | 56224335ac16c70725bd1a7806ff544386ea7375 /examples | |
| parent | 1c655450cf12d21bfa5b2ff277f337335149186a (diff) | |
| download | webrtc-8d6e944bee3e0228ca0e52e23fabea8ed787d5ec.tar.gz | |
Split video engine android initialization into each internal module initialization.
This is to later on allow targets to pick at link time if to include the external or internal implementation. In order to do that the video_engine cannot compile different based on which option is picked later on.
BUG=3768,3770
R=glaznev@webrtc.org, stefan@webrtc.org
TBR=henrike@webrtc.org, mflodman@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/25529004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@7208 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/android/media_demo/jni/on_load.cc | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/examples/android/media_demo/jni/on_load.cc b/examples/android/media_demo/jni/on_load.cc index 9fc4ca92..fd771717 100644 --- a/examples/android/media_demo/jni/on_load.cc +++ b/examples/android/media_demo/jni/on_load.cc @@ -15,7 +15,8 @@ #include "webrtc/examples/android/media_demo/jni/jni_helpers.h" #include "webrtc/examples/android/media_demo/jni/video_engine_jni.h" #include "webrtc/examples/android/media_demo/jni/voice_engine_jni.h" -#include "webrtc/video_engine/include/vie_base.h" +#include "webrtc/modules/video_capture/video_capture_internal.h" +#include "webrtc/modules/video_render/video_render_internal.h" #include "webrtc/voice_engine/include/voe_base.h" // Macro for native functions that can be found by way of jni-auto discovery. @@ -38,8 +39,10 @@ JOWW(void, NativeWebRtcContextRegistry_register)( jobject context) { webrtc_examples::SetVoeDeviceObjects(g_vm); webrtc_examples::SetVieDeviceObjects(g_vm); - CHECK(webrtc::VideoEngine::SetAndroidObjects(g_vm, context) == 0, - "Failed to register android objects to video engine"); + CHECK(webrtc::SetCaptureAndroidVM(g_vm, context) == 0, + "Failed to register android objects to video capture"); + CHECK(webrtc::SetRenderAndroidVM(g_vm) == 0, + "Failed to register android objects to video render"); CHECK(webrtc::VoiceEngine::SetAndroidObjects(g_vm, jni, context) == 0, "Failed to register android objects to voice engine"); } @@ -47,8 +50,10 @@ 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::SetCaptureAndroidVM(NULL, NULL) == 0, + "Failed to unregister android objects from video capture"); + CHECK(webrtc::SetRenderAndroidVM(NULL) == 0, + "Failed to unregister android objects from video render"); CHECK(webrtc::VoiceEngine::SetAndroidObjects(NULL, NULL, NULL) == 0, "Failed to unregister android objects from voice engine"); webrtc_examples::ClearVieDeviceObjects(); |