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

Commit 42969d3c authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Update usage of HidlUtils functions"

parents e9ebb9ef f242ab2e

media/libaudiohal/impl/DeviceHalHidl.cpp

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

    if (mDevice == 0) return NO_INIT;

    AudioConfig hidlConfig;

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

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

    Result retval;

    Return<void> ret = mDevice->getInputBufferSize(

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

    if (status != OK) return status;

    AudioConfig hidlConfig;

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

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

    Result retval = Result::NOT_INITIALIZED;

    Return<void> ret = mDevice->openOutputStream(

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

    if (status != OK) return status;

    AudioConfig hidlConfig;

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

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

    Result retval = Result::NOT_INITIALIZED;

#if MAJOR_VERSION == 2

    auto sinkMetadata = AudioSource(source);