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

Commit bb551703 authored by Phil Burk's avatar Phil Burk Committed by Automerger Merge Worker
Browse files

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

Merge "aaudio: Update language to comply with Android's inclusive language guidance" am: cf7197e3 am: 63347a71 am: 39075258 am: b6e84222 am: 50349588

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

Change-Id: Ib78c0f39e9163c4e8db1482db6659fbb98a88bbb
parents 80f49ee7 50349588

media/libaaudio/examples/utils/dummy.cpp→media/libaaudio/examples/utils/unused.cpp

+5 −0
Original line number Diff line number Diff line 
/**

 * Dummy file needed to get Android Studio to scan this folder.

 * Unused file required to get Android Studio to scan this folder.

 */



int g_DoNotUseThisVariable = 0;

media/libaaudio/src/binding/SharedMemoryParcelable.h

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 


namespace aaudio {



// Arbitrary limits for sanity checks. TODO remove after debugging.

// Arbitrary limits for range checks.

#define MAX_SHARED_MEMORIES (32)

#define MAX_MMAP_OFFSET_BYTES (32 * 1024 * 8)

#define MAX_MMAP_SIZE_BYTES (32 * 1024 * 8)

media/libaaudio/src/flowgraph/AudioProcessorBase.h

+1 −1
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ public: 
    AudioFloatInputPort input;



    /**

     * Dummy processor. The work happens in the read() method.

     * Do nothing. The work happens in the read() method.

     *

     * @param framePosition index of first frame to be processed

     * @param numFrames

services/oboeservice/AAudioServiceStreamShared.cpp

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ int32_t AAudioServiceStreamShared::calculateBufferCapacity(int32_t requestedCapa 
    }

    int32_t capacityInFrames = numBursts * framesPerBurst;



    // Final sanity check.

    // Final range check.

    if (capacityInFrames > MAX_FRAMES_PER_BUFFER) {

        ALOGE("calculateBufferCapacity() calc capacity %d > max %d",

              capacityInFrames, MAX_FRAMES_PER_BUFFER);