commit 61ff90cc752a00287e3823a57e57c533bcfb8766
author Andy Hung <hunga@google.com> Thu Nov 16 18:03:36 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Nov 16 18:03:36 2023 +0000
tree 25ab88d4d03884b3ad5d897c37d0d98d8abaf511
parent 2b558d8050c3baae4bc3686c1cfe9830a61c8c91
parent dea650ce42c61a284742235b9e6c40af4f506556

Merge "Skip frames out limit for non pcm" into main

services/audioflinger/Threads.cpp

diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index c158de4..9a1fe1f 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -8553,9 +8553,11 @@
                 // from framesIn.
                 // This isn't strictly necessary but helps limit buffer resizing in
                 // RecordBufferConverter.  TODO: remove when no longer needed.
-                framesOut = min(framesOut,
-                        destinationFramesPossible(
-                                framesIn, mSampleRate, activeTrack->sampleRate()));
+                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