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

Commit acb39366 authored by Andy Hung's avatar Andy Hung Committed by Automerger Merge Worker
Browse files

Merge "MediaMetrics: Fix clang-tidy bugprone-narrowing-conversions" am: da5e73ad am: 0e4dcf9d 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie7a59354eddccc6434e93742ccb6ce67a4b6000b
parents eb2d55ba 0e4dcf9d

services/mediametrics/AudioAnalytics.cpp

+2 −2
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ std::pair<std::string, int32_t> AudioAnalytics::dump( 
            } else {

                ss << "Statsd atoms:\n" << statsd;

            }

            ll -= n;

            ll -= (int32_t)n;

        }

    }
@@ -737,7 +737,7 @@ void AudioAnalytics::DeviceConnection::createPatch( 
        mA2dpConnectionServiceNs = 0;

        ++mA2dpConnectionSuccesses;



        const auto connectionTimeMs = float(timeDiffNs * 1e-6);

        const auto connectionTimeMs = float((double)timeDiffNs * 1e-6);



        const auto outputDeviceBits = types::lookup<types::OUTPUT_DEVICE, long_enum_type_t>(

                "AUDIO_DEVICE_OUT_BLUETOOTH_A2DP");

services/mediametrics/AudioPowerUsage.cpp

+5 −5
Original line number Diff line number Diff line
@@ -174,8 +174,8 @@ bool AudioPowerUsage::saveAsItem_l( 
        if (item_device == device && item_type == type) {

            int64_t final_duration_ns = item_duration_ns + duration_ns;

            double final_volume = (device & INPUT_DEVICE_BIT) ? 1.0:

                            ((item_volume * item_duration_ns +

                            average_vol * duration_ns) / final_duration_ns);

                            ((item_volume * (double)item_duration_ns +

                            average_vol * (double)duration_ns) / (double)final_duration_ns);



            item->setInt64(AUDIO_POWER_USAGE_PROP_DURATION_NS, final_duration_ns);

            item->setDouble(AUDIO_POWER_USAGE_PROP_VOLUME, final_volume);
@@ -289,7 +289,7 @@ void AudioPowerUsage::checkMode(const std::shared_ptr<const mediametrics::Item>& 
        const int64_t durationNs = endCallNs - mDeviceTimeNs;

        if (durationNs > 0) {

            mDeviceVolume = (mDeviceVolume * double(mVolumeTimeNs - mDeviceTimeNs) +

                    mVoiceVolume * double(endCallNs - mVolumeTimeNs)) / durationNs;

                    mVoiceVolume * double(endCallNs - mVolumeTimeNs)) / (double)durationNs;

            saveAsItems_l(mPrimaryDevice, durationNs, VOICE_CALL_TYPE, mDeviceVolume);

        }

    } else if (mode == "AUDIO_MODE_IN_CALL") { // entering call mode
@@ -317,7 +317,7 @@ void AudioPowerUsage::checkVoiceVolume(const std::shared_ptr<const mediametrics: 
        const int64_t durationNs = timeNs - mDeviceTimeNs;

        if (durationNs > 0) {

            mDeviceVolume = (mDeviceVolume * double(mVolumeTimeNs - mDeviceTimeNs) +

                    mVoiceVolume * double(timeNs - mVolumeTimeNs)) / durationNs;

                    mVoiceVolume * double(timeNs - mVolumeTimeNs)) / (double)durationNs;

            mVolumeTimeNs = timeNs;

        }

    }
@@ -348,7 +348,7 @@ void AudioPowerUsage::checkCreatePatch(const std::shared_ptr<const mediametrics: 
        const int64_t durationNs = endDeviceNs - mDeviceTimeNs;

        if (durationNs > 0) {

            mDeviceVolume = (mDeviceVolume * double(mVolumeTimeNs - mDeviceTimeNs) +

                    mVoiceVolume * double(endDeviceNs - mVolumeTimeNs)) / durationNs;

                    mVoiceVolume * double(endDeviceNs - mVolumeTimeNs)) / (double)durationNs;

            saveAsItems_l(mPrimaryDevice, durationNs, VOICE_CALL_TYPE, mDeviceVolume);

        }

        // reset statistics

services/mediametrics/MediaMetricsService.cpp

+6 −6
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ MediaMetricsService::~MediaMetricsService() 
{

    ALOGD("%s", __func__);

    // the class destructor clears anyhow, but we enforce clearing items first.

    mItemsDiscarded += mItems.size();

    mItemsDiscarded += (int64_t)mItems.size();

    mItems.clear();

}
@@ -287,7 +287,7 @@ status_t MediaMetricsService::dump(int fd, const Vector<String16>& args) 
        std::lock_guard _l(mLock);



        if (clear) {

            mItemsDiscarded += mItems.size();

            mItemsDiscarded += (int64_t)mItems.size();

            mItems.clear();

            mAudioAnalytics.clear();

        } else {
@@ -416,10 +416,10 @@ bool MediaMetricsService::expirations(const std::shared_ptr<const mediametrics:: 


    if (const size_t toErase = overlimit + expired;

            toErase > 0) {

        mItemsDiscardedCount += overlimit;

        mItemsDiscardedExpire += expired;

        mItemsDiscarded += toErase;

        mItems.erase(mItems.begin(), mItems.begin() + toErase); // erase from front

        mItemsDiscardedCount += (int64_t)overlimit;

        mItemsDiscardedExpire += (int64_t)expired;

        mItemsDiscarded += (int64_t)toErase;

        mItems.erase(mItems.begin(), mItems.begin() + (ptrdiff_t)toErase); // erase from front

    }

    return more;

}