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

Commit 95e54ae4 authored by Eric Laurent's avatar Eric Laurent Committed by Gerrit Code Review
Browse files

Merge "audio: Fix clang warnings" into main

parents 197ad625 4894038c

include/media/Interpolator.h

+1 −1
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ public: 
            mInterpolatorType = interpolatorType;

            return NO_ERROR;

        default:

            ALOGE("invalid interpolatorType: %d", interpolatorType);

            ALOGE("invalid interpolatorType: %d", static_cast<int>(interpolatorType));

            return BAD_VALUE;

        }

    }

media/audioaidlconversion/AidlConversionCppNdk.cpp

+1 −1
Original line number Diff line number Diff line
@@ -904,7 +904,7 @@ ConversionResult<audio_channel_mask_t> aidl2legacy_AudioChannelLayout_audio_chan 
        case Tag::voiceMask:

            return convert(aidl, mVoice, __func__, "voice");

    }

    ALOGE("%s: unexpected tag value %d", __func__, aidl.getTag());

    ALOGE("%s: unexpected tag value %d", __func__, static_cast<int>(aidl.getTag()));

    return unexpected(BAD_VALUE);

}

media/libaudiofoundation/AudioPort.cpp

+2 −1
Original line number Diff line number Diff line
@@ -192,7 +192,8 @@ void AudioPort::dump(std::string *dst, int spaces, const char* extraInfo, bool v 
                dst->append(

                        base::StringPrintf("%*s extra audio descriptor %zu:\n", eadSpaces, "", i));

                dst->append(base::StringPrintf(

                    "%*s- standard: %u\n", descSpaces, "", mExtraAudioDescriptors[i].standard));

                        "%*s- standard: %u\n", descSpaces, "",

                        static_cast<unsigned>(mExtraAudioDescriptors[i].standard)));

                dst->append(base::StringPrintf("%*s- descriptor:", descSpaces, ""));

                for (auto v : mExtraAudioDescriptors[i].audioDescriptor) {

                    dst->append(base::StringPrintf(" %02x", v));

media/libeffects/hapticgenerator/EffectHapticGenerator.cpp

+1 −1
Original line number Diff line number Diff line
@@ -317,7 +317,7 @@ int HapticGenerator_SetParameter(struct HapticGeneratorContext *context, 
        }

        int id = *(int *) value;

        os::HapticScale hapticIntensity = static_cast<os::HapticScale>(*((int *) value + 1));

        ALOGD("Setting haptic intensity as %d", hapticIntensity);

        ALOGD("Setting haptic intensity as %d", static_cast<int>(hapticIntensity));

        if (hapticIntensity == os::HapticScale::MUTE) {

            context->param.id2Intensity.erase(id);

        } else {

media/libnbaio/SourceAudioBufferProvider.cpp

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ SourceAudioBufferProvider::SourceAudioBufferProvider(const sp<NBAIO_Source>& sou 
    // negotiate with source

    NBAIO_Format counterOffers[1];

    size_t numCounterOffers = 1;

    ssize_t index = source->negotiate(NULL, 0, counterOffers, numCounterOffers);

    [[maybe_unused]] ssize_t index = source->negotiate(NULL, 0, counterOffers, numCounterOffers);

    ALOG_ASSERT(index == (ssize_t) NEGOTIATE && numCounterOffers > 0);

    numCounterOffers = 0;

    index = source->negotiate(counterOffers, 1, NULL, numCounterOffers);