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

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

Merge "AudioClient: Fix clang-tidy warnings" into rvc-dev am: c5f2a7ad am: 230cfea4 

Change-Id: Ieb2dc9ef68dba68eb09912e4cf8cc3e782f2350d
parents 3fd42f5c 230cfea4

include/media/VolumeShaper.h

+2 −2
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ public: 
            , mDurationMs(1000.) {

        }



        explicit Configuration(const Configuration &configuration)

        Configuration(const Configuration &configuration)

            : Interpolator<S, T>(*static_cast<const Interpolator<S, T> *>(&configuration))

            , RefBase()

            , mType(configuration.mType)
@@ -361,7 +361,7 @@ public: 
            : Operation(flags, replaceId, std::numeric_limits<S>::quiet_NaN() /* xOffset */) {

        }



        explicit Operation(const Operation &operation)

        Operation(const Operation &operation)

            : Operation(operation.mFlags, operation.mReplaceId, operation.mXOffset) {

        }

media/libaudioclient/AudioRecord.cpp

+3 −3
Original line number Diff line number Diff line
@@ -394,7 +394,7 @@ status_t AudioRecord::start(AudioSystem::sync_event_t event, audio_session_t tri 
    AutoMutex lock(mLock);



    status_t status = NO_ERROR;

    mediametrics::Defer([&] {

    mediametrics::Defer defer([&] {

        mediametrics::LogItem(mMetricsId)

            .set(AMEDIAMETRICS_PROP_EVENT, AMEDIAMETRICS_PROP_EVENT_VALUE_START)

            .set(AMEDIAMETRICS_PROP_DURATIONNS, (int64_t)(systemTime() - beginNs))
@@ -467,7 +467,7 @@ void AudioRecord::stop() 
{

    const int64_t beginNs = systemTime();

    AutoMutex lock(mLock);

    mediametrics::Defer([&] {

    mediametrics::Defer defer([&] {

        mediametrics::LogItem(mMetricsId)

            .set(AMEDIAMETRICS_PROP_EVENT, AMEDIAMETRICS_PROP_EVENT_VALUE_STOP)

            .set(AMEDIAMETRICS_PROP_DURATIONNS, (int64_t)(systemTime() - beginNs))
@@ -1340,7 +1340,7 @@ status_t AudioRecord::restoreRecord_l(const char *from) 
{

    status_t result = NO_ERROR;  // logged: make sure to set this before returning.

    const int64_t beginNs = systemTime();

    mediametrics::Defer([&] {

    mediametrics::Defer defer([&] {

        mediametrics::LogItem(mMetricsId)

            .set(AMEDIAMETRICS_PROP_EVENT, AMEDIAMETRICS_PROP_EVENT_VALUE_RESTORE)

            .set(AMEDIAMETRICS_PROP_DURATIONNS, (int64_t)(systemTime() - beginNs))

media/libaudioclient/AudioTrack.cpp

+5 −5
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ static int64_t convertTimespecToUs(const struct timespec &tv) 
static inline struct timespec convertNsToTimespec(int64_t ns) {

    struct timespec tv;

    tv.tv_sec = static_cast<time_t>(ns / NANOS_PER_SECOND);

    tv.tv_nsec = static_cast<long>(ns % NANOS_PER_SECOND);

    tv.tv_nsec = static_cast<int64_t>(ns % NANOS_PER_SECOND);

    return tv;

}
@@ -639,7 +639,7 @@ status_t AudioTrack::start() 
    AutoMutex lock(mLock);



    status_t status = NO_ERROR; // logged: make sure to set this before returning.

    mediametrics::Defer([&] {

    mediametrics::Defer defer([&] {

        mediametrics::LogItem(mMetricsId)

            .set(AMEDIAMETRICS_PROP_EVENT, AMEDIAMETRICS_PROP_EVENT_VALUE_START)

            .set(AMEDIAMETRICS_PROP_DURATIONNS, (int64_t)(systemTime() - beginNs))
@@ -772,7 +772,7 @@ void AudioTrack::stop() 
    const int64_t beginNs = systemTime();



    AutoMutex lock(mLock);

    mediametrics::Defer([&]() {

    mediametrics::Defer defer([&]() {

        mediametrics::LogItem(mMetricsId)

            .set(AMEDIAMETRICS_PROP_EVENT, AMEDIAMETRICS_PROP_EVENT_VALUE_STOP)

            .set(AMEDIAMETRICS_PROP_DURATIONNS, (int64_t)(systemTime() - beginNs))
@@ -832,7 +832,7 @@ void AudioTrack::flush() 
{

    const int64_t beginNs = systemTime();

    AutoMutex lock(mLock);

    mediametrics::Defer([&]() {

    mediametrics::Defer defer([&]() {

        mediametrics::LogItem(mMetricsId)

            .set(AMEDIAMETRICS_PROP_EVENT, AMEDIAMETRICS_PROP_EVENT_VALUE_FLUSH)

            .set(AMEDIAMETRICS_PROP_DURATIONNS, (int64_t)(systemTime() - beginNs))
@@ -1767,7 +1767,7 @@ status_t AudioTrack::obtainBuffer(Buffer* audioBuffer, int32_t waitCount, size_t 
    } else if (waitCount > 0) {

        time_t ms = WAIT_PERIOD_MS * (time_t) waitCount;

        timeout.tv_sec = ms / 1000;

        timeout.tv_nsec = (long) (ms % 1000) * 1000000;

        timeout.tv_nsec = (ms % 1000) * 1000000;

        requested = &timeout;

    } else {

        ALOGE("%s(%d): invalid waitCount %d", __func__, mPortId, waitCount);

media/libaudioclient/include/media/AudioAttributes.h

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ class AudioAttributes : public Parcelable 
{

public:

    AudioAttributes() = default;

    AudioAttributes(const audio_attributes_t &attributes) : mAttributes(attributes) {}

    AudioAttributes(const audio_attributes_t &attributes) : mAttributes(attributes) {} // NOLINT

    AudioAttributes(volume_group_t groupId,

                    audio_stream_type_t stream,

                    const audio_attributes_t &attributes) :

media/libaudioclient/include/media/AudioTrack.h

+2 −2
Original line number Diff line number Diff line
@@ -947,7 +947,7 @@ public: 
    class AudioTrackThread : public Thread

    {

    public:

        AudioTrackThread(AudioTrack& receiver);

        explicit AudioTrackThread(AudioTrack& receiver);



        // Do not call Thread::requestExitAndWait() without first calling requestExit().

        // Thread::requestExitAndWait() is not virtual, and the implementation doesn't do enough.
@@ -1226,7 +1226,7 @@ public: 
private:

    class DeathNotifier : public IBinder::DeathRecipient {

    public:

        DeathNotifier(AudioTrack* audioTrack) : mAudioTrack(audioTrack) { }

        explicit DeathNotifier(AudioTrack* audioTrack) : mAudioTrack(audioTrack) { }

    protected:

        virtual void        binderDied(const wp<IBinder>& who);

    private: