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

Merge "support time lapse/slow motion on SURFACE source"

Browse Source
This commit is contained in:
Chong Zhang
2014-02-24 17:52:01 +00:00
committed by Android (Google) Code Review
parent 4531e9c45c daa98ca8d7
commit 8440a33b25
2 changed files with 47 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -417,8 +417,8 @@ public class MediaRecorder
setParameter("time-lapse-enable=1"); setParameter("time-lapse-enable=1");
double timeBetweenFrameCapture = 1 / fps; double timeBetweenFrameCapture = 1 / fps;
int timeBetweenFrameCaptureMs = (int) (1000 * timeBetweenFrameCapture); long timeBetweenFrameCaptureUs = (long) (1000000 * timeBetweenFrameCapture);
setParameter("time-between-time-lapse-frame-capture=" + timeBetweenFrameCaptureMs); setParameter("time-between-time-lapse-frame-capture=" + timeBetweenFrameCaptureUs);
} }
/** /**

49
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/mediarecorder/MediaRecorderTest.java
View File

@@ -58,6 +58,7 @@ public class MediaRecorderTest extends ActivityInstrumentationTestCase2<MediaFra
private MediaRecorder mRecorder; private MediaRecorder mRecorder;
private int MIN_VIDEO_FPS = 5; private int MIN_VIDEO_FPS = 5;
private int HIGH_SPEED_FPS = 120;
private static final int CAMERA_ID = 0; private static final int CAMERA_ID = 0;
@@ -221,10 +222,12 @@ public class MediaRecorderTest extends ActivityInstrumentationTestCase2<MediaFra
return success; return success;
} }
private boolean recordVideoFromSurface(int frameRate, int width, int height, private boolean recordVideoFromSurface(
int frameRate, int captureRate, int width, int height,
int videoFormat, int outFormat, String outFile, boolean videoOnly) { int videoFormat, int outFormat, String outFile, boolean videoOnly) {
Log.v(TAG,"recordVideoFromSurface"); Log.v(TAG,"recordVideoFromSurface");
MediaRecorder recorder = new MediaRecorder(); MediaRecorder recorder = new MediaRecorder();
int sleepTime = 33; // normal capture at 33ms / frame
try { try {
if (!videoOnly) { if (!videoOnly) {
recorder.setAudioSource(MediaRecorder.AudioSource.MIC); recorder.setAudioSource(MediaRecorder.AudioSource.MIC);
@@ -233,6 +236,10 @@ public class MediaRecorderTest extends ActivityInstrumentationTestCase2<MediaFra
recorder.setOutputFormat(outFormat); recorder.setOutputFormat(outFormat);
recorder.setOutputFile(outFile); recorder.setOutputFile(outFile);
recorder.setVideoFrameRate(frameRate); recorder.setVideoFrameRate(frameRate);
if (captureRate > 0) {
recorder.setCaptureRate(captureRate);
sleepTime = 1000 / captureRate;
}
recorder.setVideoSize(width, height); recorder.setVideoSize(width, height);
recorder.setVideoEncoder(videoFormat); recorder.setVideoEncoder(videoFormat);
if (!videoOnly) { if (!videoOnly) {
@@ -256,7 +263,7 @@ public class MediaRecorderTest extends ActivityInstrumentationTestCase2<MediaFra
String text = "Frame #" + i; String text = "Frame #" + i;
canvas.drawText(text, 100, 100, paint); canvas.drawText(text, 100, 100, paint);
surface.unlockCanvasAndPost(canvas); surface.unlockCanvasAndPost(canvas);
Thread.sleep(33); Thread.sleep(sleepTime);
} }
Log.v(TAG, "start"); Log.v(TAG, "start");
@@ -270,7 +277,7 @@ public class MediaRecorderTest extends ActivityInstrumentationTestCase2<MediaFra
String text = "Frame #" + i; String text = "Frame #" + i;
canvas.drawText(text, 100, 100, paint); canvas.drawText(text, 100, 100, paint);
surface.unlockCanvasAndPost(canvas); surface.unlockCanvasAndPost(canvas);
Thread.sleep(33); Thread.sleep(sleepTime);
} }
Log.v(TAG, "stop"); Log.v(TAG, "stop");
@@ -517,7 +524,7 @@ public class MediaRecorderTest extends ActivityInstrumentationTestCase2<MediaFra
String filename = "/sdcard/surface_" + String filename = "/sdcard/surface_" +
(k==0?"video_only":"with_audio") + ".3gp"; (k==0?"video_only":"with_audio") + ".3gp";
success = recordVideoFromSurface(frameRate, 352, 288, codec, success = recordVideoFromSurface(frameRate, 0, 352, 288, codec,
MediaRecorder.OutputFormat.THREE_GPP, filename, MediaRecorder.OutputFormat.THREE_GPP, filename,
k == 0 ? true : false /* videoOnly */); k == 0 ? true : false /* videoOnly */);
if (success) { if (success) {
@@ -532,4 +539,38 @@ public class MediaRecorderTest extends ActivityInstrumentationTestCase2<MediaFra
} }
assertTrue("testSurfaceRecording", noOfFailure == 0); assertTrue("testSurfaceRecording", noOfFailure == 0);
} }
// Test recording from surface source with/without audio
public void testSurfaceRecordingTimeLapse() {
boolean success = false;
int noOfFailure = 0;
try {
int codec = MediaRecorder.VideoEncoder.H264;
int frameRate = MediaProfileReader.getMaxFrameRateForCodec(codec);
for (int k = 0; k < 2; k++) {
// k==0: time lapse test, set capture rate to MIN_VIDEO_FPS
// k==1: slow motion test, set capture rate to HIGH_SPEED_FPS
String filename = "/sdcard/surface_" +
(k==0 ? "time_lapse" : "slow_motion") + ".3gp";
// always set videoOnly=false, MediaRecorder should disable
// audio automatically with time lapse/slow motion
success = recordVideoFromSurface(frameRate,
k==0 ? MIN_VIDEO_FPS : HIGH_SPEED_FPS,
352, 288, codec,
MediaRecorder.OutputFormat.THREE_GPP,
filename, false /* videoOnly */);
if (success) {
success = validateVideo(filename, 352, 288);
}
if (!success) {
noOfFailure++;
}
}
} catch (Exception e) {
Log.v(TAG, e.toString());
}
assertTrue("testSurfaceRecordingTimeLapse", noOfFailure == 0);
}
} }