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

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

Merge "Update usage of HidlUtils functions" am: 42969d3c 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic4bcf2ebc7769857e2e6181739b9f9bec4cfa1a6
parents e54bbcdf 42969d3c

media/libaudiohal/impl/DeviceHalHidl.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -212,7 +212,7 @@ status_t DeviceHalHidl::getInputBufferSize( 
        const struct audio_config *config, size_t *size) {

        const struct audio_config *config, size_t *size) {

    if (mDevice == 0) return NO_INIT;

    if (mDevice == 0) return NO_INIT;

    AudioConfig hidlConfig;

    AudioConfig hidlConfig;

    HidlUtils::audioConfigFromHal(*config, &hidlConfig);

    HidlUtils::audioConfigFromHal(*config, true /*isInput*/, &hidlConfig);

    Result retval;

    Result retval;

    Return<void> ret = mDevice->getInputBufferSize(

    Return<void> ret = mDevice->getInputBufferSize(

            hidlConfig,

            hidlConfig,
@@ -237,7 +237,7 @@ status_t DeviceHalHidl::openOutputStream( 
    status_t status = deviceAddressFromHal(deviceType, address, &hidlDevice);

    status_t status = deviceAddressFromHal(deviceType, address, &hidlDevice);

    if (status != OK) return status;

    if (status != OK) return status;

    AudioConfig hidlConfig;

    AudioConfig hidlConfig;

    HidlUtils::audioConfigFromHal(*config, &hidlConfig);

    HidlUtils::audioConfigFromHal(*config, false /*isInput*/, &hidlConfig);

    Result retval = Result::NOT_INITIALIZED;

    Result retval = Result::NOT_INITIALIZED;

    Return<void> ret = mDevice->openOutputStream(

    Return<void> ret = mDevice->openOutputStream(

            handle,

            handle,
@@ -272,7 +272,7 @@ status_t DeviceHalHidl::openInputStream( 
    status_t status = deviceAddressFromHal(devices, address, &hidlDevice);

    status_t status = deviceAddressFromHal(devices, address, &hidlDevice);

    if (status != OK) return status;

    if (status != OK) return status;

    AudioConfig hidlConfig;

    AudioConfig hidlConfig;

    HidlUtils::audioConfigFromHal(*config, &hidlConfig);

    HidlUtils::audioConfigFromHal(*config, true /*isInput*/, &hidlConfig);

    Result retval = Result::NOT_INITIALIZED;

    Result retval = Result::NOT_INITIALIZED;

#if MAJOR_VERSION == 2

#if MAJOR_VERSION == 2

    auto sinkMetadata = AudioSource(source);

    auto sinkMetadata = AudioSource(source);