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

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

Merge "audio: Update NS for functions from... 

Merge "audio: Update NS for functions from h/i/audio/aidl/common/include/Utils.h" am: 59a368a4 am: 886427ea

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



Change-Id: I271f6d65051aab6b31474ff9c1837545fdf510d5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 49c7f2c3 886427ea

media/audioaidlconversion/AidlConversionNdk.cpp

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ std::vector<std::string> splitString(const std::string& s, char separator) { 
std::vector<std::string> filterOutNonVendorTags(const std::vector<std::string>& tags) {

    std::vector<std::string> result;

    std::copy_if(tags.begin(), tags.end(), std::back_inserter(result),

            ::android::hardware::audio::common::maybeVendorExtension);

            ::aidl::android::hardware::audio::common::maybeVendorExtension);

    return result;

}

media/libaudiohal/impl/DeviceHalAidl.cpp

+3 −3
Original line number Diff line number Diff line
@@ -51,14 +51,14 @@ using aidl::android::media::audio::common::AudioPortExt; 
using aidl::android::media::audio::common::AudioSource;

using aidl::android::media::audio::common::Int;

using aidl::android::media::audio::common::Float;

using aidl::android::hardware::audio::common::getFrameSizeInBytes;

using aidl::android::hardware::audio::common::isBitPositionFlagSet;

using aidl::android::hardware::audio::common::makeBitPositionFlagMask;

using aidl::android::hardware::audio::common::RecordTrackMetadata;

using aidl::android::hardware::audio::core::AudioPatch;

using aidl::android::hardware::audio::core::IModule;

using aidl::android::hardware::audio::core::ITelephony;

using aidl::android::hardware::audio::core::StreamDescriptor;

using android::hardware::audio::common::getFrameSizeInBytes;

using android::hardware::audio::common::isBitPositionFlagSet;

using android::hardware::audio::common::makeBitPositionFlagMask;



namespace android {

media/libaudiohal/impl/effectsAidlConversion/AidlConversionDynamicsProcessing.cpp

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ status_t AidlConversionDp::getParameter(EffectParamWriter& param) { 
            return getLimiterConfig(param);

        }

        case DP_PARAM_GET_CHANNEL_COUNT: {

            uint32_t channel = ::android::hardware::audio::common::getChannelCount(

            uint32_t channel = ::aidl::android::hardware::audio::common::getChannelCount(

                    mCommon.input.base.channelMask);

            RETURN_STATUS_IF_ERROR(param.writeToValue(&channel));

            return OK;

media/libeffects/downmix/aidl/DownmixContext.cpp

+2 −2
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ 
#include "DownmixContext.h"



using aidl::android::hardware::audio::effect::IEffect;

using ::aidl::android::media::audio::common::AudioChannelLayout;

using ::android::hardware::audio::common::getChannelCount;

using aidl::android::hardware::audio::common::getChannelCount;

using aidl::android::media::audio::common::AudioChannelLayout;



namespace aidl::android::hardware::audio::effect {

media/libeffects/dynamicsproc/aidl/DynamicsProcessingContext.cpp

+2 −2
Original line number Diff line number Diff line
@@ -288,8 +288,8 @@ IEffect::Status DynamicsProcessingContext::lvmProcess(float* in, float* out, int 
void DynamicsProcessingContext::init() {

    std::lock_guard lg(mMutex);

    mState = DYNAMICS_PROCESSING_STATE_INITIALIZED;

    mChannelCount =

            ::android::hardware::audio::common::getChannelCount(mCommon.input.base.channelMask);

    mChannelCount = ::aidl::android::hardware::audio::common::getChannelCount(

            mCommon.input.base.channelMask);

}



dp_fx::DPChannel* DynamicsProcessingContext::getChannel_l(int channel) {