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

Commit 493331f2 authored by Shunkai Yao's avatar Shunkai Yao Committed by Automerger Merge Worker
Browse files

Merge changes from topic "variable_latency_api" am: dc2f403f 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2375031



Change-Id: I8395940b0362d4977a5a91545873a5010724e9bd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8947d03b dc2f403f

media/libaudioclient/AudioSystem.cpp

+13 −4
Original line number Diff line number Diff line
@@ -2426,21 +2426,30 @@ status_t AudioSystem::getSupportedLatencyModes(audio_io_handle_t output, 
    return af->getSupportedLatencyModes(output, modes);

}



status_t AudioSystem::setBluetoothLatencyModesEnabled(bool enabled) {

status_t AudioSystem::setBluetoothVariableLatencyEnabled(bool enabled) {

    const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger();

    if (af == nullptr) {

        return PERMISSION_DENIED;

    }

    return af->setBluetoothLatencyModesEnabled(enabled);

    return af->setBluetoothVariableLatencyEnabled(enabled);

}



status_t AudioSystem::supportsBluetoothLatencyModes(

status_t AudioSystem::isBluetoothVariableLatencyEnabled(

        bool *enabled) {

    const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger();

    if (af == nullptr) {

        return PERMISSION_DENIED;

    }

    return af->isBluetoothVariableLatencyEnabled(enabled);

}



status_t AudioSystem::supportsBluetoothVariableLatency(

        bool *support) {

    const sp<IAudioFlinger>& af = AudioSystem::get_audio_flinger();

    if (af == nullptr) {

        return PERMISSION_DENIED;

    }

    return af->supportsBluetoothLatencyModes(support);

    return af->supportsBluetoothVariableLatency(support);

}



class CaptureStateListenerImpl : public media::BnCaptureStateListener,

media/libaudioclient/IAudioFlinger.cpp

+23 −8
Original line number Diff line number Diff line
@@ -837,17 +837,28 @@ status_t AudioFlingerClientAdapter::getSupportedLatencyModes( 
    return NO_ERROR;

}



status_t AudioFlingerClientAdapter::setBluetoothLatencyModesEnabled(bool enabled) {

    return statusTFromBinderStatus(mDelegate->setBluetoothLatencyModesEnabled(enabled));

status_t AudioFlingerClientAdapter::setBluetoothVariableLatencyEnabled(bool enabled) {

    return statusTFromBinderStatus(mDelegate->setBluetoothVariableLatencyEnabled(enabled));

}



status_t AudioFlingerClientAdapter::supportsBluetoothLatencyModes(bool* support) {

status_t AudioFlingerClientAdapter::isBluetoothVariableLatencyEnabled(bool* enabled) {

    if (enabled == nullptr) {

        return BAD_VALUE;

    }



    RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(

            mDelegate->isBluetoothVariableLatencyEnabled(enabled)));



    return NO_ERROR;

}



status_t AudioFlingerClientAdapter::supportsBluetoothVariableLatency(bool* support) {

    if (support == nullptr) {

        return BAD_VALUE;

    }



    RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(

            mDelegate->supportsBluetoothLatencyModes(support)));

            mDelegate->supportsBluetoothVariableLatency(support)));



    return NO_ERROR;

}
@@ -1372,12 +1383,16 @@ Status AudioFlingerServerAdapter::getSupportedLatencyModes( 
    return Status::ok();

}



