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

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

Merge "audio: Fix the type used for timekeeping" into main am: e3ed7398 am:... 

Merge "audio: Fix the type used for timekeeping" into main am: e3ed7398 am: da3b33a4 am: 6178a827

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2894924



Change-Id: I6dead6af17b8364d52548c5d73e0984e1341d18e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dcc85601 6178a827

audio/aidl/default/include/core-impl/StreamPrimary.h

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ class StreamPrimary : public StreamAlsa { 
    std::vector<alsa::DeviceProfile> getDeviceProfiles() override;



    const bool mIsAsynchronous;

    long mStartTimeNs = 0;

    int64_t mStartTimeNs = 0;

    long mFramesSinceStart = 0;

    bool mSkipNextTransfer = false;

};

audio/aidl/default/include/core-impl/StreamRemoteSubmix.h

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ class StreamRemoteSubmix : public StreamCommonImpl { 
    // 5ms between two read attempts when pipe is empty

    static constexpr int kReadAttemptSleepUs = 5000;



    long mStartTimeNs = 0;

    int64_t mStartTimeNs = 0;

    long mFramesSinceStart = 0;

    int mReadErrorCount = 0;

};

audio/aidl/default/r_submix/StreamRemoteSubmix.cpp

+3 −3
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ void StreamRemoteSubmix::shutdown() { 
                                    : outWrite(buffer, frameCount, actualFrameCount));

    const long bufferDurationUs =

            (*actualFrameCount) * MICROS_PER_SECOND / mContext.getSampleRate();

    const long totalDurationUs = (::android::uptimeNanos() - mStartTimeNs) / NANOS_PER_MICROSECOND;

    const auto totalDurationUs = (::android::uptimeNanos() - mStartTimeNs) / NANOS_PER_MICROSECOND;

    mFramesSinceStart += *actualFrameCount;

    const long totalOffsetUs =

            mFramesSinceStart * MICROS_PER_SECOND / mContext.getSampleRate() - totalDurationUs;
@@ -274,7 +274,7 @@ size_t StreamRemoteSubmix::getStreamPipeSizeInFrames() { 
    char* buff = (char*)buffer;

    size_t actuallyRead = 0;

    long remainingFrames = frameCount;

    const long deadlineTimeNs = ::android::uptimeNanos() +

    const int64_t deadlineTimeNs = ::android::uptimeNanos() +

                                   getDelayInUsForFrameCount(frameCount) * NANOS_PER_MICROSECOND;

    while (remainingFrames > 0) {

        ssize_t framesRead = source->read(buff, remainingFrames);