summaryrefslogtreecommitdiffstats
path: root/media/libmedia/AudioRecord.cpp
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2016-01-14 22:14:14 +0100
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2016-01-14 22:14:14 +0100
commit998f3a696f0d671832624637c771e3bda3e0c9f5 (patch)
tree67c89508c2eaad57389ffac29d673a09bc8bfaba /media/libmedia/AudioRecord.cpp
parent1c47b26b1ae695c355e4ec0c317716a397588206 (diff)
parent8ad656861c764ea4f8bf8539cb568b01edbf647d (diff)
downloadframeworks_av-998f3a696f0d671832624637c771e3bda3e0c9f5.zip
frameworks_av-998f3a696f0d671832624637c771e3bda3e0c9f5.tar.gz
frameworks_av-998f3a696f0d671832624637c771e3bda3e0c9f5.tar.bz2
Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_frameworks_av into replicant-6.0
Diffstat (limited to 'media/libmedia/AudioRecord.cpp')
-rw-r--r--media/libmedia/AudioRecord.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libmedia/AudioRecord.cpp b/media/libmedia/AudioRecord.cpp
index 66903b3..40f6c44 100644
--- a/media/libmedia/AudioRecord.cpp
+++ b/media/libmedia/AudioRecord.cpp
@@ -276,7 +276,8 @@ status_t AudioRecord::set(
mActive = false;
mUserData = user;
// TODO: add audio hardware input latency here
- if (mTransfer == TRANSFER_CALLBACK) {
+ if (mTransfer == TRANSFER_CALLBACK ||
+ mTransfer == TRANSFER_SYNC) {
mLatency = (1000*mNotificationFramesAct) / sampleRate;
} else {
mLatency = (1000*mFrameCount) / sampleRate;