diff options
| author | James Dong <jdong@google.com> | 2011-09-09 17:32:50 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-09 17:32:50 -0700 |
| commit | fbab086933cfbfda2b41b2dbf69ac644f36a686f (patch) | |
| tree | ae161b61db6f5ccb0136742d32dc5db56ae7b50a | |
| parent | 0e23c2efb03c8eac7e2bcd6aad61cfc4b15340fc (diff) | |
| parent | d8f7c2c2dcc9548bc8808e648904c918ecd1d1ba (diff) | |
| download | frameworks_base-fbab086933cfbfda2b41b2dbf69ac644f36a686f.zip frameworks_base-fbab086933cfbfda2b41b2dbf69ac644f36a686f.tar.gz frameworks_base-fbab086933cfbfda2b41b2dbf69ac644f36a686f.tar.bz2 | |
Merge "MTS Recorder Test: Use VideoFrameRate from Device Camcorder Profile"
| -rw-r--r-- | media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaRecorderStressTest.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaRecorderStressTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaRecorderStressTest.java index ae0589c..e6177ba 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaRecorderStressTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaRecorderStressTest.java @@ -205,7 +205,7 @@ public class MediaRecorderStressTest extends ActivityInstrumentationTestCase2<Me mRecorder.setVideoSource(MediaRecorder.VideoSource.CAMERA); mRecorder.setOutputFormat(MediaRecorder.OutputFormat.THREE_GPP); mRecorder.setOutputFile(filename); - mRecorder.setVideoFrameRate(20); + mRecorder.setVideoFrameRate(MediaRecorderStressTestRunner.mFrameRate); mRecorder.setVideoSize(176,144); Log.v(TAG, "setEncoder"); mRecorder.setVideoEncoder(MediaRecorder.VideoEncoder.H263); @@ -269,7 +269,7 @@ public class MediaRecorderStressTest extends ActivityInstrumentationTestCase2<Me mRecorder.setVideoSource(MediaRecorder.VideoSource.CAMERA); mRecorder.setOutputFormat(MediaRecorder.OutputFormat.THREE_GPP); mRecorder.setOutputFile(filename); - mRecorder.setVideoFrameRate(20); + mRecorder.setVideoFrameRate(MediaRecorderStressTestRunner.mFrameRate); mRecorder.setVideoSize(176,144); Log.v(TAG, "Media recorder setEncoder"); mRecorder.setVideoEncoder(MediaRecorder.VideoEncoder.H263); |