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

Commit 65cd280e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "libaudiohal: Plumb straightforward calls to AIDL HAL" am: 14806c3a... 

Merge "libaudiohal: Plumb straightforward calls to AIDL HAL" am: 14806c3a am: 3fa7acaa am: 5779287e

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



Change-Id: I1567dbfdfed6e145f76eb0a8ad4fd79e371196c8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4669a143 5779287e

media/libaudiohal/impl/DeviceHalAidl.cpp

+6 −3
Original line number Diff line number Diff line
@@ -937,10 +937,13 @@ status_t DeviceHalAidl::dump(int fd, const Vector<String16>& args) { 
    return mModule->dump(fd, Args(args).args(), args.size());

}



int32_t DeviceHalAidl::supportsBluetoothVariableLatency(bool* supports __unused) {

int32_t DeviceHalAidl::supportsBluetoothVariableLatency(bool* supports) {

    TIME_CHECK();

    ALOGE("%s not implemented yet", __func__);

    return INVALID_OPERATION;

    if (!mModule) return NO_INIT;

    if (supports == nullptr) {

        return BAD_VALUE;

    }

    return statusTFromBinderStatus(mModule->supportsVariableLatency(supports));

}



status_t DeviceHalAidl::getSoundDoseInterface(const std::string& module,

media/libaudiohal/impl/StreamHalAidl.cpp

+49 −28
Original line number Diff line number Diff line
@@ -599,11 +599,10 @@ status_t StreamOutHalAidl::setVolume(float left, float right) { 
    return statusTFromBinderStatus(mStream->setHwVolume({left, right}));

}



status_t StreamOutHalAidl::selectPresentation(int presentationId __unused, int programId __unused) {

status_t StreamOutHalAidl::selectPresentation(int presentationId, int programId) {

    TIME_CHECK();

    if (!mStream) return NO_INIT;

    ALOGE("%s not implemented yet", __func__);

    return OK;

    return statusTFromBinderStatus(mStream->selectPresentation(presentationId, programId));

}



status_t StreamOutHalAidl::write(const void *buffer, size_t bytes, size_t *written) {
@@ -709,48 +708,61 @@ status_t StreamOutHalAidl::updateSourceMetadata( 
    return statusTFromBinderStatus(mStream->updateMetadata(aidlMetadata));

}



status_t StreamOutHalAidl::getDualMonoMode(audio_dual_mono_mode_t* mode __unused) {

status_t StreamOutHalAidl::getDualMonoMode(audio_dual_mono_mode_t* mode) {

    TIME_CHECK();

    if (!mStream) return NO_INIT;

    ALOGE("%s not implemented yet", __func__);

    if (mode == nullptr) {

        return BAD_VALUE;

    }

    ::aidl::android::media::audio::common::AudioDualMonoMode aidlMode;

    RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(mStream->getDualMonoMode(&aidlMode)));

    *mode = VALUE_OR_RETURN_STATUS(

            ::aidl::android::aidl2legacy_AudioDualMonoMode_audio_dual_mono_mode_t(aidlMode));

    return OK;

}



status_t StreamOutHalAidl::setDualMonoMode(audio_dual_mono_mode_t mode __unused) {

status_t StreamOutHalAidl::setDualMonoMode(audio_dual_mono_mode_t mode) {

    TIME_CHECK();

    if (!mStream) return NO_INIT;

    ALOGE("%s not implemented yet", __func__);

    return OK;

    ::aidl::android::media::audio::common::AudioDualMonoMode aidlMode = VALUE_OR_RETURN_STATUS(

            ::aidl::android::legacy2aidl_audio_dual_mono_mode_t_AudioDualMonoMode(mode));

    return statusTFromBinderStatus(mStream->setDualMonoMode(aidlMode));

}



status_t StreamOutHalAidl::getAudioDescriptionMixLevel(float* leveldB __unused) {

status_t StreamOutHalAidl::getAudioDescriptionMixLevel(float* leveldB) {

    TIME_CHECK();

    if (!mStream) return NO_INIT;

    ALOGE("%s not implemented yet", __func__);

    return OK;

    if (leveldB == nullptr) {

        return BAD_VALUE;

    }

    return statusTFromBinderStatus(mStream->getAudioDescriptionMixLevel(leveldB));

}



status_t StreamOutHalAidl::setAudioDescriptionMixLevel(float leveldB __unused) {

status_t StreamOutHalAidl::setAudioDescriptionMixLevel(float leveldB) {

    TIME_CHECK();

    if (!mStream) return NO_INIT;

    ALOGE("%s not implemented yet", __func__);

    return OK;

    return statusTFromBinderStatus(mStream->setAudioDescriptionMixLevel(leveldB));

}



status_t StreamOutHalAidl::getPlaybackRateParameters(

        audio_playback_rate_t* playbackRate __unused) {

status_t StreamOutHalAidl::getPlaybackRateParameters(audio_playback_rate_t* playbackRate) {

    TIME_CHECK();

    if (!mStream) return NO_INIT;

    ALOGE("%s not implemented yet", __func__);

    if (playbackRate == nullptr) {

        return BAD_VALUE;

    }

    ::aidl::android::media::audio::common::AudioPlaybackRate aidlRate;

    RETURN_STATUS_IF_ERROR(statusTFromBinderStatus(mStream->getPlaybackRateParameters(&aidlRate)));

    *playbackRate = VALUE_OR_RETURN_STATUS(

            ::aidl::android::aidl2legacy_AudioPlaybackRate_audio_playback_rate_t(aidlRate));

    return OK;

}



status_t StreamOutHalAidl::setPlaybackRateParameters(

        const audio_playback_rate_t& playbackRate __unused) {

status_t StreamOutHalAidl::setPlaybackRateParameters(const audio_playback_rate_t& playbackRate) {

    TIME_CHECK();

    if (!mStream) return NO_INIT;

    ALOGE("%s not implemented yet", __func__);

    return BAD_VALUE;

    ::aidl::android::media::audio::common::AudioPlaybackRate aidlRate = VALUE_OR_RETURN_STATUS(

            ::aidl::android::legacy2aidl_audio_playback_rate_t_AudioPlaybackRate(playbackRate));

    return statusTFromBinderStatus(mStream->setPlaybackRateParameters(aidlRate));

}



status_t StreamOutHalAidl::setEventCallback(
@@ -763,18 +775,27 @@ status_t StreamOutHalAidl::setEventCallback( 
    return OK;

}



status_t StreamOutHalAidl::setLatencyMode(audio_latency_mode_t mode __unused) {

status_t StreamOutHalAidl::setLatencyMode(audio_latency_mode_t mode) {

    TIME_CHECK();

    if (!mStream) return NO_INIT;

    ALOGE("%s not implemented yet", __func__);

    return OK;

    ::aidl::android::media::audio::common::AudioLatencyMode aidlMode = VALUE_OR_RETURN_STATUS(

            ::aidl::android::legacy2aidl_audio_latency_mode_t_AudioLatencyMode(mode));

    return statusTFromBinderStatus(mStream->setLatencyMode(aidlMode));

};



status_t StreamOutHalAidl::getRecommendedLatencyModes(

        std::vector<audio_latency_mode_t> *modes __unused) {

status_t StreamOutHalAidl::getRecommendedLatencyModes(std::vector<audio_latency_mode_t> *modes) {

    TIME_CHECK();

    if (!mStream) return NO_INIT;

    ALOGE("%s not implemented yet", __func__);

    if (modes == nullptr) {

        return BAD_VALUE;

    }

    std::vector<::aidl::android::media::audio::common::AudioLatencyMode> aidlModes;

    RETURN_STATUS_IF_ERROR(

            statusTFromBinderStatus(mStream->getRecommendedLatencyModes(&aidlModes)));

    *modes = VALUE_OR_RETURN_STATUS(

            ::aidl::android::convertContainer<std::vector<audio_latency_mode_t>>(

                    aidlModes,

                    ::aidl::android::aidl2legacy_AudioLatencyMode_audio_latency_mode_t));

    return OK;

};