X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fthird_party%2Fwebrtc%2Fvideo_engine%2Ftest%2Fauto_test%2Fsource%2Fvie_autotest_android.cc;h=ced235f6b54c87237230b86995db87ec78e7227d;hb=3545e9f2671f595d2a2f3ee75ca0393b01e35ef6;hp=ac0dd17ee23617453ca2e64e52713666c29e2408;hpb=7d210d4c7e9ba36e635eabc5b5780495f8a63292;p=platform%2Fframework%2Fweb%2Fcrosswalk.git 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 --- 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 #include -#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(context)); + webrtc::SetCaptureAndroidVM(javaVM, static_cast(context)); + webrtc::SetRenderAndroidVM(javaVM); #ifndef WEBRTC_ANDROID_OPENSLES // voice engine calls into ADM directly webrtc::VoiceEngine::SetAndroidObjects(javaVM, env, context);