commit b2088c9845053de5448c645bb5bdaba1cfc1c266
author Treehugger Robot <treehugger-gerrit@google.com> Tue Oct 06 20:14:16 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 06 20:14:16 2020 +0000
tree f9d676ca5f5d88c1d6e7f1994546577c52cc565e
parent b991ee662d530cab662b5d3ca87b86a22b83039f
parent 61fe3da0baba5ae66717f94ece79a1e1060712d4

Merge "VisualizerTest: Stopped using resources in apk"

tests/tests/media/src/android/media/cts/VisualizerTest.java

diff --git a/tests/tests/media/src/android/media/cts/VisualizerTest.java b/tests/tests/media/src/android/media/cts/VisualizerTest.java
index 5645a92..94575e9 100644
--- a/tests/tests/media/src/android/media/cts/VisualizerTest.java
+++ b/tests/tests/media/src/android/media/cts/VisualizerTest.java
@@ -16,8 +16,6 @@
 
 package android.media.cts;
 
-import android.media.cts.R;
-
 import android.content.Context;
 import android.media.audiofx.AudioEffect;
 import android.media.AudioFormat;
@@ -25,9 +23,12 @@
 import android.media.MediaPlayer;
 import android.media.audiofx.Visualizer;
 import android.media.audiofx.Visualizer.MeasurementPeakRms;
+import android.net.Uri;
 import android.os.Looper;
 import android.platform.test.annotations.AppModeFull;
 import android.test.AndroidTestCase;
+
+import java.io.File;
 import java.util.UUID;
 import android.util.Log;
 
@@ -39,6 +40,7 @@
     private final static int MIN_CAPTURE_SIZE_MAX = 1024;
     private final static int MAX_CAPTURE_SIZE_MIN = 512;
     private final static int MAX_LOOPER_WAIT_COUNT = 10;
+    static final String mInpPrefix = WorkDir.getMediaDirString();
 
     private Visualizer mVisualizer = null;
     private byte[] mWaveform = null;
@@ -291,7 +293,8 @@
         AudioEffect vc = null;
         try {
             // this test will play a 1kHz sine wave with peaks at -40dB
-            MediaPlayer mp = MediaPlayer.create(getContext(), R.raw.sine1khzm40db);
+            MediaPlayer mp = MediaPlayer
+                    .create(getContext(), Uri.fromFile(new File(mInpPrefix + "sine1khzm40db.wav")));
             final int EXPECTED_PEAK_MB = -4015;
             final int EXPECTED_RMS_MB =  -4300;
             final int MAX_MEASUREMENT_ERROR_MB = 2000;
@@ -364,7 +367,8 @@
         AudioEffect vc = null;
         try {
             // this test will play a 1kHz sine wave with peaks at -40dB
-            MediaPlayer mp = MediaPlayer.create(getContext(), R.raw.sine1khzs40dblong);
+            MediaPlayer mp = MediaPlayer.create(getContext(),
+                    Uri.fromFile(new File(mInpPrefix + "sine1khzs40dblong.mp3")));
             final int EXPECTED_PEAK_MB = -4015;
             final int EXPECTED_RMS_MB =  -4300;
             final int MAX_MEASUREMENT_ERROR_MB = 2000;