Merge change 20607

* changes: Limit AudioFlinger mixer track sampling rate.
2009-08-10 16:04:29 -07:00
parent a1cbccd7b3 6f7e097ee5
commit 2e9c859f20
1 changed files with 4 additions and 0 deletions
--- a/libs/audioflinger/AudioFlinger.cpp
+++ b/libs/audioflinger/AudioFlinger.cpp
@@ -1512,6 +1512,10 @@ bool AudioFlinger::MixerThread::checkForNewParameters_l()
                    int name = getTrackName_l();
                    if (name < 0) break;
                    mTracks[i]->mName = name;
+                    // limit track sample rate to 2 x new output sample rate
+                    if (mTracks[i]->mCblk->sampleRate > 2 * sampleRate()) {
+                        mTracks[i]->mCblk->sampleRate = 2 * sampleRate();
+                    }
                }
                sendConfigEvent_l(AudioSystem::OUTPUT_CONFIG_CHANGED);
            }