drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am b39dcb79: Merge change 25722 into eclair

Browse Source 
Merge commit 'b39dcb796ddf40fb87724ac28932a687756c91bd' into eclair-plus-aosp

* commit 'b39dcb796ddf40fb87724ac28932a687756c91bd':
  Modified the validation to use singal media player instance.
This commit is contained in:
Yu Shan Emily Lau
2009-09-18 00:00:05 -07:00
committed by Android Git Automerger
parent a7dfeaa3ed b39dcb796d
commit 667bc1e862
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -214,8 +214,10 @@ public class MediaRecorderTest extends ActivityInstrumentationTestCase<MediaFram
Log.v(TAG, "before getduration"); Log.v(TAG, "before getduration");
mOutputDuration = mediaPlayer.getDuration(); mOutputDuration = mediaPlayer.getDuration();
Log.v(TAG, "get video dimension"); Log.v(TAG, "get video dimension");
mOutputVideoHeight = CodecTest.videoHeight(outputFilePath); mOutputVideoHeight = mediaPlayer.getVideoHeight();
mOutputVideoWidth = CodecTest.videoWidth(outputFilePath); mOutputVideoWidth = mediaPlayer.getVideoWidth();
//mOutputVideoHeight = CodecTest.videoHeight(outputFilePath);
//mOutputVideoWidth = CodecTest.videoWidth(outputFilePath);
mediaPlayer.release(); mediaPlayer.release();
} catch (Exception e) { } catch (Exception e) {
Log.v(TAG, e.toString()); Log.v(TAG, e.toString());
@ -321,10 +323,10 @@ public class MediaRecorderTest extends ActivityInstrumentationTestCase<MediaFram
recordVideo(15, 352, 288, MediaRecorder.VideoEncoder.H263, recordVideo(15, 352, 288, MediaRecorder.VideoEncoder.H263,
MediaRecorder.OutputFormat.THREE_GPP, MediaRecorder.OutputFormat.THREE_GPP,
MediaNames.RECORDED_PORTRAIT_H263, true); MediaNames.RECORDED_PORTRAIT_H263, true);
videoRecordedResult =
validateVideo(MediaNames.RECORDED_PORTRAIT_H263, 352, 288);
mCamera.lock(); mCamera.lock();
mCamera.release(); mCamera.release();
videoRecordedResult =
validateVideo(MediaNames.RECORDED_PORTRAIT_H263, 352, 288);
} catch (Exception e) { } catch (Exception e) {
Log.v(TAG, e.toString()); Log.v(TAG, e.toString());
} }
@ -453,4 +455,3 @@ public class MediaRecorderTest extends ActivityInstrumentationTestCase<MediaFram
} }
} }
} }