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

Commit d3030da2 authored by John Grossman's avatar John Grossman
Browse files

Fix the build

forgot to upload final fixup during merge.  sry about that

Change-Id: I2ddd2c08d8efa83c0a8d1e378ae4c28686145154
parent 1c345196
Loading
Loading
Loading
Loading
+14 −14
Original line number Diff line number Diff line
@@ -4031,7 +4031,7 @@ void AudioFlinger::PlaybackThread::TimedTrack::trimTimedBufferQueue_l() {

void AudioFlinger::PlaybackThread::TimedTrack::trimTimedBufferQueueHead_l(
        const char* logTag) {
    LOG_ASSERT(mTimedBufferQueue.size() > 0,
    ALOG_ASSERT(mTimedBufferQueue.size() > 0,
                "%s called (reason \"%s\"), but timed buffer queue has no"
                " elements to trim.", __FUNCTION__, logTag);

@@ -4045,14 +4045,14 @@ void AudioFlinger::PlaybackThread::TimedTrack::updateFramesPendingAfterTrim_l(
    uint32_t bufBytes        = buf.buffer()->size();
    uint32_t consumedAlready = buf.position();

    LOG_ASSERT(consumedAlready <= bufFrames,
    ALOG_ASSERT(consumedAlready <= bufFrames,
                "Bad bookkeeping while updating frames pending.  Timed buffer is"
                " only %u bytes long, but claims to have consumed %u"
                " bytes.  (update reason: \"%s\")",
                bufFrames, consumedAlready, logTag);

    uint32_t bufFrames = (bufBytes - consumedAlready) / mCblk->frameSize;
    LOG_ASSERT(mFramesPendingInQueue >= bufFrames,
    ALOG_ASSERT(mFramesPendingInQueue >= bufFrames,
                "Bad bookkeeping while updating frames pending.  Should have at"
                " least %u queued frames, but we think we have only %u.  (update"
                " reason: \"%s\")",
@@ -4184,7 +4184,7 @@ status_t AudioFlinger::PlaybackThread::TimedTrack::getNextBuffer(
        }
        if (!mLocalTimeToSampleTransform.doForwardTransform(
                (effectivePTS - pts) << 32, &sampleDelta)) {
            LOGV("*** too late during sample rate transform: dropped buffer");
            ALOGV("*** too late during sample rate transform: dropped buffer");
            trimTimedBufferQueueHead_l("getNextBuffer, bad local to sample");
            continue;
        }