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

Commit f887ccb8 authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Automerger Merge Worker
Browse files

Update code after moving UUID conversions to their own class am: 52915ac7 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I68fee81bcbb356a443dd5ad28305cdc25640fce3
parents 9552a7e6 52915ac7

media/libaudiohal/impl/EffectHalHidl.cpp

+4 −4
Original line number Diff line number Diff line
@@ -25,9 +25,9 @@ 


#include "EffectBufferHalHidl.h"

#include "EffectHalHidl.h"

#include "HidlUtils.h"

#include "UuidUtils.h"



using ::android::hardware::audio::common::CPP_VERSION::implementation::HidlUtils;

using ::android::hardware::audio::common::CPP_VERSION::implementation::UuidUtils;

using ::android::hardware::audio::common::utils::EnumBitfield;

using ::android::hardware::hidl_vec;

using ::android::hardware::MQDescriptorSync;
@@ -58,8 +58,8 @@ EffectHalHidl::~EffectHalHidl() { 
// static

void EffectHalHidl::effectDescriptorToHal(

        const EffectDescriptor& descriptor, effect_descriptor_t* halDescriptor) {

    HidlUtils::uuidToHal(descriptor.type, &halDescriptor->type);

    HidlUtils::uuidToHal(descriptor.uuid, &halDescriptor->uuid);

    UuidUtils::uuidToHal(descriptor.type, &halDescriptor->type);

    UuidUtils::uuidToHal(descriptor.uuid, &halDescriptor->uuid);

    halDescriptor->flags = static_cast<uint32_t>(descriptor.flags);

    halDescriptor->cpuLoad = descriptor.cpuLoad;

    halDescriptor->memoryUsage = descriptor.memoryUsage;

media/libaudiohal/impl/EffectsFactoryHalHidl.cpp

+4 −4
Original line number Diff line number Diff line
@@ -23,9 +23,9 @@ 
#include "EffectBufferHalHidl.h"

#include "EffectHalHidl.h"

#include "EffectsFactoryHalHidl.h"

#include "HidlUtils.h"

#include "UuidUtils.h"



using ::android::hardware::audio::common::CPP_VERSION::implementation::HidlUtils;

using ::android::hardware::audio::common::CPP_VERSION::implementation::UuidUtils;

using ::android::hardware::Return;



namespace android {
@@ -85,7 +85,7 @@ status_t EffectsFactoryHalHidl::getDescriptor( 
    // TODO: check for nullptr

    if (mEffectsFactory == 0) return NO_INIT;

    Uuid hidlUuid;

    HidlUtils::uuidFromHal(*pEffectUuid, &hidlUuid);

    UuidUtils::uuidFromHal(*pEffectUuid, &hidlUuid);

    Result retval = Result::NOT_INITIALIZED;

    Return<void> ret = mEffectsFactory->getDescriptor(hidlUuid,

            [&](Result r, const EffectDescriptor& result) {
@@ -107,7 +107,7 @@ status_t EffectsFactoryHalHidl::createEffect( 
        int32_t deviceId __unused, sp<EffectHalInterface> *effect) {

    if (mEffectsFactory == 0) return NO_INIT;

    Uuid hidlUuid;

    HidlUtils::uuidFromHal(*pEffectUuid, &hidlUuid);

    UuidUtils::uuidFromHal(*pEffectUuid, &hidlUuid);

    Result retval = Result::NOT_INITIALIZED;

    Return<void> ret;

#if MAJOR_VERSION >= 6