From e034f21d8dc72a2f128471f0b3255d3801e03249 Mon Sep 17 00:00:00 2001 From: "andrew@webrtc.org" Date: Wed, 31 Oct 2012 05:36:50 +0000 Subject: [PATCH] Remove video_capture/test/android Review URL: https://webrtc-codereview.appspot.com/937011 git-svn-id: http://webrtc.googlecode.com/svn/trunk@3028 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../video_capture/test/android/.classpath | 9 -- .../video_capture/test/android/.project | 33 ---- .../test/android/AndroidManifest.xml | 31 ---- .../test/android/default.properties | 11 -- .../webrtc/capturemoduleandroidtest/R.java | 33 ---- .../video_capture/test/android/jni/Android.mk | 19 --- ...moduleandroidtest_VideoCaptureModuleTest.h | 40 ----- .../video_capture_module_android_test_jni.cc | 149 ------------------ .../test/android/res/drawable-hdpi/icon.png | Bin 4147 -> 0 bytes .../test/android/res/drawable-ldpi/icon.png | Bin 1723 -> 0 bytes .../test/android/res/drawable-mdpi/icon.png | Bin 2574 -> 0 bytes .../test/android/res/layout/main.xml | 32 ---- .../test/android/res/values/strings.xml | 11 -- .../VideoCaptureJavaTest.java | 61 ------- .../VideoCaptureModuleTest.java | 142 ----------------- 15 files changed, 571 deletions(-) delete mode 100644 webrtc/modules/video_capture/test/android/.classpath delete mode 100644 webrtc/modules/video_capture/test/android/.project delete mode 100644 webrtc/modules/video_capture/test/android/AndroidManifest.xml delete mode 100644 webrtc/modules/video_capture/test/android/default.properties delete mode 100644 webrtc/modules/video_capture/test/android/gen/org/webrtc/capturemoduleandroidtest/R.java delete mode 100644 webrtc/modules/video_capture/test/android/jni/Android.mk delete mode 100644 webrtc/modules/video_capture/test/android/jni/org_webrtc_capturemoduleandroidtest_VideoCaptureModuleTest.h delete mode 100644 webrtc/modules/video_capture/test/android/jni/video_capture_module_android_test_jni.cc delete mode 100644 webrtc/modules/video_capture/test/android/res/drawable-hdpi/icon.png delete mode 100644 webrtc/modules/video_capture/test/android/res/drawable-ldpi/icon.png delete mode 100644 webrtc/modules/video_capture/test/android/res/drawable-mdpi/icon.png delete mode 100644 webrtc/modules/video_capture/test/android/res/layout/main.xml delete mode 100644 webrtc/modules/video_capture/test/android/res/values/strings.xml delete mode 100644 webrtc/modules/video_capture/test/android/src/org/webrtc/capturemoduleandroidtest/VideoCaptureJavaTest.java delete mode 100644 webrtc/modules/video_capture/test/android/src/org/webrtc/capturemoduleandroidtest/VideoCaptureModuleTest.java diff --git a/webrtc/modules/video_capture/test/android/.classpath b/webrtc/modules/video_capture/test/android/.classpath deleted file mode 100644 index 841ac513c4..0000000000 --- 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 373da0e228..0000000000 --- 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 1a4ec9b9e7..0000000000 --- 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 2ad44a49fa..0000000000 --- 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 94bf93b3dc..0000000000 --- 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 7eba756aa5..0000000000 --- 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 0320df066c..0000000000 --- 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 ac2f6e1586..0000000000 --- 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 8074c4c571b8cd19e27f4ee5545df367420686d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4147 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 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 1095584ec21f71cd0afc9e0993aa2209671b590c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1723 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 - - - - - - - - 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 bd9a752729..0000000000 --- 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 7a92c483ca..0000000000 --- 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 7191b1cb55..0000000000 --- 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