Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / webrtc / video_engine / test / auto_test / source / vie_autotest_android.cc

diff --git a/src/third_party/webrtc/video_engine/test/auto_test/source/vie_autotest_android.cc b/src/third_party/webrtc/video_engine/test/auto_test/source/vie_autotest_android.cc
index ac0dd17..ced235f 100644 (file)
--- a/src/third_party/webrtc/video_engine/test/auto_test/source/vie_autotest_android.cc
+++ b/src/third_party/webrtc/video_engine/test/auto_test/source/vie_autotest_android.cc
@@ -13,15 +13,18 @@
 #include <android/log.h>
 #include <stdio.h>
 
-#include "webrtc/video_engine/test/auto_test/interface/vie_autotest.h"
+#include "webrtc/modules/video_capture/video_capture_internal.h"
+#include "webrtc/modules/video_render/video_render_internal.h"
 #include "webrtc/video_engine/test/auto_test/interface/vie_autotest_defines.h"
+#include "webrtc/video_engine/test/auto_test/interface/vie_autotest.h"
 
 int ViEAutoTestAndroid::RunAutotest(int testSelection, int subTestSelection,
                                     void* window1, void* window2,
                                     JavaVM* javaVM, void* env, void* context) {
   ViEAutoTest vieAutoTest(window1, window2);
   ViETest::Log("RunAutoTest(%d, %d)", testSelection, subTestSelection);
-  webrtc::VideoEngine::SetAndroidObjects(javaVM, static_cast<jobject>(context));
+  webrtc::SetCaptureAndroidVM(javaVM, static_cast<jobject>(context));
+  webrtc::SetRenderAndroidVM(javaVM);
 #ifndef WEBRTC_ANDROID_OPENSLES
   // voice engine calls into ADM directly
   webrtc::VoiceEngine::SetAndroidObjects(javaVM, env, context);