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

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

Merge "Skip frames out limit for non pcm" into main am: 61ff90cc am: 50d3ef51 am: eb9f5834 

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



Change-Id: I2c86ee252f63419f0090fab667201f0b8d27d92f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0eb38622 eb9f5834

services/audioflinger/Threads.cpp

+5 −3
Original line number Diff line number Diff line
@@ -8550,9 +8550,11 @@ reacquire_wakelock: 
                // from framesIn.

                // This isn't strictly necessary but helps limit buffer resizing in

                // RecordBufferConverter.  TODO: remove when no longer needed.

                if (audio_is_linear_pcm(activeTrack->format())) {

                    framesOut = min(framesOut,

                            destinationFramesPossible(

                                    framesIn, mSampleRate, activeTrack->sampleRate()));

                }



                if (activeTrack->isDirect()) {

                    // No RecordBufferConverter used for direct streams. Pass