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

Commit d40b4497 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update language to comply with Android's inclusive language guidance"...

Merge "Update language to comply with Android's inclusive language guidance" am: 78572877 am: 13ec5681 am: d0a6433a am: 0600d18f am: dcc5cfba

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

Change-Id: I50247400e315d8070775627ec981c7f93d9bdd30
parents 0c2b1bda dcc5cfba
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -636,7 +636,7 @@ size_t AudioResamplerDyn<TC, TI, TO>::resample(TO* out, size_t outFrameCount,
    const uint32_t phaseWrapLimit = c.mL << c.mShift;
    size_t inFrameCount = (phaseIncrement * (uint64_t)outFrameCount + phaseFraction)
            / phaseWrapLimit;
    // sanity check that inFrameCount is in signed 32 bit integer range.
    // validate that inFrameCount is in signed 32 bit integer range.
    ALOG_ASSERT(0 <= inFrameCount && inFrameCount < (1U << 31));

    //ALOGV("inFrameCount:%d  outFrameCount:%d"
@@ -646,7 +646,7 @@ size_t AudioResamplerDyn<TC, TI, TO>::resample(TO* out, size_t outFrameCount,
    // NOTE: be very careful when modifying the code here. register
    // pressure is very high and a small change might cause the compiler
    // to generate far less efficient code.
    // Always sanity check the result with objdump or test-resample.
    // Always validate the result with objdump or test-resample.

    // the following logic is a bit convoluted to keep the main processing loop
    // as tight as possible with register allocation.