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

Commit 7a4b8ab1 authored by Phil Burk's avatar Phil Burk Committed by Android (Google) Code Review
Browse files

Merge "aaudio: use AAUDIO_INPUT_PRESET_VOICE_RECOGNITION"

parents b83456d9 eaef9b9c

media/libaaudio/include/aaudio/AAudio.h

+3 −1
Original line number Diff line number Diff line
@@ -510,7 +510,9 @@ AAUDIO_API void AAudioStreamBuilder_setContentType(AAudioStreamBuilder* builder, 
 * This could, for example, affect which microphones are used and how the

 * recorded data is processed.

 *

 * The default, if you do not call this function, is AAUDIO_INPUT_PRESET_GENERIC.

 * The default, if you do not call this function, is AAUDIO_INPUT_PRESET_VOICE_RECOGNITION.

 * That is because VOICE_RECOGNITION is the preset with the lowest latency

 * on many platforms.

 *

 * @param builder reference provided by AAudio_createStreamBuilder()

 * @param inputPreset the desired configuration for recording

media/libaaudio/src/core/AudioStream.cpp

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ aaudio_result_t AudioStream::open(const AudioStreamBuilder& builder) 
    }

    mInputPreset = builder.getInputPreset();

    if (mInputPreset == AAUDIO_UNSPECIFIED) {

        mInputPreset = AAUDIO_INPUT_PRESET_GENERIC;

        mInputPreset = AAUDIO_INPUT_PRESET_VOICE_RECOGNITION;

    }



    // callbacks

media/libaaudio/src/core/AudioStream.h

+3 −3
Original line number Diff line number Diff line
@@ -515,9 +515,9 @@ private: 
    aaudio_stream_state_t       mState = AAUDIO_STREAM_STATE_UNINITIALIZED;

    aaudio_performance_mode_t   mPerformanceMode = AAUDIO_PERFORMANCE_MODE_NONE;



    aaudio_usage_t              mUsage           = AAUDIO_USAGE_MEDIA;

    aaudio_content_type_t       mContentType     = AAUDIO_CONTENT_TYPE_MUSIC;

    aaudio_input_preset_t       mInputPreset     = AAUDIO_INPUT_PRESET_GENERIC;

    aaudio_usage_t              mUsage           = AAUDIO_UNSPECIFIED;

    aaudio_content_type_t       mContentType     = AAUDIO_UNSPECIFIED;

    aaudio_input_preset_t       mInputPreset     = AAUDIO_UNSPECIFIED;



    int32_t                     mSessionId = AAUDIO_UNSPECIFIED;

media/libaaudio/src/utility/AAudioUtilities.cpp

+1 −1
Original line number Diff line number Diff line
@@ -341,7 +341,7 @@ audio_source_t AAudioConvert_inputPresetToAudioSource(aaudio_input_preset_t pres 
    STATIC_ASSERT(AAUDIO_INPUT_PRESET_VOICE_COMMUNICATION == AUDIO_SOURCE_VOICE_COMMUNICATION);

    STATIC_ASSERT(AAUDIO_INPUT_PRESET_UNPROCESSED == AUDIO_SOURCE_UNPROCESSED);

    if (preset == AAUDIO_UNSPECIFIED) {

        preset = AAUDIO_INPUT_PRESET_GENERIC;

        preset = AAUDIO_INPUT_PRESET_VOICE_RECOGNITION;

    }

    return (audio_source_t) preset; // same value

}

media/libaaudio/tests/test_attributes.cpp

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ static void checkAttributes(aaudio_performance_mode_t perfMode, 


    aaudio_input_preset_t expectedPreset =

            (preset == DONT_SET || preset == AAUDIO_UNSPECIFIED)

            ? AAUDIO_INPUT_PRESET_GENERIC // default

            ? AAUDIO_INPUT_PRESET_VOICE_RECOGNITION // default

            : preset;

    EXPECT_EQ(expectedPreset, AAudioStream_getInputPreset(aaudioStream));