am 26ad1e78: am 03d16e12: Merge "Make setCaptureRate locale safe"

* commit '26ad1e7874f3151ec331e142fdcb8b3a22ddc26a':
  Make setCaptureRate locale safe
This commit is contained in:
Jean-Baptiste Queru
2012-08-27 11:29:29 -07:00
committed by Android Git Automerger

View File

@@ -351,12 +351,11 @@ public class MediaRecorder
*/
public void setCaptureRate(double fps) {
// 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;
int timeBetweenFrameCaptureMs = (int) (1000 * timeBetweenFrameCapture);
setParameter(String.format("time-between-time-lapse-frame-capture=%d",
timeBetweenFrameCaptureMs));
setParameter("time-between-time-lapse-frame-capture=" + timeBetweenFrameCaptureMs);
}
/**