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

Commit a8777db9 authored by Eric Laurent's avatar Eric Laurent Committed by Automerger Merge Worker
Browse files

Merge changes I671ed0aa,If817d08a into sc-v2-dev am: 600a2b88 

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

Change-Id: I9749a244657749726f9efe92be26b6b9a287b6e4
parents 9913f6d2 600a2b88

media/libaudioclient/AudioSystem.cpp

+6 −0
Original line number Diff line number Diff line
@@ -480,6 +480,12 @@ status_t AudioSystem::systemReady() { 
    return af->systemReady();

}



status_t AudioSystem::audioPolicyReady() {

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

    if (af == 0) return NO_INIT;

    return af->audioPolicyReady();

}



status_t AudioSystem::getFrameCountHAL(audio_io_handle_t ioHandle,

                                       size_t* frameCount) {

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

media/libaudioclient/IAudioFlinger.cpp

+9 −0
Original line number Diff line number Diff line
@@ -707,6 +707,10 @@ status_t AudioFlingerClientAdapter::systemReady() { 
    return statusTFromBinderStatus(mDelegate->systemReady());

}



status_t AudioFlingerClientAdapter::audioPolicyReady() {

    return statusTFromBinderStatus(mDelegate->audioPolicyReady());

}



size_t AudioFlingerClientAdapter::frameCountHAL(audio_io_handle_t ioHandle) const {

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

        int32_t ioHandleAidl = VALUE_OR_RETURN(legacy2aidl_audio_io_handle_t_int32_t(ioHandle));
@@ -1180,6 +1184,11 @@ Status AudioFlingerServerAdapter::systemReady() { 
    return Status::fromStatusT(mDelegate->systemReady());

}



Status AudioFlingerServerAdapter::audioPolicyReady() {

    mDelegate->audioPolicyReady();

    return Status::ok();

}



Status AudioFlingerServerAdapter::frameCountHAL(int32_t ioHandle, int64_t* _aidl_return) {

    audio_io_handle_t ioHandleLegacy = VALUE_OR_RETURN_BINDER(

            aidl2legacy_int32_t_audio_io_handle_t(ioHandle));

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

+3 −0
Original line number Diff line number Diff line
@@ -197,6 +197,9 @@ interface IAudioFlingerService { 
    /* Indicate JAVA services are ready (scheduling, power management ...) */

    oneway void systemReady();



    /* Indicate audio policy service is ready */

    oneway void audioPolicyReady();



    // Returns the number of frames per audio HAL buffer.

    long frameCountHAL(int /* audio_io_handle_t */ ioHandle);

media/libaudioclient/include/media/AudioSystem.h

+3 −0
Original line number Diff line number Diff line
@@ -225,6 +225,9 @@ public: 
    // Indicate JAVA services are ready (scheduling, power management ...)

    static status_t systemReady();



    // Indicate audio policy service is ready

    static status_t audioPolicyReady();



    // Returns the number of frames per audio HAL buffer.

    // Corresponds to audio_stream->get_buffer_size()/audio_stream_in_frame_size() for input.

    // See also getFrameCount().

media/libaudioclient/include/media/IAudioFlinger.h

+7 −0
Original line number Diff line number Diff line
@@ -328,6 +328,9 @@ public: 
    /* Indicate JAVA services are ready (scheduling, power management ...) */

    virtual status_t systemReady() = 0;



    // Indicate audio policy service is ready

    virtual status_t audioPolicyReady() = 0;



    // Returns the number of frames per audio HAL buffer.

    virtual size_t frameCountHAL(audio_io_handle_t ioHandle) const = 0;
@@ -431,6 +434,8 @@ public: 
    status_t setAudioPortConfig(const struct audio_port_config* config) override;

    audio_hw_sync_t getAudioHwSyncForSession(audio_session_t sessionId) override;

    status_t systemReady() override;

    status_t audioPolicyReady() override;



    size_t frameCountHAL(audio_io_handle_t ioHandle) const override;

    status_t getMicrophones(std::vector<media::MicrophoneInfo>* microphones) override;

    status_t setAudioHalPids(const std::vector<pid_t>& pids) override;
@@ -513,6 +518,7 @@ public: 
            SET_AUDIO_PORT_CONFIG = media::BnAudioFlingerService::TRANSACTION_setAudioPortConfig,

            GET_AUDIO_HW_SYNC_FOR_SESSION = media::BnAudioFlingerService::TRANSACTION_getAudioHwSyncForSession,

            SYSTEM_READY = media::BnAudioFlingerService::TRANSACTION_systemReady,

            AUDIO_POLICY_READY = media::BnAudioFlingerService::TRANSACTION_audioPolicyReady,

            FRAME_COUNT_HAL = media::BnAudioFlingerService::TRANSACTION_frameCountHAL,

            GET_MICROPHONES = media::BnAudioFlingerService::TRANSACTION_getMicrophones,

            SET_MASTER_BALANCE = media::BnAudioFlingerService::TRANSACTION_setMasterBalance,
@@ -623,6 +629,7 @@ public: 
    Status setAudioPortConfig(const media::AudioPortConfig& config) override;

    Status getAudioHwSyncForSession(int32_t sessionId, int32_t* _aidl_return) override;

    Status systemReady() override;

    Status audioPolicyReady() override;

    Status frameCountHAL(int32_t ioHandle, int64_t* _aidl_return) override;

    Status getMicrophones(std::vector<media::MicrophoneInfoData>* _aidl_return) override;

    Status setAudioHalPids(const std::vector<int32_t>& pids) override;