summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2014-06-02 08:29:22 -0700
committerGlenn Kasten <gkasten@google.com>2014-06-02 11:29:42 -0700
commit4ea00a25cf85877b48ebd1e15a657cfaab29af58 (patch)
tree1f6d698e24a4907d269116d566488874c6a64089
parent43466a133984182b250453cea244eb146e83c010 (diff)
downloadframeworks_av-4ea00a25cf85877b48ebd1e15a657cfaab29af58.zip
frameworks_av-4ea00a25cf85877b48ebd1e15a657cfaab29af58.tar.gz
frameworks_av-4ea00a25cf85877b48ebd1e15a657cfaab29af58.tar.bz2
Add mPrimaryOutputSampleRate
Change-Id: I46b527fc3f2b5a5720a74b4f0b9a8f2e0d570b09
-rw-r--r--services/audioflinger/AudioFlinger.cpp5
-rw-r--r--services/audioflinger/AudioFlinger.h3
2 files changed, 7 insertions, 1 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index 5b09d54..527fd65 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -169,7 +169,8 @@ AudioFlinger::AudioFlinger()
mBtNrecIsOff(false),
mIsLowRamDevice(true),
mIsDeviceTypeKnown(false),
- mGlobalEffectEnableTime(0)
+ mGlobalEffectEnableTime(0),
+ mPrimaryOutputSampleRate(0)
{
getpid_cached = getpid();
char value[PROPERTY_VALUE_MAX];
@@ -1679,6 +1680,8 @@ audio_io_handle_t AudioFlinger::openOutput(audio_module_handle_t module,
mHardwareStatus = AUDIO_HW_SET_MODE;
hwDevHal->set_mode(hwDevHal, mMode);
mHardwareStatus = AUDIO_HW_IDLE;
+
+ mPrimaryOutputSampleRate = config.sample_rate;
}
return id;
}
diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h
index 29dc6b2..8d11e72 100644
--- a/services/audioflinger/AudioFlinger.h
+++ b/services/audioflinger/AudioFlinger.h
@@ -691,6 +691,9 @@ private:
nsecs_t mGlobalEffectEnableTime; // when a global effect was last enabled
sp<PatchPanel> mPatchPanel;
+
+ uint32_t mPrimaryOutputSampleRate; // sample rate of the primary output, or zero if none
+ // protected by mHardwareLock
};
#undef INCLUDING_FROM_AUDIOFLINGER_H