summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorChong Zhang <chz@google.com>2015-02-24 22:22:09 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-02-24 22:22:11 +0000
commitcff41ae3635170b93acca5bfd2813b719e060e0f (patch)
treec61126d43908a5c08eafe1788996bfc2cfc3dc60 /media
parenta9e1c4e54044c59f6001a6d9e6c01ffb07cfc47c (diff)
parentfbdee2c04b88210bab5c9a769908be42d1775e16 (diff)
downloadframeworks_base-cff41ae3635170b93acca5bfd2813b719e060e0f.zip
frameworks_base-cff41ae3635170b93acca5bfd2813b719e060e0f.tar.gz
frameworks_base-cff41ae3635170b93acca5bfd2813b719e060e0f.tar.bz2
Merge "MediaRecorder: pass capture fps in float"
Diffstat (limited to 'media')
-rw-r--r--media/java/android/media/MediaRecorder.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/media/java/android/media/MediaRecorder.java b/media/java/android/media/MediaRecorder.java
index 81d5afe..97b3f63 100644
--- a/media/java/android/media/MediaRecorder.java
+++ b/media/java/android/media/MediaRecorder.java
@@ -437,10 +437,7 @@ public class MediaRecorder
public void setCaptureRate(double fps) {
// Make sure that time lapse is enabled when this method is called.
setParameter("time-lapse-enable=1");
-
- double timeBetweenFrameCapture = 1 / fps;
- long timeBetweenFrameCaptureUs = (long) (1000000 * timeBetweenFrameCapture);
- setParameter("time-between-time-lapse-frame-capture=" + timeBetweenFrameCaptureUs);
+ setParameter("time-lapse-fps=" + fps);
}
/**