Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 03d16e12: Merge "Make setCaptureRate locale safe"

Browse Source 
* commit '03d16e122aa01f9283836d1e5144428082b4c1cd':
  Make setCaptureRate locale safe
This commit is contained in:
Jean-Baptiste Queru
2012-08-27 11:28:00 -07:00
committed by Android Git Automerger
parent e70a32afc5 03d16e122a
commit 26ad1e7874
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
media/java/android/media/MediaRecorder.java
View File

@@ -351,12 +351,11 @@ public class MediaRecorder
*/ */
public void setCaptureRate(double fps) { public void setCaptureRate(double fps) {
// Make sure that time lapse is enabled when this method is called. // Make sure that time lapse is enabled when this method is called.
setParameter(String.format("time-lapse-enable=1")); setParameter("time-lapse-enable=1");
double timeBetweenFrameCapture = 1 / fps; double timeBetweenFrameCapture = 1 / fps;
int timeBetweenFrameCaptureMs = (int) (1000 * timeBetweenFrameCapture); int timeBetweenFrameCaptureMs = (int) (1000 * timeBetweenFrameCapture);
setParameter(String.format("time-between-time-lapse-frame-capture=%d", setParameter("time-between-time-lapse-frame-capture=" + timeBetweenFrameCaptureMs);
timeBetweenFrameCaptureMs));
} }
/** /**