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

Commit 9b2b2f50 authored by Niels Egberts's avatar Niels Egberts
Browse files

Fix checks for audio format. 

Change-Id: I43e9a94f8ddd46f72d24e06d72702f354bbeae46
parent 453c13f7

core/java/android/speech/tts/FileSynthesisCallback.java

+2 −2
Original line number Diff line number Diff line
@@ -104,8 +104,8 @@ class FileSynthesisCallback extends AbstractSynthesisCallback { 
            Log.d(TAG, "FileSynthesisRequest.start(" + sampleRateInHz + "," + audioFormat

                    + "," + channelCount + ")");

        }

        if (audioFormat != AudioFormat.ENCODING_PCM_8BIT ||

            audioFormat != AudioFormat.ENCODING_PCM_16BIT ||

        if (audioFormat != AudioFormat.ENCODING_PCM_8BIT &&

            audioFormat != AudioFormat.ENCODING_PCM_16BIT &&

            audioFormat != AudioFormat.ENCODING_PCM_FLOAT) {

            Log.e(TAG, "Audio format encoding " + audioFormat + " not supported. Please use one " +

                       "of AudioFormat.ENCODING_PCM_8BIT, AudioFormat.ENCODING_PCM_16BIT or " +

core/java/android/speech/tts/PlaybackSynthesisCallback.java

+2 −2
Original line number Diff line number Diff line
@@ -123,8 +123,8 @@ class PlaybackSynthesisCallback extends AbstractSynthesisCallback { 
    public int start(int sampleRateInHz, int audioFormat, int channelCount) {

        if (DBG) Log.d(TAG, "start(" + sampleRateInHz + "," + audioFormat + "," + channelCount

                + ")");

        if (audioFormat != AudioFormat.ENCODING_PCM_8BIT ||

            audioFormat != AudioFormat.ENCODING_PCM_16BIT ||

        if (audioFormat != AudioFormat.ENCODING_PCM_8BIT &&

            audioFormat != AudioFormat.ENCODING_PCM_16BIT &&

            audioFormat != AudioFormat.ENCODING_PCM_FLOAT) {

            Log.w(TAG, "Audio format encoding " + audioFormat + " not supported. Please use one " +

                       "of AudioFormat.ENCODING_PCM_8BIT, AudioFormat.ENCODING_PCM_16BIT or " +