Status AudioFlingerServerAdapter::setBluetoothLatencyModesEnabled(bool enabled) {

    return Status::fromStatusT(mDelegate->setBluetoothLatencyModesEnabled(enabled));

Status AudioFlingerServerAdapter::setBluetoothVariableLatencyEnabled(bool enabled) {

    return Status::fromStatusT(mDelegate->setBluetoothVariableLatencyEnabled(enabled));

}



Status AudioFlingerServerAdapter::isBluetoothVariableLatencyEnabled(bool *enabled) {

    return Status::fromStatusT(mDelegate->isBluetoothVariableLatencyEnabled(enabled));

}



Status AudioFlingerServerAdapter::supportsBluetoothLatencyModes(bool *support) {

    return Status::fromStatusT(mDelegate->supportsBluetoothLatencyModes(support));

Status AudioFlingerServerAdapter::supportsBluetoothVariableLatency(bool *support) {

    return Status::fromStatusT(mDelegate->supportsBluetoothVariableLatency(support));

}



} // namespace android

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

+9 −4
Original line number Diff line number Diff line
@@ -248,18 +248,23 @@ interface IAudioFlingerService { 


    /**

     * Requests if the implementation supports controlling the latency modes

     * over the Bleutooth A2DP or LE Audio links. If it does,

     * over the Bluetooth A2DP or LE Audio links. If it does,

     * setRequestedLatencyMode() and getSupportedLatencyModes() APIs can also be used

     * for streams routed to Bluetooth and not just for the spatializer output.

     */

     boolean supportsBluetoothLatencyModes();

     boolean supportsBluetoothVariableLatency();



    /**

     * Enables or disables the variable Bluetooth latency control mechanism in the

     * audio framework and the audio HAL. This does not apply to the latency mode control

     * on the spatializer output with is a built-in feature.

     * on the spatializer output as this is a built-in feature.

     */

    void setBluetoothLatencyModesEnabled(boolean enabled);

    void setBluetoothVariableLatencyEnabled(boolean enabled);



    /**

     * Indicates if the variable Bluetooth latency control mechanism is enabled or disabled.

     */

    boolean isBluetoothVariableLatencyEnabled();



    // When adding a new method, please review and update

    // IAudioFlinger.h AudioFlingerServerAdapter::Delegate::TransactionCode

media/libaudioclient/include/media/AudioSystem.h

+4 −2
Original line number Diff line number Diff line
@@ -575,9 +575,11 @@ public: 
    static status_t getSupportedLatencyModes(audio_io_handle_t output,

            std::vector<audio_latency_mode_t>* modes);



    static status_t setBluetoothLatencyModesEnabled(bool enabled);

    static status_t setBluetoothVariableLatencyEnabled(bool enabled);



    static status_t supportsBluetoothLatencyModes(bool *support);

    static status_t isBluetoothVariableLatencyEnabled(bool *enabled);



    static status_t supportsBluetoothVariableLatency(bool *support);



    // A listener for capture state changes.

    class CaptureStateListener : public virtual RefBase {

media/libaudioclient/include/media/IAudioFlinger.h

+16 −10
Original line number Diff line number Diff line
@@ -367,9 +367,11 @@ public: 
    virtual status_t getSupportedLatencyModes(audio_io_handle_t output,

            std::vector<audio_latency_mode_t>* modes) = 0;



    virtual status_t setBluetoothLatencyModesEnabled(bool enabled) = 0;

    virtual status_t setBluetoothVariableLatencyEnabled(bool enabled) = 0;



    virtual status_t supportsBluetoothLatencyModes(bool* support) = 0;

    virtual status_t isBluetoothVariableLatencyEnabled(bool* enabled) = 0;



    virtual status_t supportsBluetoothVariableLatency(bool* support) = 0;

};



/**
@@ -476,8 +478,9 @@ public: 
            audio_latency_mode_t mode) override;

    status_t getSupportedLatencyModes(

            audio_io_handle_t output, std::vector<audio_latency_mode_t>* modes) override;

    status_t setBluetoothLatencyModesEnabled(bool enabled) override;

    status_t supportsBluetoothLatencyModes(bool* support) override;

    status_t setBluetoothVariableLatencyEnabled(bool enabled) override;

    status_t isBluetoothVariableLatencyEnabled(bool* enabled) override;

    status_t supportsBluetoothVariableLatency(bool* support) override;



private:

    const sp<media::IAudioFlingerService> mDelegate;
@@ -569,10 +572,12 @@ public: 
            SET_DEVICE_CONNECTED_STATE = media::BnAudioFlingerService::TRANSACTION_setDeviceConnectedState,

            SET_REQUESTED_LATENCY_MODE = media::BnAudioFlingerService::TRANSACTION_setRequestedLatencyMode,

            GET_SUPPORTED_LATENCY_MODES = media::BnAudioFlingerService::TRANSACTION_getSupportedLatencyModes,

            SET_BLUETOOTH_LATENCY_MODES_ENABLED =

                    media::BnAudioFlingerService::TRANSACTION_setBluetoothLatencyModesEnabled,

            SUPPORTS_BLUETOOTH_LATENCY_MODES =

                    media::BnAudioFlingerService::TRANSACTION_supportsBluetoothLatencyModes,

            SET_BLUETOOTH_VARIABLE_LATENCY_ENABLED =

                    media::BnAudioFlingerService::TRANSACTION_setBluetoothVariableLatencyEnabled,

            IS_BLUETOOTH_VARIABLE_LATENCY_ENABLED =

                    media::BnAudioFlingerService::TRANSACTION_isBluetoothVariableLatencyEnabled,

            SUPPORTS_BLUETOOTH_VARIABLE_LATENCY =

                    media::BnAudioFlingerService::TRANSACTION_supportsBluetoothVariableLatency,

        };



    protected:
@@ -698,8 +703,9 @@ public: 
            int output, media::audio::common::AudioLatencyMode mode) override;

    Status getSupportedLatencyModes(int output,

            std::vector<media::audio::common::AudioLatencyMode>* _aidl_return) override;

    Status setBluetoothLatencyModesEnabled(bool enabled) override;

    Status supportsBluetoothLatencyModes(bool* support) override;

    Status setBluetoothVariableLatencyEnabled(bool enabled) override;

    Status isBluetoothVariableLatencyEnabled(bool* enabled) override;

    Status supportsBluetoothVariableLatency(bool* support) override;

private:

    const sp<AudioFlingerServerAdapter::Delegate> mDelegate;

};