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

Commit 99987f57 authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge changes I79f2aa8b,I472da0ed into main 

* changes:
  Add trunk stable flag for removal of legacy stream type
  [AudioFlinger] remove unused per stream volume/mute getter API
parents 7aac346c 2568706e

media/audio/aconfig/audioserver.aconfig

+8 −0
Original line number Diff line number Diff line
@@ -64,6 +64,14 @@ flag { 
    bug: "209491695"

}



flag {

    name: "portid_volume_management"

    namespace: "media_audio"

    description:

        "Allows to manage volume by port id within audio flinger instead of legacy stream type."

    bug: "317212590"

}



flag {

    name: "use_bt_sco_for_media"

    namespace: "media_audio"

media/libaudioclient/AudioSystem.cpp

+0 −17
Original line number Diff line number Diff line
@@ -322,23 +322,6 @@ status_t AudioSystem::setStreamMute(audio_stream_type_t stream, bool mute) { 
    return NO_ERROR;

}



status_t AudioSystem::getStreamVolume(audio_stream_type_t stream, float* volume,

                                      audio_io_handle_t output) {

    if (uint32_t(stream) >= AUDIO_STREAM_CNT) return BAD_VALUE;

    const sp<IAudioFlinger> af = get_audio_flinger();

    if (af == 0) return PERMISSION_DENIED;

    *volume = af->streamVolume(stream, output);

    return NO_ERROR;

}



status_t AudioSystem::getStreamMute(audio_stream_type_t stream, bool* mute) {

    if (uint32_t(stream) >= AUDIO_STREAM_CNT) return BAD_VALUE;

    const sp<IAudioFlinger> af = get_audio_flinger();

    if (af == 0) return PERMISSION_DENIED;

    *mute = af->streamMute(stream);

    return NO_ERROR;

}



status_t AudioSystem::setMode(audio_mode_t mode) {

    if (uint32_t(mode) >= AUDIO_MODE_CNT) return BAD_VALUE;

    const sp<IAudioFlinger> af = get_audio_flinger();

media/libaudioclient/IAudioFlinger.cpp

+0 −45
Original line number Diff line number Diff line
@@ -350,34 +350,6 @@ status_t AudioFlingerClientAdapter::setStreamMute(audio_stream_type_t stream, bo 
    return statusTFromBinderStatus(mDelegate->setStreamMute(streamAidl, muted));

}



float AudioFlingerClientAdapter::streamVolume(audio_stream_type_t stream,

                                              audio_io_handle_t output) const {

    auto result = [&]() -> ConversionResult<float> {

        AudioStreamType streamAidl = VALUE_OR_RETURN_STATUS(

                legacy2aidl_audio_stream_type_t_AudioStreamType(stream));

        int32_t outputAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_audio_io_handle_t_int32_t(output));

        float aidlRet;

        RETURN_IF_ERROR(statusTFromBinderStatus(

                mDelegate->streamVolume(streamAidl, outputAidl, &aidlRet)));

        return aidlRet;

    }();

    // Failure is ignored.

    return result.value_or(0.f);

}



bool AudioFlingerClientAdapter::streamMute(audio_stream_type_t stream) const {

    auto result = [&]() -> ConversionResult<bool> {

        AudioStreamType streamAidl = VALUE_OR_RETURN_STATUS(

                legacy2aidl_audio_stream_type_t_AudioStreamType(stream));

        bool aidlRet;

        RETURN_IF_ERROR(statusTFromBinderStatus(

                mDelegate->streamMute(streamAidl, &aidlRet)));

        return aidlRet;

    }();

    // Failure is ignored.

    return result.value_or(false);

}



status_t AudioFlingerClientAdapter::setMode(audio_mode_t mode) {

    AudioMode modeAidl = VALUE_OR_RETURN_STATUS(legacy2aidl_audio_mode_t_AudioMode(mode));

    return statusTFromBinderStatus(mDelegate->setMode(modeAidl));
@@ -1040,23 +1012,6 @@ Status AudioFlingerServerAdapter::setStreamMute(AudioStreamType stream, bool mut 
    return Status::fromStatusT(mDelegate->setStreamMute(streamLegacy, muted));

}



Status AudioFlingerServerAdapter::streamVolume(AudioStreamType stream, int32_t output,

                                               float* _aidl_return) {

    audio_stream_type_t streamLegacy = VALUE_OR_RETURN_BINDER(

            aidl2legacy_AudioStreamType_audio_stream_type_t(stream));

    audio_io_handle_t outputLegacy = VALUE_OR_RETURN_BINDER(

            aidl2legacy_int32_t_audio_io_handle_t(output));

    *_aidl_return = mDelegate->streamVolume(streamLegacy, outputLegacy);

    return Status::ok();

}



Status AudioFlingerServerAdapter::streamMute(AudioStreamType stream, bool* _aidl_return) {

    audio_stream_type_t streamLegacy = VALUE_OR_RETURN_BINDER(

            aidl2legacy_AudioStreamType_audio_stream_type_t(stream));

    *_aidl_return = mDelegate->streamMute(streamLegacy);

    return Status::ok();

}



Status AudioFlingerServerAdapter::setMode(AudioMode mode) {

    audio_mode_t modeLegacy = VALUE_OR_RETURN_BINDER(aidl2legacy_AudioMode_audio_mode_t(mode));

    return Status::fromStatusT(mDelegate->setMode(modeLegacy));

media/libaudioclient/aidl/android/media/IAudioFlingerService.aidl

+1 −3
Original line number Diff line number Diff line
@@ -94,13 +94,11 @@ interface IAudioFlingerService { 
    float getMasterBalance();



    /*

     * Set/gets stream type state. This will probably be used by

     * Set stream type state. This will probably be used by

     * the preference panel, mostly.

     */

    void setStreamVolume(AudioStreamType stream, float value, int /* audio_io_handle_t */ output);

    void setStreamMute(AudioStreamType stream, boolean muted);

    float streamVolume(AudioStreamType stream, int /* audio_io_handle_t */ output);

    boolean streamMute(AudioStreamType stream);



    // set audio mode.

    void setMode(AudioMode mode);

media/libaudioclient/fuzzer/audioflinger_fuzzer.cpp

+0 −6
Original line number Diff line number Diff line
@@ -519,12 +519,6 @@ void AudioFlingerFuzzer::invokeAudioSystem() { 
    stream = getValue(&mFdp, kStreamtypes);

    AudioSystem::getOutputLatency(&latency, stream);



    stream = getValue(&mFdp, kStreamtypes);

    AudioSystem::getStreamVolume(stream, &volume, mFdp.ConsumeIntegral<int32_t>());



    stream = getValue(&mFdp, kStreamtypes);

    AudioSystem::getStreamMute(stream, &state);



    uint32_t samplingRate;

    AudioSystem::getSamplingRate(mFdp.ConsumeIntegral<int32_t>(), &samplingRate);