Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5c35c84 authored by Eric Laurent's avatar Eric Laurent Committed by Android Git Automerger
Browse files

am 18afcee7: am 67400d49: Merge "Added tests for audio effects in... 

am 18afcee7: am 67400d49: Merge "Added tests for audio effects in MediaFrameworkTest" into gingerbread

Merge commit '18afcee7'

* commit '18afcee7':
  Added tests for audio effects in MediaFrameworkTest
parents dbe57fcb 18afcee7

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTestRunner.java

+10 −0
Original line number Diff line number Diff line
@@ -25,6 +25,11 @@ import com.android.mediaframeworktest.functional.MediaRecorderTest; 
import com.android.mediaframeworktest.functional.SimTonesTest;

import com.android.mediaframeworktest.functional.MediaPlayerInvokeTest;

import com.android.mediaframeworktest.functional.MediaAudioManagerTest;

import com.android.mediaframeworktest.functional.MediaAudioEffectTest;

import com.android.mediaframeworktest.functional.MediaBassBoostTest;

import com.android.mediaframeworktest.functional.MediaEqualizerTest;

import com.android.mediaframeworktest.functional.MediaVirtualizerTest;

import com.android.mediaframeworktest.functional.MediaVisualizerTest;

import junit.framework.TestSuite;



import android.test.InstrumentationTestRunner;
@@ -55,6 +60,11 @@ public class MediaFrameworkTestRunner extends InstrumentationTestRunner { 
        suite.addTestSuite(MediaMimeTest.class);

        suite.addTestSuite(MediaPlayerInvokeTest.class);

        suite.addTestSuite(MediaAudioManagerTest.class);

        suite.addTestSuite(MediaAudioEffectTest.class);

        suite.addTestSuite(MediaBassBoostTest.class);

        suite.addTestSuite(MediaEqualizerTest.class);

        suite.addTestSuite(MediaVirtualizerTest.class);

        suite.addTestSuite(MediaVisualizerTest.class);

        return suite;

    }

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ public class MediaNames { 
    public static final String WAV = "/sdcard/media_api/music/rings_2ch.wav";

    public static final String AMR = "/sdcard/media_api/music/test_amr_ietf.amr";

    public static final String OGG = "/sdcard/media_api/music/Revelation.ogg";

    public static final String SINE_200_1000 = "/sdcard/media_api/music/sine_200+1000Hz_44K_mo.wav";

  

    public static final int MP3CBR_LENGTH = 71000;

    public static final int MP3VBR_LENGTH = 71000;