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

Commit eb9f5834 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 

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



Change-Id: I7324440bdb488e59468be2640fd7afa5c4d39c16
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b770a431 50d3ef51

services/audioflinger/Threads.cpp

+5 −3
Original line number Diff line number Diff line
@@ -8531,9 +8531,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