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

Commit 71fe631c authored by Eric Laurent's avatar Eric Laurent
Browse files

Fix broken insert reverb auto tests. 

commit 27a2fdfb changed the
insert reverb behavior when it is attached to a track in that
the reverb tail is silenced immediately when the track is paused.
The tests have been modified to test the insert reverb on session 0.

Change-Id: I90c6fec40167966853acfeaa4dec2b96f9e7839f
parent d45cb72a

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaEnvReverbTest.java

+22 −7
Original line number Original line Diff line number Diff line
@@ -414,13 +414,13 @@ public class MediaEnvReverbTest extends ActivityInstrumentationTestCase2<MediaFr 
        EnergyProbe probe = null;

        EnergyProbe probe = null;

        AudioEffect vc = null;

        AudioEffect vc = null;

        MediaPlayer mp = null;

        MediaPlayer mp = null;

        AudioEffect rvb = null;

        AudioManager am = (AudioManager) getActivity().getSystemService(Context.AUDIO_SERVICE);

        AudioManager am = (AudioManager) getActivity().getSystemService(Context.AUDIO_SERVICE);

        int volume = am.getStreamMaxVolume(AudioManager.STREAM_MUSIC);

        int volume = am.getStreamMaxVolume(AudioManager.STREAM_MUSIC);

        am.setStreamVolume(AudioManager.STREAM_MUSIC,

        am.setStreamVolume(AudioManager.STREAM_MUSIC,

                           am.getStreamMaxVolume(AudioManager.STREAM_MUSIC),

                           am.getStreamMaxVolume(AudioManager.STREAM_MUSIC),

                           0);

                           0);

        try {

        try {

            probe = new EnergyProbe(0);

            // creating a volume controller on output mix ensures that ro.audio.silent mutes

            // creating a volume controller on output mix ensures that ro.audio.silent mutes

            // audio after the effects and not before

            // audio after the effects and not before

            vc = new AudioEffect(

            vc = new AudioEffect(
@@ -433,11 +433,24 @@ public class MediaEnvReverbTest extends ActivityInstrumentationTestCase2<MediaFr 
            mp = new MediaPlayer();

            mp = new MediaPlayer();

            mp.setDataSource(MediaNames.SINE_200_1000);

            mp.setDataSource(MediaNames.SINE_200_1000);

            mp.setAudioStreamType(AudioManager.STREAM_MUSIC);

            mp.setAudioStreamType(AudioManager.STREAM_MUSIC);

            getReverb(mp.getAudioSessionId());



            mReverb.setRoomLevel((short)0);

            // create reverb with UUID instead of EnvironmentalReverb constructor otherwise an

            mReverb.setReverbLevel((short)0);

            // auxiliary reverb will be chosen by the effect framework as we are on session 0

            mReverb.setDecayTime(2000);

            rvb = new AudioEffect(

            mReverb.setEnabled(true);

                        AudioEffect.EFFECT_TYPE_NULL,

                        UUID.fromString("c7a511a0-a3bb-11df-860e-0002a5d5c51b"),

                        0,

                        0);



            rvb.setParameter(EnvironmentalReverb.PARAM_ROOM_LEVEL, (short)0);

            rvb.setParameter(EnvironmentalReverb.PARAM_REVERB_LEVEL, (short)0);

            rvb.setParameter(EnvironmentalReverb.PARAM_DECAY_TIME, 2000);

            rvb.setEnabled(true);



            // create probe after reverb so that it is chained behind the reverb in the

            // effect chain

            probe = new EnergyProbe(0);



            mp.prepare();

            mp.prepare();

            mp.start();

            mp.start();

            Thread.sleep(1000);

            Thread.sleep(1000);
@@ -460,13 +473,15 @@ public class MediaEnvReverbTest extends ActivityInstrumentationTestCase2<MediaFr 
            loge(msg, "sleep() interrupted");

            loge(msg, "sleep() interrupted");

        }

        }

        finally {

        finally {

            releaseReverb();

            if (mp != null) {

            if (mp != null) {

                mp.release();

                mp.release();

            }

            }

            if (vc != null) {

            if (vc != null) {

                vc.release();

                vc.release();

            }

            }

            if (rvb != null) {

                rvb.release();

            }

            if (probe != null) {

            if (probe != null) {

                probe.release();

                probe.release();

            }

            }

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPresetReverbTest.java

+20 −1
Original line number Original line Diff line number Diff line
@@ -257,13 +257,13 @@ public class MediaPresetReverbTest extends ActivityInstrumentationTestCase2<Medi 
        EnergyProbe probe = null;

        EnergyProbe probe = null;

        AudioEffect vc = null;

        AudioEffect vc = null;

        MediaPlayer mp = null;

        MediaPlayer mp = null;

        AudioEffect rvb = null;

        AudioManager am = (AudioManager) getActivity().getSystemService(Context.AUDIO_SERVICE);

        AudioManager am = (AudioManager) getActivity().getSystemService(Context.AUDIO_SERVICE);

        int volume = am.getStreamMaxVolume(AudioManager.STREAM_MUSIC);

        int volume = am.getStreamMaxVolume(AudioManager.STREAM_MUSIC);

        am.setStreamVolume(AudioManager.STREAM_MUSIC,

        am.setStreamVolume(AudioManager.STREAM_MUSIC,

                           am.getStreamMaxVolume(AudioManager.STREAM_MUSIC),

                           am.getStreamMaxVolume(AudioManager.STREAM_MUSIC),

                           0);

                           0);

        try {

        try {

            probe = new EnergyProbe(0);

            // creating a volume controller on output mix ensures that ro.audio.silent mutes

            // creating a volume controller on output mix ensures that ro.audio.silent mutes

            // audio after the effects and not before

            // audio after the effects and not before

            vc = new AudioEffect(

            vc = new AudioEffect(
@@ -279,6 +279,22 @@ public class MediaPresetReverbTest extends ActivityInstrumentationTestCase2<Medi 
            getReverb(mp.getAudioSessionId());

            getReverb(mp.getAudioSessionId());

            mReverb.setPreset((short)PresetReverb.PRESET_PLATE);

            mReverb.setPreset((short)PresetReverb.PRESET_PLATE);

            mReverb.setEnabled(true);

            mReverb.setEnabled(true);



            // create reverb with UUID instead of PresetReverb constructor otherwise an auxiliary

            // reverb will be chosen by the effect framework as we are on session 0

            rvb = new AudioEffect(

                        AudioEffect.EFFECT_TYPE_NULL,

                        UUID.fromString("172cdf00-a3bc-11df-a72f-0002a5d5c51b"),

                        0,

                        0);



            rvb.setParameter(PresetReverb.PARAM_PRESET, PresetReverb.PRESET_PLATE);

            rvb.setEnabled(true);



            // create probe after reverb so that it is chained behind the reverb in the

            // effect chain

            probe = new EnergyProbe(0);



            mp.prepare();

            mp.prepare();

            mp.start();

            mp.start();

            Thread.sleep(1000);

            Thread.sleep(1000);
@@ -308,6 +324,9 @@ public class MediaPresetReverbTest extends ActivityInstrumentationTestCase2<Medi 
            if (vc != null) {

            if (vc != null) {

                vc.release();

                vc.release();

            }

            }

            if (rvb != null) {

                rvb.release();

            }

            if (probe != null) {

            if (probe != null) {

                probe.release();

                probe.release();

            }

            }