Merge "Use default sample rate for DIRECT Audio thread" am: 4c47d3196d am: 4d603ca3ad

Change-Id: I013ef1947d7abcbf6c5a1134dc78c6b6a088dd81

services/audioflinger/Effects.cpp

@@ -622,7 +622,7 @@ status_t AudioFlinger::EffectModule::configure()
     mConfig.outputCfg.format = EFFECT_BUFFER_FORMAT;
 
     // Don't use sample rate for thread if effect isn't offloadable.
-    if ((thread->type() == ThreadBase::OFFLOAD) && !isOffloaded()) {
+    if (isOffloadedOrDirect() && !isOffloaded()) {
         mConfig.inputCfg.samplingRate = DEFAULT_OUTPUT_SAMPLE_RATE;
         ALOGV("Overriding effect input as 48kHz");
     } else {