Merge "Use correct printf format specifier" into lmp-dev
diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml
index fc899b1..106611c 100644
--- a/apps/CtsVerifier/AndroidManifest.xml
+++ b/apps/CtsVerifier/AndroidManifest.xml
@@ -1169,6 +1169,7 @@
<category android:name="android.cts.intent.category.MANUAL_TEST" />
</intent-filter>
<meta-data android:name="test_category" android:value="@string/test_category_projection" />
+ <meta-data android:name="test_required_features" android:value="android.hardware.faketouch" />
</activity>
<activity android:name=".projection.widgets.ProjectionWidgetActivity"
@@ -1178,6 +1179,7 @@
<category android:name="android.cts.intent.category.MANUAL_TEST" />
</intent-filter>
<meta-data android:name="test_category" android:value="@string/test_category_projection" />
+ <meta-data android:name="test_required_features" android:value="android.hardware.faketouch" />
</activity>
<activity android:name=".projection.list.ProjectionListActivity"
@@ -1187,6 +1189,8 @@
<category android:name="android.cts.intent.category.MANUAL_TEST" />
</intent-filter>
<meta-data android:name="test_category" android:value="@string/test_category_projection" />
+ <meta-data android:name="test_excluded_features"
+ android:value="android.hardware.type.television:android.software.leanback" />
</activity>
<activity android:name=".projection.video.ProjectionVideoActivity"
@@ -1205,6 +1209,7 @@
<category android:name="android.cts.intent.category.MANUAL_TEST" />
</intent-filter>
<meta-data android:name="test_category" android:value="@string/test_category_projection" />
+ <meta-data android:name="test_required_features" android:value="android.hardware.faketouch" />
</activity>
@@ -1215,6 +1220,8 @@
<category android:name="android.cts.intent.category.MANUAL_TEST" />
</intent-filter>
<meta-data android:name="test_category" android:value="@string/test_category_projection" />
+ <meta-data android:name="test_excluded_features"
+ android:value="android.hardware.type.television:android.software.leanback" />
</activity>
<service android:name=".projection.ProjectionService"
diff --git a/apps/CtsVerifier/res/values/strings.xml b/apps/CtsVerifier/res/values/strings.xml
index ffe0121..fa86474 100644
--- a/apps/CtsVerifier/res/values/strings.xml
+++ b/apps/CtsVerifier/res/values/strings.xml
@@ -1154,7 +1154,7 @@
<string name="pwa_info">This tests whether or displaying widets and keyfocus navigation works.\n
You should see four buttons on the bottom of the screen.\n
Pressing the "up" and "down" buttons should highlight different buttons.\n
- Further, you should also be able to touch them and they should highlight as ususual.</string>
+ Further, you should also be able to touch them and they should highlight as usual.</string>
<string name="pwa_test">Projection Widget Test</string>
<string name="pwa_button_up">Up</string>
<string name="pwa_button_down">Down</string>
diff --git a/tests/expectations/knownfailures.txt b/tests/expectations/knownfailures.txt
index ae78695..2d2d460 100644
--- a/tests/expectations/knownfailures.txt
+++ b/tests/expectations/knownfailures.txt
@@ -8,13 +8,6 @@
bug: 17595050
},
{
- description: "signature test stil needs more work",
- names: [
- "android.signature.cts.SignatureTest#testSignature"
- ],
- bug: 17894722
-},
-{
description: "Not all jdwp features are currently supported. These tests will fail",
names: [
"org.apache.harmony.jpda.tests.jdwp.DebuggerOnDemand.OnthrowDebuggerLaunchTest#testDebuggerLaunch001",
@@ -86,14 +79,18 @@
description: "permissions for the API previously used in the test has changed, making it impossible to pass",
names: [
"android.openglperf.cts.GlAppSwitchTest#testGlActivitySwitchingFast",
- "android.openglperf.cts.GlAppSwitchTest#testGlActivitySwitchingSlow",
- "android.openglperf.cts.GlVboPerfTest#testVboVsNonVboPerfGeometry0",
- "android.openglperf.cts.GlVboPerfTest#testVboVsNonVboPerfGeometry1",
- "android.openglperf.cts.GlVboPerfTest#testVboWithVaryingIndexBufferNumbers"
+ "android.openglperf.cts.GlAppSwitchTest#testGlActivitySwitchingSlow"
],
bug: 17394321
},
{
+ description: "unexpected failures",
+ names: [
+ "android.openglperf.cts.GlVboPerfTest#testVboWithVaryingIndexBufferNumbers"
+ ],
+ bug: 18091590
+},
+{
description: "these tests require a good test scene, so they fail if run in random conditions",
names: [
"android.hardware.camera2.cts.AllocationTest#testBlackWhite",
@@ -364,5 +361,14 @@
"android.uirendering.cts.testclasses.FontRenderingTests"
],
bug: 17109280
+},
+{
+ description: "android.keystore tests will replace these tests",
+ names: [
+ "com.android.org.conscrypt.MacTest#test_getInstance_OpenSSL_ENGINE",
+ "com.android.org.conscrypt.NativeCryptoTest#test_ENGINE_by_id_TestEngine",
+ "com.android.org.conscrypt.SignatureTest#test_getInstance_OpenSSL_ENGINE"
+ ],
+ bug: 18030049
}
]
diff --git a/tests/tests/media/src/android/media/cts/AudioEffectTest.java b/tests/tests/media/src/android/media/cts/AudioEffectTest.java
index 7ff78d8..1c96abd 100644
--- a/tests/tests/media/src/android/media/cts/AudioEffectTest.java
+++ b/tests/tests/media/src/android/media/cts/AudioEffectTest.java
@@ -35,10 +35,10 @@
import android.util.Log;
import java.util.UUID;
-public class AudioEffectTest extends AndroidTestCase {
+public class AudioEffectTest extends PostProcTestBase {
private String TAG = "AudioEffectTest";
- private final static int MIN_NUMBER_EFFECTS = 5;
+ private final static int MIN_NUMBER_EFFECTS = 1;
// allow +/- 5% tolerance between set and get delays
private final static float DELAY_TOLERANCE = 1.05f;
// allow +/- 5% tolerance between set and get ratios
@@ -50,17 +50,9 @@
private AudioEffect mEffect = null;
private AudioEffect mEffect2 = null;
- private int mSession = -1;
- private boolean mHasControl = false;
- private boolean mIsEnabled = false;
- private int mChangedParameter = -1;
- private boolean mInitialized = false;
- private Looper mLooper = null;
private MediaPlayer mMediaPlayer = null;
private int mError = 0;
- private final Object mLock = new Object();
-
private ListenerThread mEffectListenerLooper = null;
//-----------------------------------------------------------------
@@ -71,9 +63,11 @@
// 0 - static methods
//----------------------------------
- //Test case 0.0: test queryEffects() and platfrom at least provides Equalizer, Bass Boost,
- // Virtualizer, Environmental reverb and Preset reverb effects
+ //Test case 0.0: test queryEffects() and platfrom at least provides an Equalizer
public void test0_0QueryEffects() throws Exception {
+ if (!hasAudioOutput()) {
+ return;
+ }
AudioEffect.Descriptor[] desc = AudioEffect.queryEffects();
@@ -81,29 +75,14 @@
(desc.length >= MIN_NUMBER_EFFECTS));
boolean hasEQ = false;
- boolean hasBassBoost = false;
- boolean hasVirtualizer = false;
- boolean hasEnvReverb = false;
- boolean hasPresetReverb = false;
for (int i = 0; i < desc.length; i++) {
if (desc[i].type.equals(AudioEffect.EFFECT_TYPE_EQUALIZER)) {
hasEQ = true;
- } else if (desc[i].type.equals(AudioEffect.EFFECT_TYPE_BASS_BOOST)) {
- hasBassBoost = true;
- } else if (desc[i].type.equals(AudioEffect.EFFECT_TYPE_VIRTUALIZER)) {
- hasVirtualizer = true;
- } else if (desc[i].type.equals(AudioEffect.EFFECT_TYPE_ENV_REVERB)) {
- hasEnvReverb = true;
- } else if (desc[i].type.equals(AudioEffect.EFFECT_TYPE_PRESET_REVERB)) {
- hasPresetReverb = true;
+ break;
}
}
assertTrue("test0_0QueryEffects: equalizer not found", hasEQ);
- assertTrue("test0_0QueryEffects: bass boost not found", hasBassBoost);
- assertTrue("test0_0QueryEffects: virtualizer not found", hasVirtualizer);
- assertTrue("test0_0QueryEffects: environmental reverb not found", hasEnvReverb);
- assertTrue("test0_0QueryEffects: preset reverb not found", hasPresetReverb);
}
//-----------------------------------------------------------------
@@ -129,45 +108,10 @@
return ar;
}
- //Test case 1.0: test constructor from effect type and get effect ID
- public void test1_0ConstructorFromType() throws Exception {
- AudioEffect.Descriptor[] desc = AudioEffect.queryEffects();
- assertTrue("no effects found", (desc.length != 0));
- for (int i = 0; i < desc.length; i++) {
- if (!desc[i].type.equals(AudioEffect.EFFECT_TYPE_NULL)) {
- try {
- int sessionId;
- AudioRecord ar = null;
- if (AudioEffect.EFFECT_PRE_PROCESSING.equals(desc[i].connectMode)) {
- ar = getAudioRecord();
- sessionId = ar.getAudioSessionId();
- } else {
- sessionId = 0;
- }
- AudioEffect effect = new AudioEffect(desc[i].type,
- AudioEffect.EFFECT_TYPE_NULL,
- 0,
- sessionId);
+// // Test case 1.0: test constructor from effect type and get effect ID
+// public void test1_0ConstructorFromType() ...
+// Note: This test was removed because it used hidden api's.
- assertNotNull("could not create AudioEffect", effect);
- try {
- assertTrue("invalid effect ID", (effect.getId() != 0));
- } catch (IllegalStateException e) {
- fail("AudioEffect not initialized");
- } finally {
- effect.release();
- if (ar != null) {
- ar.release();
- }
- }
- } catch (IllegalArgumentException e) {
- fail("Effect not found: "+desc[i].name);
- } catch (UnsupportedOperationException e) {
- fail("Effect library not loaded");
- }
- }
- }
- }
// //Test case 1.1: test constructor from effect uuid
// public void test1_1ConstructorFromUuid() ...
@@ -175,28 +119,15 @@
// 1. will fail in devices that offload effects
// 2. it used hidden api's.
- //Test case 1.2: test constructor failure from unknown type
- public void test1_2ConstructorUnknownType() throws Exception {
-
- try {
- AudioEffect effect = new AudioEffect(UUID.randomUUID(),
- AudioEffect.EFFECT_TYPE_NULL,
- 0,
- 0);
- fail("could create random AudioEffect");
- if (effect != null) {
- effect.release();
- }
- } catch (IllegalArgumentException e) {
-
- } catch (UnsupportedOperationException e) {
- fail("Effect library not loaded");
- }
- }
+// //Test case 1.2: test constructor failure from unknown type
+// public void test1_2ConstructorUnknownType() ...
+// Note: This test was removed because it used hidden api's.
//Test case 1.3: test getEnabled() failure when called on released effect
public void test1_3GetEnabledAfterRelease() throws Exception {
-
+ if (!hasAudioOutput()) {
+ return;
+ }
try {
AudioEffect effect = new AudioEffect(AudioEffect.EFFECT_TYPE_EQUALIZER,
AudioEffect.EFFECT_TYPE_NULL,
@@ -219,6 +150,9 @@
//Test case 1.4: test contructor on mediaPlayer audio session
public void test1_4InsertOnMediaPlayer() throws Exception {
+ if (!hasAudioOutput()) {
+ return;
+ }
MediaPlayer mp = new MediaPlayer();
assertNotNull("could not create mediaplayer", mp);
AssetFileDescriptor afd = mContext.getResources().openRawResourceFd(R.raw.testmp3);
@@ -238,6 +172,9 @@
//Test case 1.5: test auxiliary effect attachement on MediaPlayer
public void test1_5AuxiliaryOnMediaPlayer() throws Exception {
+ if (!isPresetReverbAvailable()) {
+ return;
+ }
synchronized(mLock) {
mInitialized = false;
createMediaPlayerLooper();
@@ -270,6 +207,9 @@
//Test case 1.6: test auxiliary effect attachement failure before setDatasource
public void test1_6AuxiliaryOnMediaPlayerFailure() throws Exception {
+ if (!isPresetReverbAvailable()) {
+ return;
+ }
synchronized(mLock) {
mInitialized = false;
createMediaPlayerLooper();
@@ -301,6 +241,9 @@
//Test case 1.7: test auxiliary effect attachement on AudioTrack
public void test1_7AuxiliaryOnAudioTrack() throws Exception {
+ if (!isPresetReverbAvailable()) {
+ return;
+ }
AudioTrack track = null;
getEffect(AudioEffect.EFFECT_TYPE_PRESET_REVERB, 0);
try {
@@ -342,7 +285,9 @@
//Test case 2.0: test setEnabled() and getEnabled() in valid state
public void test2_0SetEnabledGetEnabled() throws Exception {
-
+ if (!hasAudioOutput()) {
+ return;
+ }
try {
AudioEffect effect = new AudioEffect(AudioEffect.EFFECT_TYPE_EQUALIZER,
AudioEffect.EFFECT_TYPE_NULL,
@@ -370,7 +315,9 @@
//Test case 2.1: test setEnabled() throws exception after release
public void test2_1SetEnabledAfterRelease() throws Exception {
-
+ if (!hasAudioOutput()) {
+ return;
+ }
try {
AudioEffect effect = new AudioEffect(AudioEffect.EFFECT_TYPE_EQUALIZER,
AudioEffect.EFFECT_TYPE_NULL,
@@ -397,6 +344,9 @@
//Test case 3.0: test setParameter(byte[], byte[]) / getParameter(byte[], byte[])
public void test3_0SetParameterByteArrayByteArray() throws Exception {
+ if (!isPresetReverbAvailable()) {
+ return;
+ }
getEffect(AudioEffect.EFFECT_TYPE_PRESET_REVERB, 0);
try {
byte[] param = mEffect.intToByteArray(PresetReverb.PARAM_PRESET);
@@ -428,6 +378,9 @@
//Test case 3.1: test setParameter(int, int) / getParameter(int, int[])
public void test3_1SetParameterIntInt() throws Exception {
+ if (!isEnvReverbAvailable()) {
+ return;
+ }
getEffect(AudioEffect.EFFECT_TYPE_ENV_REVERB, 0);
try {
int param = EnvironmentalReverb.PARAM_DECAY_TIME;
@@ -459,6 +412,9 @@
//Test case 3.2: test setParameter(int, short) / getParameter(int, short[])
public void test3_2SetParameterIntShort() throws Exception {
+ if (!isPresetReverbAvailable()) {
+ return;
+ }
getEffect(AudioEffect.EFFECT_TYPE_PRESET_REVERB, 0);
try {
int param = PresetReverb.PARAM_PRESET;
@@ -488,6 +444,9 @@
//Test case 3.3: test setParameter(int, byte[]) / getParameter(int, byte[])
public void test3_3SetParameterIntByteArray() throws Exception {
+ if (!isEnvReverbAvailable()) {
+ return;
+ }
getEffect(AudioEffect.EFFECT_TYPE_ENV_REVERB, 0);
try {
int param = EnvironmentalReverb.PARAM_DECAY_TIME;
@@ -521,6 +480,9 @@
//Test case 3.4: test setParameter(int[], int[]) / getParameter(int[], int[])
public void test3_4SetParameterIntArrayIntArray() throws Exception {
+ if (!isEnvReverbAvailable()) {
+ return;
+ }
getEffect(AudioEffect.EFFECT_TYPE_ENV_REVERB, 0);
try {
int[] param = new int[1];
@@ -555,6 +517,9 @@
//Test case 3.5: test setParameter(int[], short[]) / getParameter(int[], short[])
public void test3_5SetParameterIntArrayShortArray() throws Exception {
+ if (!isPresetReverbAvailable()) {
+ return;
+ }
getEffect(AudioEffect.EFFECT_TYPE_PRESET_REVERB, 0);
try {
int[] param = new int[1];
@@ -586,6 +551,9 @@
//Test case 3.6: test setParameter(int[], byte[]) / getParameter(int[], byte[])
public void test3_6SetParameterIntArrayByteArray() throws Exception {
+ if (!isEnvReverbAvailable()) {
+ return;
+ }
getEffect(AudioEffect.EFFECT_TYPE_ENV_REVERB, 0);
try {
int[] param = new int[1];
@@ -620,6 +588,9 @@
//Test case 3.7: test setParameter() throws exception after release()
public void test3_7SetParameterAfterRelease() throws Exception {
+ if (!isPresetReverbAvailable()) {
+ return;
+ }
AudioEffect effect = null;
try {
effect = new AudioEffect(AudioEffect.EFFECT_TYPE_PRESET_REVERB,
@@ -645,6 +616,9 @@
//Test case 3.8: test getParameter() throws exception after release()
public void test3_8GetParameterAfterRelease() throws Exception {
+ if (!isPresetReverbAvailable()) {
+ return;
+ }
AudioEffect effect = null;
try {
effect = new AudioEffect(AudioEffect.EFFECT_TYPE_PRESET_REVERB,
@@ -675,6 +649,9 @@
//Test case 4.0: test control passed to higher priority client
public void test4_0setEnabledLowerPriority() throws Exception {
+ if (!hasAudioOutput()) {
+ return;
+ }
AudioEffect effect1 = null;
AudioEffect effect2 = null;
try {
@@ -712,6 +689,9 @@
//Test case 4.1: test control passed to higher priority client
public void test4_1setParameterLowerPriority() throws Exception {
+ if (!isPresetReverbAvailable()) {
+ return;
+ }
AudioEffect effect1 = null;
AudioEffect effect2 = null;
try {
@@ -761,7 +741,9 @@
//Test case 4.2: test control status listener
public void test4_2ControlStatusListener() throws Exception {
-
+ if (!isPresetReverbAvailable()) {
+ return;
+ }
synchronized(mLock) {
mHasControl = true;
mInitialized = false;
@@ -784,7 +766,9 @@
//Test case 4.3: test enable status listener
public void test4_3EnableStatusListener() throws Exception {
-
+ if (!isPresetReverbAvailable()) {
+ return;
+ }
synchronized(mLock) {
mInitialized = false;
createListenerLooper(false, true, false);
@@ -811,6 +795,9 @@
//Test case 4.4: test parameter changed listener
public void test4_4ParameterChangedListener() throws Exception {
+ if (!isPresetReverbAvailable()) {
+ return;
+ }
synchronized(mLock) {
mInitialized = false;
createListenerLooper(false, false, true);
@@ -844,6 +831,9 @@
//Test case 5.0: test command method
public void test5_0Command() throws Exception {
+ if (!isPresetReverbAvailable()) {
+ return;
+ }
getEffect(AudioEffect.EFFECT_TYPE_PRESET_REVERB, 0);
try {
byte[] cmd = new byte[0];
diff --git a/tests/tests/media/src/android/media/cts/BassBoostTest.java b/tests/tests/media/src/android/media/cts/BassBoostTest.java
index 9dcb4e9..c9bffd9 100644
--- a/tests/tests/media/src/android/media/cts/BassBoostTest.java
+++ b/tests/tests/media/src/android/media/cts/BassBoostTest.java
@@ -24,7 +24,7 @@
import android.test.AndroidTestCase;
import android.util.Log;
-public class BassBoostTest extends AndroidTestCase {
+public class BassBoostTest extends PostProcTestBase {
private String TAG = "BassBoostTest";
private final static short TEST_STRENGTH = 500;
@@ -34,13 +34,6 @@
private BassBoost mBassBoost = null;
private BassBoost mBassBoost2 = null;
- private int mSession = -1;
- private boolean mHasControl = false;
- private boolean mIsEnabled = false;
- private int mChangedParameter = -1;
- private boolean mInitialized = false;
- private Looper mLooper = null;
- private final Object mLock = new Object();
private ListenerThread mEffectListenerLooper = null;
//-----------------------------------------------------------------
@@ -53,10 +46,12 @@
//Test case 0.0: test constructor and release
public void test0_0ConstructorAndRelease() throws Exception {
+ if (!isBassBoostAvailable()) {
+ return;
+ }
BassBoost eq = null;
try {
eq = new BassBoost(0, 0);
- assertNotNull("could not create BassBoost", eq);
try {
assertTrue("invalid effect ID", (eq.getId() != 0));
} catch (IllegalStateException e) {
@@ -81,6 +76,9 @@
//Test case 1.0: test strength
public void test1_0Strength() throws Exception {
+ if (!isBassBoostAvailable()) {
+ return;
+ }
getBassBoost(0);
try {
if (mBassBoost.getStrengthSupported()) {
@@ -110,6 +108,9 @@
//Test case 1.1: test properties
public void test1_1Properties() throws Exception {
+ if (!isBassBoostAvailable()) {
+ return;
+ }
getBassBoost(0);
try {
BassBoost.Settings settings = mBassBoost.getProperties();
@@ -144,6 +145,9 @@
//Test case 1.2: test setStrength() throws exception after release
public void test1_2SetStrengthAfterRelease() throws Exception {
+ if (!isBassBoostAvailable()) {
+ return;
+ }
getBassBoost(0);
mBassBoost.release();
try {
@@ -162,6 +166,9 @@
//Test case 2.0: test setEnabled() and getEnabled() in valid state
public void test2_0SetEnabledGetEnabled() throws Exception {
+ if (!isBassBoostAvailable()) {
+ return;
+ }
getBassBoost(0);
try {
mBassBoost.setEnabled(true);
@@ -178,6 +185,9 @@
//Test case 2.1: test setEnabled() throws exception after release
public void test2_1SetEnabledAfterRelease() throws Exception {
+ if (!isBassBoostAvailable()) {
+ return;
+ }
getBassBoost(0);
mBassBoost.release();
try {
@@ -196,6 +206,9 @@
//Test case 3.0: test control status listener
public void test3_0ControlStatusListener() throws Exception {
+ if (!isBassBoostAvailable()) {
+ return;
+ }
synchronized(mLock) {
mHasControl = true;
mInitialized = false;
@@ -218,6 +231,9 @@
//Test case 3.1: test enable status listener
public void test3_1EnableStatusListener() throws Exception {
+ if (!isBassBoostAvailable()) {
+ return;
+ }
synchronized(mLock) {
mInitialized = false;
createListenerLooper(false, true, false);
@@ -242,6 +258,9 @@
//Test case 3.2: test parameter changed listener
public void test3_2ParameterChangedListener() throws Exception {
+ if (!isBassBoostAvailable()) {
+ return;
+ }
synchronized(mLock) {
mInitialized = false;
createListenerLooper(false, false, true);
@@ -413,5 +432,4 @@
mBassBoost2 = null;
}
}
-
}
\ No newline at end of file
diff --git a/tests/tests/media/src/android/media/cts/EnvReverbTest.java b/tests/tests/media/src/android/media/cts/EnvReverbTest.java
index edfef96..e2e9b6d 100644
--- a/tests/tests/media/src/android/media/cts/EnvReverbTest.java
+++ b/tests/tests/media/src/android/media/cts/EnvReverbTest.java
@@ -24,7 +24,7 @@
import android.test.AndroidTestCase;
import android.util.Log;
-public class EnvReverbTest extends AndroidTestCase {
+public class EnvReverbTest extends PostProcTestBase {
private String TAG = "EnvReverbTest";
private final static int MILLIBEL_TOLERANCE = 100; // +/-1dB
@@ -34,13 +34,6 @@
private EnvironmentalReverb mReverb = null;
private EnvironmentalReverb mReverb2 = null;
- private int mSession = -1;
- private boolean mHasControl = false;
- private boolean mIsEnabled = false;
- private int mChangedParameter = -1;
- private boolean mInitialized = false;
- private Looper mLooper = null;
- private final Object mLock = new Object();
private ListenerThread mEffectListenerLooper = null;
//-----------------------------------------------------------------
@@ -53,10 +46,12 @@
//Test case 0.0: test constructor and release
public void test0_0ConstructorAndRelease() throws Exception {
+ if (!isEnvReverbAvailable()) {
+ return;
+ }
EnvironmentalReverb envReverb = null;
try {
envReverb = new EnvironmentalReverb(0, 0);
- assertNotNull("could not create EnvironmentalReverb", envReverb);
try {
assertTrue("invalid effect ID", (envReverb.getId() != 0));
} catch (IllegalStateException e) {
@@ -80,6 +75,9 @@
//Test case 1.0: test room level and room HF level
public void test1_0Room() throws Exception {
+ if (!isEnvReverbAvailable()) {
+ return;
+ }
getReverb(0);
try {
short level = mReverb.getRoomLevel();
@@ -111,6 +109,9 @@
//Test case 1.1: test decay time and ratio
public void test1_1Decay() throws Exception {
+ if (!isEnvReverbAvailable()) {
+ return;
+ }
getReverb(0);
try {
int time = mReverb.getDecayTime();
@@ -142,6 +143,9 @@
//Test case 1.2: test reverb level and delay
public void test1_2Reverb() throws Exception {
+ if (!isEnvReverbAvailable()) {
+ return;
+ }
getReverb(0);
try {
short level = mReverb.getReverbLevel();
@@ -175,6 +179,9 @@
//Test case 1.3: test early reflections level and delay
public void test1_3Reflections() throws Exception {
+ if (!isEnvReverbAvailable()) {
+ return;
+ }
getReverb(0);
try {
// FIXME:uncomment actual test when early reflections are implemented in the reverb
@@ -213,6 +220,9 @@
//Test case 1.4: test diffusion and density
public void test1_4DiffusionAndDensity() throws Exception {
+ if (!isEnvReverbAvailable()) {
+ return;
+ }
getReverb(0);
try {
short ratio = mReverb.getDiffusion();
@@ -244,6 +254,9 @@
//Test case 1.5: test properties
public void test1_5Properties() throws Exception {
+ if (!isEnvReverbAvailable()) {
+ return;
+ }
getReverb(0);
try {
EnvironmentalReverb.Settings settings = mReverb.getProperties();
@@ -273,6 +286,9 @@
//Test case 2.0: test setEnabled() and getEnabled() in valid state
public void test2_0SetEnabledGetEnabled() throws Exception {
+ if (!isEnvReverbAvailable()) {
+ return;
+ }
getReverb(0);
try {
mReverb.setEnabled(true);
@@ -306,6 +322,9 @@
//Test case 3.0: test control status listener
public void test3_0ControlStatusListener() throws Exception {
+ if (!isEnvReverbAvailable()) {
+ return;
+ }
synchronized(mLock) {
mHasControl = true;
mInitialized = false;
@@ -328,6 +347,9 @@
//Test case 3.1: test enable status listener
public void test3_1EnableStatusListener() throws Exception {
+ if (!isEnvReverbAvailable()) {
+ return;
+ }
synchronized(mLock) {
mInitialized = false;
createListenerLooper(false, true, false);
@@ -352,6 +374,9 @@
//Test case 3.2: test parameter changed listener
public void test3_2ParameterChangedListener() throws Exception {
+ if (!isEnvReverbAvailable()) {
+ return;
+ }
synchronized(mLock) {
mInitialized = false;
createListenerLooper(false, false, true);
@@ -523,5 +548,4 @@
mReverb2 = null;
}
}
-
}
\ No newline at end of file
diff --git a/tests/tests/media/src/android/media/cts/EqualizerTest.java b/tests/tests/media/src/android/media/cts/EqualizerTest.java
index 3bc0d8e..15f0c73 100644
--- a/tests/tests/media/src/android/media/cts/EqualizerTest.java
+++ b/tests/tests/media/src/android/media/cts/EqualizerTest.java
@@ -24,7 +24,7 @@
import android.test.AndroidTestCase;
import android.util.Log;
-public class EqualizerTest extends AndroidTestCase {
+public class EqualizerTest extends PostProcTestBase {
private String TAG = "EqualizerTest";
private final static int MIN_NUMBER_OF_BANDS = 4;
@@ -37,13 +37,6 @@
private Equalizer mEqualizer = null;
private Equalizer mEqualizer2 = null;
- private int mSession = -1;
- private boolean mHasControl = false;
- private boolean mIsEnabled = false;
- private int mChangedParameter = -1;
- private boolean mInitialized = false;
- private Looper mLooper = null;
- private final Object mLock = new Object();
private ListenerThread mEffectListenerLooper = null;
//-----------------------------------------------------------------
@@ -56,10 +49,12 @@
//Test case 0.0: test constructor and release
public void test0_0ConstructorAndRelease() throws Exception {
+ if (!hasAudioOutput()) {
+ return;
+ }
Equalizer eq = null;
try {
eq = new Equalizer(0, 0);
- assertNotNull("could not create Equalizer", eq);
try {
assertTrue("invalid effect ID", (eq.getId() != 0));
} catch (IllegalStateException e) {
@@ -83,6 +78,9 @@
//Test case 1.0: test setBandLevel() and getBandLevel()
public void test1_0BandLevel() throws Exception {
+ if (!hasAudioOutput()) {
+ return;
+ }
getEqualizer(0);
try {
short numBands = mEqualizer.getNumberOfBands();
@@ -112,6 +110,9 @@
//Test case 1.1: test band frequency
public void test1_1BandFrequency() throws Exception {
+ if (!hasAudioOutput()) {
+ return;
+ }
getEqualizer(0);
try {
short band = mEqualizer.getBand(TEST_FREQUENCY_MILLIHERTZ);
@@ -137,6 +138,9 @@
//Test case 1.2: test presets
public void test1_2Presets() throws Exception {
+ if (!hasAudioOutput()) {
+ return;
+ }
getEqualizer(0);
try {
short numPresets = mEqualizer.getNumberOfPresets();
@@ -162,6 +166,9 @@
//Test case 1.3: test properties
public void test1_3Properties() throws Exception {
+ if (!hasAudioOutput()) {
+ return;
+ }
getEqualizer(0);
try {
Equalizer.Settings settings = mEqualizer.getProperties();
@@ -193,7 +200,9 @@
//Test case 1.4: test setBandLevel() throws exception after release
public void test1_4SetBandLevelAfterRelease() throws Exception {
-
+ if (!hasAudioOutput()) {
+ return;
+ }
getEqualizer(0);
mEqualizer.release();
try {
@@ -211,6 +220,9 @@
//Test case 2.0: test setEnabled() and getEnabled() in valid state
public void test2_0SetEnabledGetEnabled() throws Exception {
+ if (!hasAudioOutput()) {
+ return;
+ }
getEqualizer(0);
try {
mEqualizer.setEnabled(true);
@@ -227,7 +239,9 @@
//Test case 2.1: test setEnabled() throws exception after release
public void test2_1SetEnabledAfterRelease() throws Exception {
-
+ if (!hasAudioOutput()) {
+ return;
+ }
getEqualizer(0);
mEqualizer.release();
try {
@@ -245,6 +259,9 @@
//Test case 3.0: test control status listener
public void test3_0ControlStatusListener() throws Exception {
+ if (!hasAudioOutput()) {
+ return;
+ }
synchronized(mLock) {
mHasControl = true;
mInitialized = false;
@@ -267,6 +284,9 @@
//Test case 3.1: test enable status listener
public void test3_1EnableStatusListener() throws Exception {
+ if (!hasAudioOutput()) {
+ return;
+ }
synchronized(mLock) {
mInitialized = false;
createListenerLooper(false, true, false);
@@ -291,6 +311,9 @@
//Test case 3.2: test parameter changed listener
public void test3_2ParameterChangedListener() throws Exception {
+ if (!hasAudioOutput()) {
+ return;
+ }
synchronized(mLock) {
mInitialized = false;
createListenerLooper(false, false, true);
@@ -460,5 +483,4 @@
mEqualizer2 = null;
}
}
-
}
diff --git a/tests/tests/media/src/android/media/cts/MediaCodecListTest.java b/tests/tests/media/src/android/media/cts/MediaCodecListTest.java
index d8a20e9..865780e 100644
--- a/tests/tests/media/src/android/media/cts/MediaCodecListTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaCodecListTest.java
@@ -16,24 +16,38 @@
package android.media.cts;
-
+import android.content.pm.PackageManager;
import android.media.MediaCodec;
import android.media.MediaCodecInfo;
import android.media.MediaCodecInfo.CodecProfileLevel;
import android.media.MediaCodecInfo.CodecCapabilities;
+import android.media.MediaCodecInfo.AudioCapabilities;
+import android.media.MediaCodecInfo.VideoCapabilities;
+import android.media.MediaCodecInfo.EncoderCapabilities;
import android.media.MediaCodecList;
+import android.media.MediaFormat;
import android.test.AndroidTestCase;
import android.util.Log;
import java.io.File;
import java.io.IOException;
-import java.util.List;
import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
public class MediaCodecListTest extends AndroidTestCase {
private static final String TAG = "MediaCodecListTest";
private static final String MEDIA_CODEC_XML_FILE = "/etc/media_codecs.xml";
+ private final MediaCodecList mRegularCodecs =
+ new MediaCodecList(MediaCodecList.REGULAR_CODECS);
+ private final MediaCodecList mAllCodecs =
+ new MediaCodecList(MediaCodecList.ALL_CODECS);
+ private final MediaCodecInfo[] mRegularInfos =
+ mRegularCodecs.getCodecInfos();
+ private final MediaCodecInfo[] mAllInfos =
+ mAllCodecs.getCodecInfos();
class CodecType {
CodecType(String type, boolean isEncoder) {
@@ -55,55 +69,120 @@
assertTrue("/etc/media_codecs.xml does not exist", file.exists());
}
- // Each component advertised by MediaCodecList should at least be
- // instantiate-able.
- public void testComponentInstantiation() throws IOException {
- Log.d(TAG, "testComponentInstantiation");
+ private MediaCodecInfo[] getLegacyInfos() {
+ Log.d(TAG, "getLegacyInfos");
int codecCount = MediaCodecList.getCodecCount();
- for (int i = 0; i < codecCount; ++i) {
- MediaCodecInfo info = MediaCodecList.getCodecInfoAt(i);
+ MediaCodecInfo[] res = new MediaCodecInfo[codecCount];
- Log.d(TAG, (i + 1) + ": " + info.getName());
+ for (int i = 0; i < codecCount; ++i) {
+ res[i] = MediaCodecList.getCodecInfoAt(i);
+ }
+ return res;
+ }
+
+ public void assertEqualsOrSuperset(Set big, Set tiny, boolean superset) {
+ if (!superset) {
+ assertEquals(big, tiny);
+ } else {
+ assertTrue(big.containsAll(tiny));
+ }
+ }
+
+ private static <T> Set<T> asSet(T[] array) {
+ Set<T> s = new HashSet<T>();
+ for (T el : array) {
+ s.add(el);
+ }
+ return s;
+ }
+
+ private static Set<Integer> asSet(int[] array) {
+ Set<Integer> s = new HashSet<Integer>();
+ for (int el : array) {
+ s.add(el);
+ }
+ return s;
+ }
+
+ public void assertEqualsOrSuperset(
+ CodecCapabilities big, CodecCapabilities tiny, boolean superset) {
+ // ordering of enumerations may differ
+ assertEqualsOrSuperset(asSet(big.colorFormats), asSet(tiny.colorFormats), superset);
+ assertEqualsOrSuperset(asSet(big.profileLevels), asSet(tiny.profileLevels), superset);
+ AudioCapabilities bigAudCaps = big.getAudioCapabilities();
+ VideoCapabilities bigVidCaps = big.getVideoCapabilities();
+ EncoderCapabilities bigEncCaps = big.getEncoderCapabilities();
+ AudioCapabilities tinyAudCaps = tiny.getAudioCapabilities();
+ VideoCapabilities tinyVidCaps = tiny.getVideoCapabilities();
+ EncoderCapabilities tinyEncCaps = tiny.getEncoderCapabilities();
+ assertEquals(bigAudCaps != null, tinyAudCaps != null);
+ assertEquals(bigAudCaps != null, tinyAudCaps != null);
+ assertEquals(bigAudCaps != null, tinyAudCaps != null);
+ }
+
+ public void assertEqualsOrSuperset(
+ MediaCodecInfo big, MediaCodecInfo tiny, boolean superset) {
+ assertEquals(big.getName(), tiny.getName());
+ assertEquals(big.isEncoder(), tiny.isEncoder());
+ assertEqualsOrSuperset(
+ asSet(big.getSupportedTypes()), asSet(tiny.getSupportedTypes()), superset);
+ for (String type : big.getSupportedTypes()) {
+ assertEqualsOrSuperset(
+ big.getCapabilitiesForType(type),
+ tiny.getCapabilitiesForType(type),
+ superset);
+ }
+ }
+
+ public void assertSuperset(MediaCodecInfo big, MediaCodecInfo tiny) {
+ assertEqualsOrSuperset(big, tiny, true /* superset */);
+ }
+
+ public void assertEquals(MediaCodecInfo big, MediaCodecInfo tiny) {
+ assertEqualsOrSuperset(big, tiny, false /* superset */);
+ }
+
+ // Each component advertised by MediaCodecList should at least be
+ // instantiable.
+ private void testComponentInstantiation(MediaCodecInfo[] infos) throws IOException {
+ for (MediaCodecInfo info : infos) {
+ Log.d(TAG, "codec: " + info.getName());
Log.d(TAG, " isEncoder = " + info.isEncoder());
- if (!info.getName().startsWith("OMX.")) {
- // Unfortunately for legacy reasons, "AACEncoder", a
- // non OMX component had to be in this list for the video
- // editor code to work... but it cannot actually be instantiated
- // using MediaCodec.
- Log.d(TAG, " skipping...");
- continue;
- }
-
MediaCodec codec = MediaCodec.createByCodecName(info.getName());
+ assertEquals(codec.getName(), info.getName());
+
+ assertEquals(codec.getCodecInfo(), info);
+
codec.release();
codec = null;
}
}
+ public void testRegularComponentInstantiation() throws IOException {
+ Log.d(TAG, "testRegularComponentInstantiation");
+ testComponentInstantiation(mRegularInfos);
+ }
+
+ public void testAllComponentInstantiation() throws IOException {
+ Log.d(TAG, "testAllComponentInstantiation");
+ testComponentInstantiation(mAllInfos);
+ }
+
+ public void testLegacyComponentInstantiation() throws IOException {
+ Log.d(TAG, "testLegacyComponentInstantiation");
+ testComponentInstantiation(getLegacyInfos());
+ }
+
// For each type advertised by any of the components we should be able
// to get capabilities.
- public void testGetCapabilities() {
- Log.d(TAG, "testGetCapabilities");
-
- int codecCount = MediaCodecList.getCodecCount();
- for (int i = 0; i < codecCount; ++i) {
- MediaCodecInfo info = MediaCodecList.getCodecInfoAt(i);
-
- Log.d(TAG, (i + 1) + ": " + info.getName());
+ private void testGetCapabilities(MediaCodecInfo[] infos) {
+ for (MediaCodecInfo info : infos) {
+ Log.d(TAG, "codec: " + info.getName());
Log.d(TAG, " isEncoder = " + info.isEncoder());
- if (!info.getName().startsWith("OMX.")) {
- // Unfortunately for legacy reasons, "AACEncoder", a
- // non OMX component had to be in this list for the video
- // editor code to work... but it cannot actually be instantiated
- // using MediaCodec.
- Log.d(TAG, " skipping...");
- continue;
- }
-
String[] types = info.getSupportedTypes();
for (int j = 0; j < types.length; ++j) {
Log.d(TAG, "calling getCapabilitiesForType " + types[j]);
@@ -112,14 +191,71 @@
}
}
+ public void testGetRegularCapabilities() {
+ Log.d(TAG, "testGetRegularCapabilities");
+ testGetCapabilities(mRegularInfos);
+ }
+
+ public void testGetAllCapabilities() {
+ Log.d(TAG, "testGetAllCapabilities");
+ testGetCapabilities(mAllInfos);
+ }
+
+ public void testGetLegacyCapabilities() {
+ Log.d(TAG, "testGetLegacyCapabilities");
+ testGetCapabilities(getLegacyInfos());
+ }
+
+ public void testLegacyMediaCodecListIsSameAsRegular() {
+ // regular codecs should be equivalent to legacy codecs, including
+ // codec ordering
+ MediaCodecInfo[] legacyInfos = getLegacyInfos();
+ assertEquals(legacyInfos.length, mRegularInfos.length);
+ for (int i = 0; i < legacyInfos.length; ++i) {
+ assertEquals(legacyInfos[i], mRegularInfos[i]);
+ }
+ }
+
+ public void testRegularMediaCodecListIsASubsetOfAll() {
+ Log.d(TAG, "testRegularMediaCodecListIsASubsetOfAll");
+ // regular codecs should be a subsequence of all codecs, including
+ // codec ordering
+ int ix = 0;
+ for (MediaCodecInfo info : mAllInfos) {
+ if (ix == mRegularInfos.length) {
+ break;
+ }
+ if (!mRegularInfos[ix].getName().equals(info.getName())) {
+ Log.d(TAG, "skipping non-regular codec " + info.getName());
+ continue;
+ }
+ Log.d(TAG, "checking codec " + info.getName());
+ assertSuperset(info, mRegularInfos[ix]);
+ ++ix;
+ }
+ assertEquals(
+ "some regular codecs are not listed in all codecs", ix, mRegularInfos.length);
+ }
+
public void testRequiredMediaCodecList() {
List<CodecType> requiredList = getRequiredCodecTypes();
List<CodecType> supportedList = getSupportedCodecTypes();
assertTrue(areRequiredCodecTypesSupported(requiredList, supportedList));
}
+ private boolean hasCamera() {
+ PackageManager pm = getContext().getPackageManager();
+ return pm.hasSystemFeature(pm.FEATURE_CAMERA_FRONT) ||
+ pm.hasSystemFeature(pm.FEATURE_CAMERA);
+ }
+
// H263 baseline profile must be supported
public void testIsH263BaselineProfileSupported() {
+ if (!hasCamera()) {
+ Log.d(TAG, "not required without camera");
+ return;
+ }
+
int profile = CodecProfileLevel.H263ProfileBaseline;
assertTrue(checkProfileSupported("video/3gpp", false, profile));
assertTrue(checkProfileSupported("video/3gpp", true, profile));
@@ -140,6 +276,11 @@
// MPEG4 simple profile must be supported
public void testIsM4VSimpleProfileSupported() {
+ if (!hasCamera()) {
+ Log.d(TAG, "not required without camera");
+ return;
+ }
+
int profile = CodecProfileLevel.MPEG4ProfileSimple;
assertTrue(checkProfileSupported("video/mp4v-es", false, profile));
@@ -151,26 +292,24 @@
* Find whether the given codec is supported
*/
private boolean checkProfileSupported(
- String codecName, boolean isEncoder, int profile) {
+ String mime, boolean isEncoder, int profile) {
+ return profileIsListed(mime, isEncoder, profile) &&
+ codecCanBeFound(mime, isEncoder);
+ }
- boolean isSupported = false;
+ private boolean profileIsListed(
+ String mime, boolean isEncoder, int profile) {
- int codecCount = MediaCodecList.getCodecCount();
- for (int i = 0; i < codecCount; ++i) {
-
- MediaCodecInfo info = MediaCodecList.getCodecInfoAt(i);
- String[] types = info.getSupportedTypes();
-
+ for (MediaCodecInfo info : mRegularInfos) {
if (isEncoder != info.isEncoder()) {
continue;
}
- for (int j = 0; j < types.length; ++j) {
- if (types[j].compareTo(codecName) == 0) {
- CodecCapabilities cap = info.getCapabilitiesForType(types[j]);
- CodecProfileLevel[] profileLevels = cap.profileLevels;
- for (int k = 0; k < profileLevels.length; ++k) {
- if (profileLevels[k].profile == profile) {
+ for (String type : info.getSupportedTypes()) {
+ if (type.equalsIgnoreCase(mime)) {
+ CodecCapabilities cap = info.getCapabilitiesForType(type);
+ for (CodecProfileLevel pl : cap.profileLevels) {
+ if (pl.profile == profile) {
return true;
}
}
@@ -180,6 +319,16 @@
return false;
}
+ // Find whether the given codec can be found using MediaCodecList.find methods.
+ private boolean codecCanBeFound(String mime, boolean isEncoder) {
+ // implicit assumption that QVGA video is always valid.
+ MediaFormat format = MediaFormat.createVideoFormat(mime, 176, 144);
+ String codecName = isEncoder
+ ? mRegularCodecs.findEncoderForFormat(format)
+ : mRegularCodecs.findDecoderForFormat(format);
+ return codecName != null;
+ }
+
/*
* Find whether all required media codec types are supported
*/
@@ -206,11 +355,8 @@
* Find all the media codec types are supported.
*/
private List<CodecType> getSupportedCodecTypes() {
- int codecCount = MediaCodecList.getCodecCount();
- assertTrue("Unexpected media codec count", codecCount > 0);
- List<CodecType> supportedList = new ArrayList<CodecType>(codecCount);
- for (int i = 0; i < codecCount; ++i) {
- MediaCodecInfo info = MediaCodecList.getCodecInfoAt(i);
+ List<CodecType> supportedList = new ArrayList<CodecType>();
+ for (MediaCodecInfo info : mRegularInfos) {
String[] types = info.getSupportedTypes();
assertTrue("Unexpected number of supported types", types.length > 0);
boolean isEncoder = info.isEncoder();
diff --git a/tests/tests/media/src/android/media/cts/PostProcTestBase.java b/tests/tests/media/src/android/media/cts/PostProcTestBase.java
new file mode 100644
index 0000000..b034763
--- /dev/null
+++ b/tests/tests/media/src/android/media/cts/PostProcTestBase.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.media.cts;
+
+import android.content.pm.PackageManager;
+import android.media.audiofx.AudioEffect;
+import android.os.Looper;
+import android.test.AndroidTestCase;
+
+public class PostProcTestBase extends AndroidTestCase {
+ protected int mSession = -1;
+ protected boolean mHasControl = false;
+ protected boolean mIsEnabled = false;
+ protected boolean mInitialized = false;
+ protected Looper mLooper = null;
+ protected final Object mLock = new Object();
+ protected int mChangedParameter = -1;
+
+ protected boolean hasAudioOutput() {
+ return getContext().getPackageManager().hasSystemFeature(
+ PackageManager.FEATURE_AUDIO_OUTPUT);
+ }
+
+ protected boolean isBassBoostAvailable() {
+ if (!hasAudioOutput()) {
+ return false;
+ }
+ return AudioEffect.isEffectTypeAvailable(AudioEffect.EFFECT_TYPE_BASS_BOOST);
+ }
+
+ protected boolean isVirtualizerAvailable() {
+ if (!hasAudioOutput()) {
+ return false;
+ }
+ return AudioEffect.isEffectTypeAvailable(AudioEffect.EFFECT_TYPE_VIRTUALIZER);
+ }
+
+ protected boolean isPresetReverbAvailable() {
+ if (!hasAudioOutput()) {
+ return false;
+ }
+ return AudioEffect.isEffectTypeAvailable(AudioEffect.EFFECT_TYPE_PRESET_REVERB);
+ }
+
+ protected boolean isEnvReverbAvailable() {
+ if (!hasAudioOutput()) {
+ return false;
+ }
+ return AudioEffect.isEffectTypeAvailable(AudioEffect.EFFECT_TYPE_ENV_REVERB);
+ }
+}
diff --git a/tests/tests/media/src/android/media/cts/PresetReverbTest.java b/tests/tests/media/src/android/media/cts/PresetReverbTest.java
index d69256c..ba6d08c 100644
--- a/tests/tests/media/src/android/media/cts/PresetReverbTest.java
+++ b/tests/tests/media/src/android/media/cts/PresetReverbTest.java
@@ -24,7 +24,7 @@
import android.test.AndroidTestCase;
import android.util.Log;
-public class PresetReverbTest extends AndroidTestCase {
+public class PresetReverbTest extends PostProcTestBase {
private String TAG = "PresetReverbTest";
private final static short FIRST_PRESET = PresetReverb.PRESET_NONE;
@@ -33,13 +33,6 @@
private PresetReverb mReverb = null;
private PresetReverb mReverb2 = null;
- private int mSession = -1;
- private boolean mHasControl = false;
- private boolean mIsEnabled = false;
- private int mChangedParameter = -1;
- private boolean mInitialized = false;
- private Looper mLooper = null;
- private final Object mLock = new Object();
private ListenerThread mEffectListenerLooper = null;
//-----------------------------------------------------------------
@@ -52,10 +45,12 @@
//Test case 0.0: test constructor and release
public void test0_0ConstructorAndRelease() throws Exception {
+ if (!isPresetReverbAvailable()) {
+ return;
+ }
PresetReverb reverb = null;
try {
reverb = new PresetReverb(0, 0);
- assertNotNull("could not create PresetReverb", reverb);
try {
assertTrue("invalid effect ID", (reverb.getId() != 0));
} catch (IllegalStateException e) {
@@ -78,6 +73,9 @@
//Test case 1.0: test presets
public void test1_0Presets() throws Exception {
+ if (!isPresetReverbAvailable()) {
+ return;
+ }
getReverb(0);
try {
for (short preset = FIRST_PRESET;
@@ -99,6 +97,9 @@
//Test case 1.1: test properties
public void test1_1Properties() throws Exception {
+ if (!isPresetReverbAvailable()) {
+ return;
+ }
getReverb(0);
try {
PresetReverb.Settings settings = mReverb.getProperties();
@@ -127,6 +128,9 @@
//Test case 2.0: test setEnabled() and getEnabled() in valid state
public void test2_0SetEnabledGetEnabled() throws Exception {
+ if (!isPresetReverbAvailable()) {
+ return;
+ }
getReverb(0);
try {
mReverb.setEnabled(true);
@@ -142,6 +146,9 @@
//Test case 2.1: test setEnabled() throws exception after release
public void test2_1SetEnabledAfterRelease() throws Exception {
+ if (!isPresetReverbAvailable()) {
+ return;
+ }
getReverb(0);
mReverb.release();
try {
@@ -159,6 +166,9 @@
//Test case 3.0: test control status listener
public void test3_0ControlStatusListener() throws Exception {
+ if (!isPresetReverbAvailable()) {
+ return;
+ }
synchronized(mLock) {
mHasControl = true;
mInitialized = false;
@@ -181,6 +191,9 @@
//Test case 3.1: test enable status listener
public void test3_1EnableStatusListener() throws Exception {
+ if (!isPresetReverbAvailable()) {
+ return;
+ }
synchronized(mLock) {
mInitialized = false;
createListenerLooper(false, true, false);
@@ -205,6 +218,9 @@
//Test case 3.2: test parameter changed listener
public void test3_2ParameterChangedListener() throws Exception {
+ if (!isPresetReverbAvailable()) {
+ return;
+ }
synchronized(mLock) {
mInitialized = false;
createListenerLooper(false, false, true);
@@ -377,5 +393,4 @@
mReverb2 = null;
}
}
-
}
\ No newline at end of file
diff --git a/tests/tests/media/src/android/media/cts/VirtualizerTest.java b/tests/tests/media/src/android/media/cts/VirtualizerTest.java
index cac97b3..51adf1d 100644
--- a/tests/tests/media/src/android/media/cts/VirtualizerTest.java
+++ b/tests/tests/media/src/android/media/cts/VirtualizerTest.java
@@ -24,7 +24,7 @@
import android.test.AndroidTestCase;
import android.util.Log;
-public class VirtualizerTest extends AndroidTestCase {
+public class VirtualizerTest extends PostProcTestBase {
private String TAG = "VirtualizerTest";
private final static short TEST_STRENGTH = 500;
@@ -34,13 +34,6 @@
private Virtualizer mVirtualizer = null;
private Virtualizer mVirtualizer2 = null;
- private int mSession = -1;
- private boolean mHasControl = false;
- private boolean mIsEnabled = false;
- private int mChangedParameter = -1;
- private boolean mInitialized = false;
- private Looper mLooper = null;
- private final Object mLock = new Object();
private ListenerThread mEffectListenerLooper = null;
//-----------------------------------------------------------------
@@ -60,7 +53,6 @@
Virtualizer eq = null;
try {
eq = new Virtualizer(0, 0);
- assertNotNull(" could not create Virtualizer", eq);
try {
assertTrue(" invalid effect ID", (eq.getId() != 0));
} catch (IllegalStateException e) {
@@ -299,10 +291,6 @@
// private methods
//----------------------------------
- private boolean isVirtualizerAvailable() {
- return AudioEffect.isEffectTypeAvailable(AudioEffect.EFFECT_TYPE_VIRTUALIZER);
- }
-
private void getVirtualizer(int session) {
if (mVirtualizer == null || session != mSession) {
if (session != mSession && mVirtualizer != null) {
diff --git a/tests/tests/media/src/android/media/cts/VisualizerTest.java b/tests/tests/media/src/android/media/cts/VisualizerTest.java
index e2a9fdd..8c91e9b 100644
--- a/tests/tests/media/src/android/media/cts/VisualizerTest.java
+++ b/tests/tests/media/src/android/media/cts/VisualizerTest.java
@@ -24,7 +24,7 @@
import android.test.AndroidTestCase;
import android.util.Log;
-public class VisualizerTest extends AndroidTestCase {
+public class VisualizerTest extends PostProcTestBase {
private String TAG = "VisualizerTest";
private final static int MIN_CAPTURE_RATE_MAX = 10000; // 10Hz
@@ -33,10 +33,6 @@
private final static int MAX_LOOPER_WAIT_COUNT = 10;
private Visualizer mVisualizer = null;
- private int mSession = -1;
- private boolean mInitialized = false;
- private Looper mLooper = null;
- private final Object mLock = new Object();
private byte[] mWaveform = null;
private byte[] mFft = null;
private boolean mCaptureWaveform = false;
@@ -53,10 +49,12 @@
//Test case 0.0: test constructor and release
public void test0_0ConstructorAndRelease() throws Exception {
+ if (!hasAudioOutput()) {
+ return;
+ }
Visualizer visualizer = null;
- try {
+ try {
visualizer = new Visualizer(0);
- assertNotNull("could not create Visualizer", visualizer);
} catch (IllegalArgumentException e) {
fail("Visualizer not found");
} catch (UnsupportedOperationException e) {
@@ -75,6 +73,9 @@
//Test case 1.0: capture rates
public void test1_0CaptureRates() throws Exception {
+ if (!hasAudioOutput()) {
+ return;
+ }
getVisualizer(0);
try {
int captureRate = mVisualizer.getMaxCaptureRate();
@@ -94,6 +95,9 @@
//Test case 1.1: test capture size
public void test1_1CaptureSize() throws Exception {
+ if (!hasAudioOutput()) {
+ return;
+ }
getVisualizer(0);
try {
int[] range = mVisualizer.getCaptureSizeRange();
@@ -124,6 +128,9 @@
//Test case 2.0: test cature in polling mode
public void test2_0PollingCapture() throws Exception {
+ if (!hasAudioOutput()) {
+ return;
+ }
try {
getVisualizer(0);
mVisualizer.setEnabled(true);
@@ -151,6 +158,9 @@
//Test case 2.1: test capture with listener
public void test2_1ListenerCapture() throws Exception {
+ if (!hasAudioOutput()) {
+ return;
+ }
try {
getVisualizer(0);
synchronized(mLock) {
diff --git a/tests/tests/rscpp/Android.mk b/tests/tests/rscpp/Android.mk
index 60adc05..0eb32b5 100644
--- a/tests/tests/rscpp/Android.mk
+++ b/tests/tests/rscpp/Android.mk
@@ -31,7 +31,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner
LOCAL_JNI_SHARED_LIBRARIES := librscpptest_jni
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src)
LOCAL_SDK_VERSION := current
diff --git a/tests/tests/rscpp/src/android/cts/rscpp/RS3DLUTTest.java b/tests/tests/rscpp/src/android/cts/rscpp/RS3DLUTTest.java
index 470593c..f278835 100644
--- a/tests/tests/rscpp/src/android/cts/rscpp/RS3DLUTTest.java
+++ b/tests/tests/rscpp/src/android/cts/rscpp/RS3DLUTTest.java
@@ -39,7 +39,6 @@
RSUtils.genRandom(0x419144, 255, 1, -128, baseAlloc);
int[] colorCube = new int[lutSize * lutSize * lutSize * 4];
RSUtils.genRandom(0x555007, 255, 1, -128, colorCube);
- RenderScript mRS = RenderScript.create(getContext());
byte[] byteAlloc = new byte[X * Y * 4];
byte[] byteColorCube = new byte[lutSize * lutSize * lutSize * 4];
for (int i = 0; i < X * Y * 4; i++) {
@@ -49,7 +48,6 @@
byteColorCube[i] = (byte)colorCube[i];
}
-
Type.Builder build = new Type.Builder(mRS, Element.RGBA_8888(mRS));
build.setX(X);
build.setY(Y);
@@ -58,10 +56,10 @@
rsInput.copyFromUnchecked(byteAlloc);
Type.Builder buildCube = new Type.Builder(mRS, Element.RGBA_8888(mRS));
- build.setX(lutSize);
- build.setY(lutSize);
- build.setZ(lutSize);
- Allocation cube = Allocation.createTyped(mRS, build.create());
+ buildCube.setX(lutSize);
+ buildCube.setY(lutSize);
+ buildCube.setZ(lutSize);
+ Allocation cube = Allocation.createTyped(mRS, buildCube.create());
cube.copyFromUnchecked(byteColorCube);
ScriptIntrinsic3DLUT lut = ScriptIntrinsic3DLUT.create(mRS, Element.RGBA_8888(mRS));
@@ -70,12 +68,12 @@
byte[] nativeByteAlloc = new byte[X * Y * 4];
lutTest(this.getContext().getCacheDir().toString(), X, Y, lutSize, byteAlloc, byteColorCube, nativeByteAlloc);
- rsOutput.copyTo(byteAlloc);
- for (int i = 0; i < X * Y * 4; i++) {
- assertTrue(byteAlloc[i] == nativeByteAlloc[i]);
- }
+ Allocation rsCppOutput = Allocation.createTyped(mRS, build.create());
+ rsCppOutput.copyFromUnchecked(nativeByteAlloc);
+ mVerify.invoke_verify(rsOutput, rsCppOutput, rsInput);
+ checkForErrors();
}
-}
\ No newline at end of file
+}
diff --git a/tests/tests/rscpp/src/android/cts/rscpp/RSBlendTest.java b/tests/tests/rscpp/src/android/cts/rscpp/RSBlendTest.java
index 025d470..1c6dc51 100644
--- a/tests/tests/rscpp/src/android/cts/rscpp/RSBlendTest.java
+++ b/tests/tests/rscpp/src/android/cts/rscpp/RSBlendTest.java
@@ -36,7 +36,6 @@
for (int iter = 0; iter < 15; iter++) {
int[] baseAlloc = new int[X * Y * 4];
RSUtils.genRandom(0x789321, 255, 1, -128, baseAlloc);
- RenderScript mRS = RenderScript.create(getContext());
byte[] byteAlloc = new byte[X * Y * 4];
for (int i = 0; i < X * Y * 4; i++) {
byteAlloc[i] = (byte)baseAlloc[i];
@@ -110,12 +109,11 @@
}
blendTest(this.getContext().getCacheDir().toString(), X, Y, byteAlloc, byteAlloc2, iter);
- rsOutput.copyTo(byteAlloc);
- for (int i = 0; i < X * Y * 4; i++) {
- assertTrue(byteAlloc[i] == byteAlloc2[i]);
- }
- mRS.destroy();
+ Allocation rsCppOutput = Allocation.createTyped(mRS, build.create());
+ rsCppOutput.copyFromUnchecked(byteAlloc2);
+ mVerify.invoke_verify(rsOutput, rsCppOutput, rsInput);
+ checkForErrors();
}
}
diff --git a/tests/tests/rscpp/src/android/cts/rscpp/RSBlurTest.java b/tests/tests/rscpp/src/android/cts/rscpp/RSBlurTest.java
index 70f15fc..34bb7ad 100644
--- a/tests/tests/rscpp/src/android/cts/rscpp/RSBlurTest.java
+++ b/tests/tests/rscpp/src/android/cts/rscpp/RSBlurTest.java
@@ -35,7 +35,6 @@
public void testRSBlurOneChannel() {
int[] baseAlloc = new int[X * Y];
RSUtils.genRandom(0x1DEFF, 255, 1, -128, baseAlloc);
- RenderScript mRS = RenderScript.create(getContext());
byte[] byteAlloc = new byte[X * Y];
for (int i = 0; i < X * Y; i++) {
byteAlloc[i] = (byte)baseAlloc[i];
@@ -54,19 +53,17 @@
byte[] nativeByteAlloc = new byte[X * Y];
blurTest(this.getContext().getCacheDir().toString(), X, Y, byteAlloc, nativeByteAlloc, true);
- rsOutput.copyTo(byteAlloc);
- for (int i = 0; i < X * Y; i++) {
- assertTrue(byteAlloc[i] == nativeByteAlloc[i]);
- }
-
+ Allocation rsCppOutput = Allocation.createTyped(mRS, build.create());
+ rsCppOutput.copyFromUnchecked(nativeByteAlloc);
+ mVerify.invoke_verify(rsOutput, rsCppOutput, rsInput);
+ checkForErrors();
}
public void testRSBlurFourChannels() {
int[] baseAlloc = new int[X * Y * 4];
RSUtils.genRandom(0xFAFADE10, 255, 1, -128, baseAlloc);
- RenderScript mRS = RenderScript.create(getContext());
byte[] byteAlloc = new byte[X * Y * 4];
for (int i = 0; i < X * Y * 4; i++) {
byteAlloc[i] = (byte)baseAlloc[i];
@@ -85,13 +82,12 @@
byte[] nativeByteAlloc = new byte[X * Y * 4];
blurTest(this.getContext().getCacheDir().toString(), X, Y, byteAlloc, nativeByteAlloc, false);
- rsOutput.copyTo(byteAlloc);
- for (int i = 0; i < X * Y * 4; i++) {
- assertTrue(byteAlloc[i] == nativeByteAlloc[i]);
- }
-
+ Allocation rsCppOutput = Allocation.createTyped(mRS, build.create());
+ rsCppOutput.copyFromUnchecked(nativeByteAlloc);
+ mVerify.invoke_verify(rsOutput, rsCppOutput, rsInput);
+ checkForErrors();
}
-}
\ No newline at end of file
+}
diff --git a/tests/tests/rscpp/src/android/cts/rscpp/RSColorMatrixTest.java b/tests/tests/rscpp/src/android/cts/rscpp/RSColorMatrixTest.java
index efa28bb..5260ed9 100644
--- a/tests/tests/rscpp/src/android/cts/rscpp/RSColorMatrixTest.java
+++ b/tests/tests/rscpp/src/android/cts/rscpp/RSColorMatrixTest.java
@@ -35,7 +35,6 @@
public void testRSColorMatrix0() {
int[] baseAlloc = new int[X * Y * 4];
RSUtils.genRandom(0x251107, 255, 1, -128, baseAlloc);
- RenderScript mRS = RenderScript.create(getContext());
byte[] byteAlloc = new byte[X * Y * 4];
for (int i = 0; i < X * Y * 4; i++) {
byteAlloc[i] = (byte)baseAlloc[i];
@@ -66,18 +65,16 @@
byte[] nativeByteAlloc = new byte[X * Y * 4];
colorMatrixTest(this.getContext().getCacheDir().toString(), X, Y, byteAlloc, nativeByteAlloc, coeffs, 0);
- rsOutput.copyTo(byteAlloc);
- for (int i = 0; i < X * Y * 4; i++) {
- assertTrue(byteAlloc[i] == nativeByteAlloc[i]);
- }
-
+ Allocation rsCppOutput = Allocation.createTyped(mRS, build.create());
+ rsCppOutput.copyFromUnchecked(nativeByteAlloc);
+ mVerify.invoke_verify(rsOutput, rsCppOutput, rsInput);
+ checkForErrors();
}
public void testRSColorMatrix1() {
int[] baseAlloc = new int[X * Y * 4];
RSUtils.genRandom(0x251106, 255, 1, -128, baseAlloc);
- RenderScript mRS = RenderScript.create(getContext());
byte[] byteAlloc = new byte[X * Y * 4];
for (int i = 0; i < X * Y * 4; i++) {
byteAlloc[i] = (byte)baseAlloc[i];
@@ -98,18 +95,17 @@
byte[] nativeByteAlloc = new byte[X * Y * 4];
colorMatrixTest(this.getContext().getCacheDir().toString(), X, Y, byteAlloc, nativeByteAlloc, coeffs, 1);
- rsOutput.copyTo(byteAlloc);
- for (int i = 0; i < X * Y * 4; i++) {
- assertTrue(byteAlloc[i] == nativeByteAlloc[i]);
- }
+ Allocation rsCppOutput = Allocation.createTyped(mRS, build.create());
+ rsCppOutput.copyFromUnchecked(nativeByteAlloc);
+ mVerify.invoke_verify(rsOutput, rsCppOutput, rsInput);
+ checkForErrors();
}
public void testRSColorMatrix2() {
int[] baseAlloc = new int[X * Y * 4];
RSUtils.genRandom(0x251105, 255, 1, -128, baseAlloc);
- RenderScript mRS = RenderScript.create(getContext());
byte[] byteAlloc = new byte[X * Y * 4];
for (int i = 0; i < X * Y * 4; i++) {
byteAlloc[i] = (byte)baseAlloc[i];
@@ -134,18 +130,17 @@
byte[] nativeByteAlloc = new byte[X * Y * 4];
colorMatrixTest(this.getContext().getCacheDir().toString(), X, Y, byteAlloc, nativeByteAlloc, coeffs, 2);
- rsOutput.copyTo(byteAlloc);
- for (int i = 0; i < X * Y * 4; i++) {
- assertTrue(byteAlloc[i] == nativeByteAlloc[i]);
- }
+ Allocation rsCppOutput = Allocation.createTyped(mRS, build.create());
+ rsCppOutput.copyFromUnchecked(nativeByteAlloc);
+ mVerify.invoke_verify(rsOutput, rsCppOutput, rsInput);
+ checkForErrors();
}
public void testRSColorMatrix3() {
int[] baseAlloc = new int[X * Y * 4];
RSUtils.genRandom(0x251104, 255, 1, -128, baseAlloc);
- RenderScript mRS = RenderScript.create(getContext());
byte[] byteAlloc = new byte[X * Y * 4];
for (int i = 0; i < X * Y * 4; i++) {
byteAlloc[i] = (byte)baseAlloc[i];
@@ -166,18 +161,17 @@
byte[] nativeByteAlloc = new byte[X * Y * 4];
colorMatrixTest(this.getContext().getCacheDir().toString(), X, Y, byteAlloc, nativeByteAlloc, coeffs, 3);
- rsOutput.copyTo(byteAlloc);
- for (int i = 0; i < X * Y * 4; i++) {
- assertTrue(byteAlloc[i] == nativeByteAlloc[i]);
- }
+ Allocation rsCppOutput = Allocation.createTyped(mRS, build.create());
+ rsCppOutput.copyFromUnchecked(nativeByteAlloc);
+ mVerify.invoke_verify(rsOutput, rsCppOutput, rsInput);
+ checkForErrors();
}
public void testRSColorMatrix4() {
int[] baseAlloc = new int[X * Y * 4];
RSUtils.genRandom(0x251103, 255, 1, -128, baseAlloc);
- RenderScript mRS = RenderScript.create(getContext());
byte[] byteAlloc = new byte[X * Y * 4];
for (int i = 0; i < X * Y * 4; i++) {
byteAlloc[i] = (byte)baseAlloc[i];
@@ -198,12 +192,12 @@
byte[] nativeByteAlloc = new byte[X * Y * 4];
colorMatrixTest(this.getContext().getCacheDir().toString(), X, Y, byteAlloc, nativeByteAlloc, coeffs, 4);
- rsOutput.copyTo(byteAlloc);
- for (int i = 0; i < X * Y * 4; i++) {
- assertTrue(byteAlloc[i] == nativeByteAlloc[i]);
- }
+ Allocation rsCppOutput = Allocation.createTyped(mRS, build.create());
+ rsCppOutput.copyFromUnchecked(nativeByteAlloc);
+ mVerify.invoke_verify(rsOutput, rsCppOutput, rsInput);
+ checkForErrors();
}
-}
\ No newline at end of file
+}
diff --git a/tests/tests/rscpp/src/android/cts/rscpp/RSConvolveTest.java b/tests/tests/rscpp/src/android/cts/rscpp/RSConvolveTest.java
index 0cd5c79..2a3579e 100644
--- a/tests/tests/rscpp/src/android/cts/rscpp/RSConvolveTest.java
+++ b/tests/tests/rscpp/src/android/cts/rscpp/RSConvolveTest.java
@@ -46,7 +46,6 @@
coeffs[8] = .5f;
RSUtils.genRandom(0x1DEFFD0, 255, 1, -128, baseAlloc);
- RenderScript mRS = RenderScript.create(getContext());
byte[] byteAlloc = new byte[X * Y];
for (int i = 0; i < X * Y; i++) {
byteAlloc[i] = (byte)baseAlloc[i];
@@ -65,12 +64,11 @@
byte[] nativeByteAlloc = new byte[X * Y];
convolveTest(this.getContext().getCacheDir().toString(), X, Y, byteAlloc, nativeByteAlloc, coeffs, true);
- rsOutput.copyTo(byteAlloc);
- for (int i = 0; i < X * Y; i++) {
- assertTrue(byteAlloc[i] == nativeByteAlloc[i]);
- }
-
+ Allocation rsCppOutput = Allocation.createTyped(mRS, build.create());
+ rsCppOutput.copyFromUnchecked(nativeByteAlloc);
+ mVerify.invoke_verify(rsOutput, rsCppOutput, rsInput);
+ checkForErrors();
}
public void testConvolve5x5() {
@@ -123,13 +121,13 @@
byte[] nativeByteAlloc = new byte[X * Y];
convolveTest(this.getContext().getCacheDir().toString(), X, Y, byteAlloc, nativeByteAlloc, coeffs, false);
- rsOutput.copyTo(byteAlloc);
- for (int i = 0; i < X * Y; i++) {
- assertTrue(byteAlloc[i] == nativeByteAlloc[i]);
- }
+ Allocation rsCppOutput = Allocation.createTyped(mRS, build.create());
+ rsCppOutput.copyFromUnchecked(nativeByteAlloc);
+ mVerify.invoke_verify(rsOutput, rsCppOutput, rsInput);
+ checkForErrors();
}
-}
\ No newline at end of file
+}
diff --git a/tests/tests/rscpp/src/android/cts/rscpp/RSCppTest.java b/tests/tests/rscpp/src/android/cts/rscpp/RSCppTest.java
index b2bf33e..6cbb9bc 100644
--- a/tests/tests/rscpp/src/android/cts/rscpp/RSCppTest.java
+++ b/tests/tests/rscpp/src/android/cts/rscpp/RSCppTest.java
@@ -19,23 +19,90 @@
import android.content.Context;
import android.content.res.Resources;
import android.test.AndroidTestCase;
-import android.renderscript.*;
+import android.renderscript.RenderScript.RSErrorHandler;
+import android.renderscript.RenderScript.RSMessageHandler;
+import android.renderscript.RSRuntimeException;
+import android.renderscript.RenderScript;
+import android.renderscript.Allocation;
+import android.renderscript.Element;
import android.util.Log;
public class RSCppTest extends AndroidTestCase {
Context mCtx;
Resources mRes;
+ RenderScript mRS;
+ protected ScriptC_verify mVerify;
+
+ private int result;
+ private boolean msgHandled;
+
+ private static final int RS_MSG_TEST_PASSED = 100;
+ private static final int RS_MSG_TEST_FAILED = 101;
+
+ RSMessageHandler mRsMessage = new RSMessageHandler() {
+ public void run() {
+ if (result == 0) {
+ switch (mID) {
+ case RS_MSG_TEST_PASSED:
+ case RS_MSG_TEST_FAILED:
+ result = mID;
+ break;
+ default:
+ fail("Got unexpected RS message");
+ return;
+ }
+ }
+ msgHandled = true;
+ }
+ };
+
+ protected void waitForMessage() {
+ while (!msgHandled) {
+ Thread.yield();
+ }
+ }
+
+ protected boolean FoundError = false;
+ protected RSErrorHandler mRsError = new RSErrorHandler() {
+ public void run() {
+ FoundError = true;
+ Log.e("RSCppCTS", mErrorMessage);
+ throw new RSRuntimeException("Received error " + mErrorNum +
+ " message " + mErrorMessage);
+ }
+ };
+
+ protected void checkForErrors() {
+ mRS.finish();
+ mVerify.invoke_checkError();
+ waitForMessage();
+ assertFalse(FoundError);
+ assertTrue(result != RS_MSG_TEST_FAILED);
+ }
@Override
protected void setUp() throws Exception {
super.setUp();
+ result = 0;
+ msgHandled = false;
mCtx = getContext();
mRes = mCtx.getResources();
+ mRS = RenderScript.create(mCtx);
+ mRS.setMessageHandler(mRsMessage);
+ mVerify = new ScriptC_verify(mRS);
}
@Override
protected void tearDown() throws Exception {
+ if (mVerify != null) {
+ mVerify.destroy();
+ mVerify = null;
+ }
+ if (mRS != null) {
+ mRS.destroy();
+ mRS = null;
+ }
super.tearDown();
}
}
diff --git a/tests/tests/rscpp/src/android/cts/rscpp/RSInitTest.java b/tests/tests/rscpp/src/android/cts/rscpp/RSInitTest.java
index ca6be9c..f6b4251 100644
--- a/tests/tests/rscpp/src/android/cts/rscpp/RSInitTest.java
+++ b/tests/tests/rscpp/src/android/cts/rscpp/RSInitTest.java
@@ -30,10 +30,10 @@
native boolean initTest(String path);
public void testRSInit() {
for (int i = 0; i < 1000; i++) {
- RenderScript mRS = RenderScript.create(getContext());
- mRS.destroy();
+ RenderScript mRSt = RenderScript.create(getContext());
+ mRSt.destroy();
Log.d("rscpptest", "Java iteration " + i);
}
assertTrue(initTest(this.getContext().getCacheDir().toString()));
}
-}
\ No newline at end of file
+}
diff --git a/tests/tests/rscpp/src/android/cts/rscpp/RSLUTTest.java b/tests/tests/rscpp/src/android/cts/rscpp/RSLUTTest.java
index f1ea040..aa24209 100644
--- a/tests/tests/rscpp/src/android/cts/rscpp/RSLUTTest.java
+++ b/tests/tests/rscpp/src/android/cts/rscpp/RSLUTTest.java
@@ -35,7 +35,6 @@
public void testRSLUT() {
int[] baseAlloc = new int[X * Y * 4];
RSUtils.genRandom(0x72727272, 255, 1, -128, baseAlloc);
- RenderScript mRS = RenderScript.create(getContext());
byte[] byteAlloc = new byte[X * Y * 4];
for (int i = 0; i < X * Y * 4; i++) {
byteAlloc[i] = (byte)baseAlloc[i];
@@ -58,12 +57,12 @@
byte[] nativeByteAlloc = new byte[X * Y * 4];
lutTest(this.getContext().getCacheDir().toString().toString(), X, Y, byteAlloc, nativeByteAlloc);
- rsOutput.copyTo(byteAlloc);
- for (int i = 0; i < X * Y * 4; i++) {
- assertTrue(byteAlloc[i] == nativeByteAlloc[i]);
- }
+ Allocation rsCppOutput = Allocation.createTyped(mRS, build.create());
+ rsCppOutput.copyFromUnchecked(nativeByteAlloc);
+ mVerify.invoke_verify(rsOutput, rsCppOutput, rsInput);
+ checkForErrors();
}
-}
\ No newline at end of file
+}
diff --git a/tests/tests/rscpp/src/android/cts/rscpp/verify.rs b/tests/tests/rscpp/src/android/cts/rscpp/verify.rs
new file mode 100644
index 0000000..7fd44d3
--- /dev/null
+++ b/tests/tests/rscpp/src/android/cts/rscpp/verify.rs
@@ -0,0 +1,311 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma version(1)
+#pragma rs java_package_name(android.cts.rscpp)
+
+/* These constants must match those in RSCppTest.java */
+static const int RS_MSG_TEST_PASSED = 100;
+static const int RS_MSG_TEST_FAILED = 101;
+
+int gAllowedIntError = 0;
+static bool hadError = false;
+static int2 errorLoc = {0,0};
+
+
+static bool compare_float(float f1, float f2) {
+ if (fabs(f1-f2) > 0.0001f) {
+ hadError = true;
+ return false;
+ }
+ return true;
+}
+
+static bool verify_float4(rs_allocation in1, rs_allocation in2)
+{
+ uint32_t w = rsAllocationGetDimX(in1);
+ uint32_t h = rsAllocationGetDimY(in1);
+ for (uint32_t y=0; y < h; y++) {
+ for (uint32_t x=0; x < w; x++) {
+ float4 pref = rsGetElementAt_float4(in1, x, y);
+ float4 ptst = rsGetElementAt_float4(in2, x, y);
+ bool e = !compare_float(pref.x, ptst.x);
+ e |= !compare_float(pref.y, ptst.y);
+ e |= !compare_float(pref.z, ptst.z);
+ e |= !compare_float(pref.w, ptst.w);
+ if (e) {
+ errorLoc.x = x;
+ errorLoc.y = y;
+ return false;
+ }
+ }
+ }
+ return true;
+}
+
+static bool verify_float3(rs_allocation in1, rs_allocation in2)
+{
+ uint32_t w = rsAllocationGetDimX(in1);
+ uint32_t h = rsAllocationGetDimY(in1);
+ for (uint32_t y=0; y < h; y++) {
+ for (uint32_t x=0; x < w; x++) {
+ float3 pref = rsGetElementAt_float3(in1, x, y);
+ float3 ptst = rsGetElementAt_float3(in2, x, y);
+ bool e = !compare_float(pref.x, ptst.x);
+ e |= !compare_float(pref.y, ptst.y);
+ e |= !compare_float(pref.z, ptst.z);
+ if (e) {
+ errorLoc.x = x;
+ errorLoc.y = y;
+ return false;
+ }
+ }
+ }
+ return true;
+}
+
+static bool verify_float2(rs_allocation in1, rs_allocation in2)
+{
+ uint32_t w = rsAllocationGetDimX(in1);
+ uint32_t h = rsAllocationGetDimY(in1);
+ for (uint32_t y=0; y < h; y++) {
+ for (uint32_t x=0; x < w; x++) {
+ float2 pref = rsGetElementAt_float2(in1, x, y);
+ float2 ptst = rsGetElementAt_float2(in2, x, y);
+ bool e = !compare_float(pref.x, ptst.x);
+ e |= !compare_float(pref.y, ptst.y);
+ if (e) {
+ errorLoc.x = x;
+ errorLoc.y = y;
+ return false;
+ }
+ }
+ }
+ return true;
+}
+
+static bool verify_float(rs_allocation in1, rs_allocation in2)
+{
+ uint32_t w = rsAllocationGetDimX(in1);
+ uint32_t h = rsAllocationGetDimY(in1);
+ for (uint32_t y=0; y < h; y++) {
+ for (uint32_t x=0; x < w; x++) {
+ float pref = rsGetElementAt_float(in1, x, y);
+ float ptst = rsGetElementAt_float(in2, x, y);
+ bool e = !compare_float(pref, ptst);
+ if (e) {
+ errorLoc.x = x;
+ errorLoc.y = y;
+ return false;
+ }
+ }
+ }
+ return true;
+}
+
+static bool verify_uchar4(rs_allocation in1, rs_allocation in2)
+{
+ int merr = 0;
+ uint32_t w = rsAllocationGetDimX(in1);
+ uint32_t h = rsAllocationGetDimY(in1);
+ for (uint32_t y=0; y < h; y++) {
+ for (uint32_t x=0; x < w; x++) {
+ int4 pref = convert_int4(rsGetElementAt_uchar4(in1, x, y));
+ int4 ptst = convert_int4(rsGetElementAt_uchar4(in2, x, y));
+ int4 d = convert_int4(abs(pref - ptst));
+ int e = 0;
+ e = max(e, d.x);
+ e = max(e, d.y);
+ e = max(e, d.z);
+ e = max(e, d.w);
+ if (e > gAllowedIntError) {
+ errorLoc.x = x;
+ errorLoc.y = y;
+ hadError = true;
+ return false;
+ }
+ merr = max(e, merr);
+ }
+ }
+ return true;
+}
+
+static bool verify_uchar3(rs_allocation in1, rs_allocation in2)
+{
+ int merr = 0;
+ uint32_t w = rsAllocationGetDimX(in1);
+ uint32_t h = rsAllocationGetDimY(in1);
+ for (uint32_t y=0; y < h; y++) {
+ for (uint32_t x=0; x < w; x++) {
+ int3 pref = convert_int3(rsGetElementAt_uchar3(in1, x, y));
+ int3 ptst = convert_int3(rsGetElementAt_uchar3(in2, x, y));
+ int3 d = convert_int3(abs(pref - ptst));
+ int e = 0;
+ e = max(e, d.x);
+ e = max(e, d.y);
+ e = max(e, d.z);
+ if (e > gAllowedIntError) {
+ errorLoc.x = x;
+ errorLoc.y = y;
+ hadError = true;
+ return false;
+ }
+ merr = max(e, merr);
+ }
+ }
+ return true;
+}
+
+static bool verify_uchar2(rs_allocation in1, rs_allocation in2)
+{
+ int merr = 0;
+ uint32_t w = rsAllocationGetDimX(in1);
+ uint32_t h = rsAllocationGetDimY(in1);
+ for (uint32_t y=0; y < h; y++) {
+ for (uint32_t x=0; x < w; x++) {
+ int2 pref = convert_int2(rsGetElementAt_uchar2(in1, x, y));
+ int2 ptst = convert_int2(rsGetElementAt_uchar2(in2, x, y));
+ int2 d = convert_int2(abs(pref - ptst));
+ int e = 0;
+ e = max(e, d.x);
+ e = max(e, d.y);
+ if (e > gAllowedIntError) {
+ errorLoc.x = x;
+ errorLoc.y = y;
+ hadError = true;
+ return false;
+ }
+ merr = max(e, merr);
+ }
+ }
+ return true;
+}
+
+static bool verify_uchar(rs_allocation in1, rs_allocation in2)
+{
+ int merr = 0;
+ uint32_t w = rsAllocationGetDimX(in1);
+ uint32_t h = rsAllocationGetDimY(in1);
+ for (uint32_t y=0; y < h; y++) {
+ for (uint32_t x=0; x < w; x++) {
+ int pref = rsGetElementAt_uchar(in1, x, y);
+ int ptst = rsGetElementAt_uchar(in2, x, y);
+ int e = abs(pref - ptst);
+ if (e > gAllowedIntError) {
+ errorLoc.x = x;
+ errorLoc.y = y;
+ hadError = true;
+ return false;
+ }
+ merr = max(e, merr);
+ }
+ }
+ return true;
+}
+
+#define printCell(txt, a, xy) \
+{ \
+ rs_element e = rsAllocationGetElement(a); \
+ rs_data_type dt = rsElementGetDataType(e); \
+ uint32_t vs = rsElementGetVectorSize(e); \
+ \
+ if (dt == RS_TYPE_UNSIGNED_8) { \
+ switch(vs) { \
+ case 4: \
+ rsDebug(txt, rsGetElementAt_uchar4(a, xy.x, xy.y)); \
+ break; \
+ case 3: \
+ rsDebug(txt, rsGetElementAt_uchar3(a, xy.x, xy.y)); \
+ break; \
+ case 2: \
+ rsDebug(txt, rsGetElementAt_uchar2(a, xy.x, xy.y)); \
+ break; \
+ case 1: \
+ rsDebug(txt, rsGetElementAt_uchar(a, xy.x, xy.y)); \
+ break; \
+ } \
+ } else { \
+ switch(vs) { \
+ case 4: \
+ rsDebug(txt, rsGetElementAt_float4(a, xy.x, xy.y)); \
+ break; \
+ case 3: \
+ rsDebug(txt, rsGetElementAt_float3(a, xy.x, xy.y)); \
+ break; \
+ case 2: \
+ rsDebug(txt, rsGetElementAt_float2(a, xy.x, xy.y)); \
+ break; \
+ case 1: \
+ rsDebug(txt, rsGetElementAt_float(a, xy.x, xy.y)); \
+ break; \
+ } \
+ } \
+}
+
+void verify(rs_allocation ref_in, rs_allocation tst_in, rs_allocation src_in)
+{
+ rs_element e = rsAllocationGetElement(ref_in);
+ rs_data_type dt = rsElementGetDataType(e);
+ uint32_t vs = rsElementGetVectorSize(e);
+ bool valid = false;
+
+ if (dt == RS_TYPE_UNSIGNED_8) {
+ switch(vs) {
+ case 4:
+ valid = verify_uchar4(ref_in, tst_in);
+ break;
+ case 3:
+ valid = verify_uchar3(ref_in, tst_in);
+ break;
+ case 2:
+ valid = verify_uchar2(ref_in, tst_in);
+ break;
+ case 1:
+ valid = verify_uchar(ref_in, tst_in);
+ break;
+ }
+ } else {
+ switch(vs) {
+ case 4:
+ valid = verify_float4(ref_in, tst_in);
+ break;
+ case 3:
+ valid = verify_float3(ref_in, tst_in);
+ break;
+ case 2:
+ valid = verify_float2(ref_in, tst_in);
+ break;
+ case 1:
+ valid = verify_float(ref_in, tst_in);
+ break;
+ }
+ }
+ if (!valid) {
+ rsDebug("verify failure at xy", errorLoc);
+ printCell("start value ", src_in, errorLoc);
+ printCell("reference value ", ref_in, errorLoc);
+ printCell("test value ", tst_in, errorLoc);
+ }
+}
+
+void checkError()
+{
+ if (hadError) {
+ rsSendToClientBlocking(RS_MSG_TEST_FAILED);
+ } else {
+ rsSendToClientBlocking(RS_MSG_TEST_PASSED);
+ }
+}