diff --git a/webrtc/modules/video_capture/test/android/.classpath b/webrtc/modules/video_capture/test/android/.classpath
deleted file mode 100644
index 841ac513c..000000000
--- a/webrtc/modules/video_capture/test/android/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/webrtc/modules/video_capture/test/android/.project b/webrtc/modules/video_capture/test/android/.project
deleted file mode 100644
index 373da0e22..000000000
--- a/webrtc/modules/video_capture/test/android/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
- VideoCaptureModuleAndroidTest
-
-
-
-
-
- com.android.ide.eclipse.adt.ResourceManagerBuilder
-
-
-
-
- com.android.ide.eclipse.adt.PreCompilerBuilder
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- com.android.ide.eclipse.adt.ApkBuilder
-
-
-
-
-
- com.android.ide.eclipse.adt.AndroidNature
- org.eclipse.jdt.core.javanature
-
-
diff --git a/webrtc/modules/video_capture/test/android/AndroidManifest.xml b/webrtc/modules/video_capture/test/android/AndroidManifest.xml
deleted file mode 100644
index 1a4ec9b9e..000000000
--- a/webrtc/modules/video_capture/test/android/AndroidManifest.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/webrtc/modules/video_capture/test/android/default.properties b/webrtc/modules/video_capture/test/android/default.properties
deleted file mode 100644
index 2ad44a49f..000000000
--- a/webrtc/modules/video_capture/test/android/default.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system use,
-# "build.properties", and override values to adapt the script to your
-# project structure.
-
-# Project target.
-target=android-9
diff --git a/webrtc/modules/video_capture/test/android/gen/org/webrtc/capturemoduleandroidtest/R.java b/webrtc/modules/video_capture/test/android/gen/org/webrtc/capturemoduleandroidtest/R.java
deleted file mode 100644
index 94bf93b3d..000000000
--- a/webrtc/modules/video_capture/test/android/gen/org/webrtc/capturemoduleandroidtest/R.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/* AUTO-GENERATED FILE. DO NOT MODIFY.
- *
- * This class was automatically generated by the
- * aapt tool from the resource data it found. It
- * should not be modified by hand.
- */
-
-package org.webrtc.capturemoduleandroidtest;
-
-public final class R {
- public static final class attr {
- }
- public static final class drawable {
- public static final int icon=0x7f020000;
- }
- public static final class id {
- public static final int Button01=0x7f050000;
- public static final int Button02=0x7f050001;
- public static final int Button03=0x7f050002;
- public static final int Button04=0x7f050003;
- public static final int renderView=0x7f050004;
- }
- public static final class layout {
- public static final int main=0x7f030000;
- }
- public static final class string {
- public static final int app_name=0x7f040000;
- public static final int run_button=0x7f040001;
- public static final int run_button2=0x7f040002;
- public static final int run_button3=0x7f040003;
- public static final int run_button4=0x7f040004;
- }
-}
diff --git a/webrtc/modules/video_capture/test/android/jni/Android.mk b/webrtc/modules/video_capture/test/android/jni/Android.mk
deleted file mode 100644
index 7eba756aa..000000000
--- a/webrtc/modules/video_capture/test/android/jni/Android.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# Android makefile for VideoCapture Module
-
-LOCAL_PATH := $(call my-dir)
-
-WEBRTC_INTERFACES_PATH := $(LOCAL_PATH)/../../../../../../../build/interface
-WEBRTC_LIBS_PATH := $(LOCAL_PATH)/../../../../../../../build/libraries
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := VideoCaptureModuleAndroidTestJniAPI
-LOCAL_SRC_FILES := video_capture_module_android_test_jni.cc
-LOCAL_CFLAGS := -DWEBRTC_TARGET_PC # For typedefs.h
-LOCAL_C_INCLUDES := $(WEBRTC_INTERFACES_PATH)
-LOCAL_LDLIBS := \
- $(WEBRTC_LIBS_PATH)/testVideoCaptureAPI_android_gcc.a \
- $(WEBRTC_LIBS_PATH)/VideoCaptureModuleTestApiLib_android_gcc.a \
- -llog -lgcc -lGLESv2
-include $(BUILD_SHARED_LIBRARY)
-
diff --git a/webrtc/modules/video_capture/test/android/jni/org_webrtc_capturemoduleandroidtest_VideoCaptureModuleTest.h b/webrtc/modules/video_capture/test/android/jni/org_webrtc_capturemoduleandroidtest_VideoCaptureModuleTest.h
deleted file mode 100644
index 0320df066..000000000
--- a/webrtc/modules/video_capture/test/android/jni/org_webrtc_capturemoduleandroidtest_VideoCaptureModuleTest.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include
-/* Header for class org_webrtc_capturemoduleandroidtest_VideoCaptureModuleTest */
-
-#ifndef _Included_org_webrtc_capturemoduleandroidtest_VideoCaptureModuleTest
-#define _Included_org_webrtc_capturemoduleandroidtest_VideoCaptureModuleTest
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class: org_webrtc_capturemoduleandroidtest_VideoCaptureModuleTest
- * Method: RunTest
- * Signature: (Landroid/content/Context;)I
- */
-JNIEXPORT jint JNICALL Java_org_webrtc_capturemoduleandroidtest_VideoCaptureModuleTest_RunTest
- (JNIEnv *, jobject, jobject);
-
-JNIEXPORT jint JNICALL Java_org_webrtc_capturemoduleandroidtest_VideoCaptureModuleTest_RenderInit
-(JNIEnv * env, jobject context,jobject surface);
-
-JNIEXPORT jint JNICALL Java_org_webrtc_capturemoduleandroidtest_VideoCaptureModuleTest_StartCapture
-(JNIEnv *, jobject);
-
-JNIEXPORT jint JNICALL Java_org_webrtc_capturemoduleandroidtest_VideoCaptureModuleTest_StopCapture
-(JNIEnv *, jobject);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/webrtc/modules/video_capture/test/android/jni/video_capture_module_android_test_jni.cc b/webrtc/modules/video_capture/test/android/jni/video_capture_module_android_test_jni.cc
deleted file mode 100644
index ac2f6e158..000000000
--- a/webrtc/modules/video_capture/test/android/jni/video_capture_module_android_test_jni.cc
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-#include // memset
-#include
-
-#include "org_webrtc_capturemoduleandroidtest_VideoCaptureModuleTest.h"
-#include "../../../interface/video_capture_factory.h"
-#include "../../../../../video_render/main/interface/video_render.h"
-#include "../../testAPI/testPlatformDependent.h"
-#include "../../testAPI/testPlatformDependent.h"
-#ifdef RENDER_PREVIEW
-#include "../../testAPI/Renderer.h"
-#endif
-
-using namespace webrtc;
-#define WEBRTC_LOG_TAG "*WEBRTCN*" // As in WEBRTC Native...
-// ADM data struct
-typedef struct
-{
- // Other
- JavaVM* jvm;
- Renderer* renderer;
- VideoCaptureModule* _videoCapture;
- VideoCaptureModule::DeviceInfo*_captureInfo;
-} JniData;
-
-// Global variables visible in this file
-static JniData jniData;
-
-//////////////////////////////////////////////////////////////////
-// General functions
-//////////////////////////////////////////////////////////////////
-
-/////////////////////////////////////////////
-// JNI_OnLoad
-//
-jint JNI_OnLoad(JavaVM* vm, void* /*reserved*/)
-{
- __android_log_write(ANDROID_LOG_DEBUG, WEBRTC_LOG_TAG, "JNI_OnLoad");
- if (!vm)
- {
- __android_log_write(ANDROID_LOG_ERROR, WEBRTC_LOG_TAG,
- "JNI_OnLoad did not receive a valid VM pointer");
- return -1;
- }
-
- // Get JNI
- JNIEnv* env;
- if (JNI_OK != vm->GetEnv(reinterpret_cast (&env), JNI_VERSION_1_4))
- {
- __android_log_write(ANDROID_LOG_ERROR, WEBRTC_LOG_TAG,
- "JNI_OnLoad could not get JNI env");
- return -1;
- }
-
- // Init JniData data
- memset(&jniData, 0, sizeof(jniData));
-
- // Store the JVM
- jniData.jvm = vm;
-
- return JNI_VERSION_1_4;
-}
-
-/////////////////////////////////////////////
-// Run Test
-//
-JNIEXPORT jint JNICALL
-Java_org_webrtc_capturemoduleandroidtest_VideoCaptureModuleTest_RunTest(
- JNIEnv * env,
- jobject context,
- jobject surface)
-{
- __android_log_write(ANDROID_LOG_DEBUG, WEBRTC_LOG_TAG, "Run test");
- // Set instance independent Java objects
- VideoCaptureModule::SetAndroidObjects(jniData.jvm, context);
-
- // Start test
- __android_log_write(ANDROID_LOG_DEBUG, WEBRTC_LOG_TAG,
- "Create testPlatformDependent");
- testPlatformDependent testPlatformDependent;
- testPlatformDependent.SetRenderer(jniData.renderer);
- testPlatformDependent.DoTest();
-
- // Clear instance independent Java objects
- VideoCaptureModule::SetAndroidObjects(NULL, NULL);
-
- return 0;
-}
-
-JNIEXPORT jint JNICALL
-Java_org_webrtc_capturemoduleandroidtest_VideoCaptureModuleTest_RenderInit(
- JNIEnv * env,
- jobject context,
- jobject surface)
-{
- VideoRender::SetAndroidObjects(jniData.jvm);
-#ifdef RENDER_PREVIEW
- Renderer::SetRenderWindow(surface);
- jniData.renderer=new Renderer(true);
-#endif
-}
-
-JNIEXPORT jint JNICALL
-Java_org_webrtc_capturemoduleandroidtest_VideoCaptureModuleTest_StartCapture(
- JNIEnv * env,
- jobject context)
-{
- if (!jniData._captureInfo) {
- VideoCaptureModule::SetAndroidObjects(jniData.jvm, context);
- jniData._captureInfo = VideoCaptureFactory::CreateDeviceInfo(5);
- WebRtc_UWord8 id[256];
- WebRtc_UWord8 name[256];
- jniData._captureInfo->GetDeviceName(0, name, 256, id, 256);
- jniData._videoCapture = VideoCaptureFactory::Create(0, id);
- VideoCaptureCapability capability;
-
- jniData._captureInfo->GetCapability(id, 0, capability);
- capability.width = 176;
- capability.height = 144;
- capability.maxFPS = 15;
-
- jniData._videoCapture->StartCapture(capability);
- }
- return 0;
-}
-
-JNIEXPORT jint JNICALL
-Java_org_webrtc_capturemoduleandroidtest_VideoCaptureModuleTest_StopCapture(
- JNIEnv * env,
- jobject context)
-{
- if (jniData._videoCapture) {
- jniData._videoCapture->StopCapture();
- delete jniData._captureInfo;
- VideoCaptureModule::Destroy(jniData._videoCapture);
- jniData._videoCapture = NULL;
- jniData._captureInfo = NULL;
- }
- return 0;
-}
diff --git a/webrtc/modules/video_capture/test/android/res/drawable-hdpi/icon.png b/webrtc/modules/video_capture/test/android/res/drawable-hdpi/icon.png
deleted file mode 100644
index 8074c4c57..000000000
Binary files a/webrtc/modules/video_capture/test/android/res/drawable-hdpi/icon.png and /dev/null differ
diff --git a/webrtc/modules/video_capture/test/android/res/drawable-ldpi/icon.png b/webrtc/modules/video_capture/test/android/res/drawable-ldpi/icon.png
deleted file mode 100644
index 1095584ec..000000000
Binary files a/webrtc/modules/video_capture/test/android/res/drawable-ldpi/icon.png and /dev/null differ
diff --git a/webrtc/modules/video_capture/test/android/res/drawable-mdpi/icon.png b/webrtc/modules/video_capture/test/android/res/drawable-mdpi/icon.png
deleted file mode 100644
index a07c69fa5..000000000
Binary files a/webrtc/modules/video_capture/test/android/res/drawable-mdpi/icon.png and /dev/null differ
diff --git a/webrtc/modules/video_capture/test/android/res/layout/main.xml b/webrtc/modules/video_capture/test/android/res/layout/main.xml
deleted file mode 100644
index 36427331e..000000000
--- a/webrtc/modules/video_capture/test/android/res/layout/main.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/webrtc/modules/video_capture/test/android/res/values/strings.xml b/webrtc/modules/video_capture/test/android/res/values/strings.xml
deleted file mode 100644
index bd9a75272..000000000
--- a/webrtc/modules/video_capture/test/android/res/values/strings.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
- VideoCaptureModuleAndroidTest
-Run Test
-
-Run Java test
-Start c++ Capture
-Stop c++ Capture
-
-
diff --git a/webrtc/modules/video_capture/test/android/src/org/webrtc/capturemoduleandroidtest/VideoCaptureJavaTest.java b/webrtc/modules/video_capture/test/android/src/org/webrtc/capturemoduleandroidtest/VideoCaptureJavaTest.java
deleted file mode 100644
index 7a92c483c..000000000
--- a/webrtc/modules/video_capture/test/android/src/org/webrtc/capturemoduleandroidtest/VideoCaptureJavaTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.webrtc.capturemoduleandroidtest;
-
-import java.util.List;
-
-import android.content.Context;
-import android.util.Log;
-
-import org.webrtc.videoengine.CaptureCapabilityAndroid;
-import org.webrtc.videoengine.VideoCaptureAndroid;
-import org.webrtc.videoengine.VideoCaptureDeviceInfoAndroid;
-
-public class VideoCaptureJavaTest {
- void DoTest(Context context)
- {
- VideoCaptureDeviceInfoAndroid videoCaptureDeviceInfo =
- VideoCaptureDeviceInfoAndroid.CreateVideoCaptureDeviceInfoAndroid(
- 5,context);
- for(int i = 0; i < videoCaptureDeviceInfo.NumberOfDevices(); i++) {
- String deviceUniqueId=videoCaptureDeviceInfo.GetDeviceUniqueName(i);
- VideoCaptureAndroid videoCapture =
- videoCaptureDeviceInfo.AllocateCamera(i,0,deviceUniqueId);
-
- CaptureCapabilityAndroid capArray[] =
- videoCaptureDeviceInfo.GetCapabilityArray(deviceUniqueId);
- for(CaptureCapabilityAndroid cap: capArray) {
- Log.d("*WEBRTC*", "Capability widht" + cap.width +
- " height " +cap.height+ " frameRate " +cap.maxFPS);
- int result=videoCapture.StartCapture(cap.width,
- cap.height,
- cap.maxFPS);
- try{
- Thread.sleep(2000);//sleep for 2000 ms
- }
- catch(InterruptedException ie){
- //If this thread was interrupted by another thread
- }
- result+=videoCapture.StopCapture();
- Log.d("*WEBRTC*", "Start stop result " + result);
- }
- VideoCaptureAndroid.DeleteVideoCaptureAndroid(videoCapture);
- videoCapture=null;
- }
- Log.d("*WEBRTC*", "Test complete");
- }
-
- VideoCaptureDeviceInfoAndroid _videoCaptureDeviceInfo;
- VideoCaptureAndroid _videoCapture;
- void StartCapture(Context context) {
- _videoCaptureDeviceInfo =
- VideoCaptureDeviceInfoAndroid.CreateVideoCaptureDeviceInfoAndroid(
- 5,context);
- String deviceUniqueId=_videoCaptureDeviceInfo.GetDeviceUniqueName(0);
- _videoCapture=_videoCaptureDeviceInfo.AllocateCamera(5,0,deviceUniqueId);
- _videoCapture.StartCapture(176,144,15);
- }
- void StopCapture() {
- _videoCapture.StopCapture();
- VideoCaptureAndroid.DeleteVideoCaptureAndroid(_videoCapture);
- }
-
-}
diff --git a/webrtc/modules/video_capture/test/android/src/org/webrtc/capturemoduleandroidtest/VideoCaptureModuleTest.java b/webrtc/modules/video_capture/test/android/src/org/webrtc/capturemoduleandroidtest/VideoCaptureModuleTest.java
deleted file mode 100644
index 7191b1cb5..000000000
--- a/webrtc/modules/video_capture/test/android/src/org/webrtc/capturemoduleandroidtest/VideoCaptureModuleTest.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package org.webrtc.capturemoduleandroidtest;
-
-import javax.microedition.khronos.egl.EGLConfig;
-import javax.microedition.khronos.opengles.GL10;
-
-import org.webrtc.capturemoduleandroidtest.R;
-import org.webrtc.videoengine.ViERenderer;
-
-import android.app.Activity;
-import android.opengl.GLSurfaceView;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.SurfaceHolder;
-import android.view.SurfaceView;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.LinearLayout;
-
-public class VideoCaptureModuleTest
- extends Activity implements OnClickListener {
- // Set to 1 if OpenGL shall be used. 0 Otherwise
- private final int _useOpenGL=1;
- private Thread _testThread;
- private SurfaceView _view=null;
- private VideoCaptureModuleTest _thisPointer;
- private VideoCaptureJavaTest _videoCaptureJavaTest;
- /** Called when the activity is first created. */
- @Override
- public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.main);
-
- final Button buttonStartCP = (Button) findViewById(R.id.Button01);
- buttonStartCP.setOnClickListener(this);
- final Button buttonStartJava = (Button) findViewById(R.id.Button02);
- buttonStartJava.setOnClickListener(this);
- final Button buttonStartCPP = (Button) findViewById(R.id.Button03);
- buttonStartCPP.setOnClickListener(this);
- final Button buttonStopCPP = (Button) findViewById(R.id.Button04);
- buttonStopCPP.setOnClickListener(this);
- }
-
- private Runnable _testProc = new Runnable() {
- public void run() {
- // TODO: choose test from GUI
- // Select test here, 0 for API test, 1-> for Func tests
- RunTest(_view);
- }
- };
-
- @Override
- protected void onStart()
- {
- super.onStart();
- }
- @Override
- protected void onRestart()
- {
- super.onRestart();
- }
- @Override
- protected void onPause()
- {
- super.onPause();
- }
- @Override
- protected void onStop()
- {
- super.onStop();
- }
-
- // Function used to call test
- private native int RunTest(Object view);
- private native int RenderInit(Object view);
-
- private native int StartCapture();
- private native int StopCapture();
-
- static {
- Log.d("*WEBRTC*",
- "Loading ModuleVideoCaptureModuleAndroidTest...");
- System.loadLibrary(
- "ModuleVideoCaptureModuleAndroidTestJniAPI");
- }
-
- public void onClick(View v) {
- //get the handle to the layout
- LinearLayout renderLayout=(LinearLayout) findViewById(R.id.renderView);
- switch(v.getId())
- {
- case R.id.Button01:
- renderLayout.removeAllViews();
- _view=ViERenderer.CreateLocalRenderer(this);
- if(_useOpenGL==1)
- {
- _view= ViERenderer.CreateRenderer(this, true);
- }
- else
- {
- _view= new SurfaceView(this);
- }
- // add the surfaceview to the layout,
- // the surfaceview will be the same size as the layout (container)
- renderLayout.addView(_view);
- RenderInit(_view);
- _testThread = new Thread(_testProc);
- _testThread.start();
- break;
- case R.id.Button02:
- _view=ViERenderer.CreateLocalRenderer(this);
- renderLayout.removeAllViews();
- if(_videoCaptureJavaTest==null)
- {
- _videoCaptureJavaTest=new VideoCaptureJavaTest();
- _videoCaptureJavaTest.StartCapture(this);
- // add the surfaceview to the layout,
- // the surfaceview will be the same size as the layout (container)
- renderLayout.addView(_view);
- }
- else
- {
- _videoCaptureJavaTest.StopCapture();
- _videoCaptureJavaTest=null;
- }
- break;
-
- case R.id.Button03:
- _view=ViERenderer.CreateLocalRenderer(this);
- renderLayout.removeAllViews();
- StartCapture();
- // add the surfaceview to the layout,
- // the surfaceview will be the same size as the layout (container)
- renderLayout.addView(_view);
- break;
- case R.id.Button04:
- renderLayout.removeAllViews();
- StopCapture();
- break;
- }
- }
-}
\ No newline at end of file