diff options
Diffstat (limited to 'media')
2 files changed, 16 insertions, 3 deletions
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CodecTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CodecTest.java index bcfcbf3..8f7d6ac 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CodecTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CodecTest.java @@ -60,6 +60,7 @@ public class CodecTest { private static boolean onPrepareSuccess = false; public static boolean onCompleteSuccess = false; public static boolean mPlaybackError = false; + public static boolean mFailedToCompleteWithNoError = true; public static int mMediaInfoUnknownCount = 0; public static int mMediaInfoVideoTrackLaggingCount = 0; public static int mMediaInfoBadInterleavingCount = 0; @@ -801,6 +802,7 @@ public class CodecTest { mMediaInfoNotSeekableCount = 0; mMediaInfoMetdataUpdateCount = 0; mPlaybackError = false; + mFailedToCompleteWithNoError = true; String testResult; initializeMessageLooper(); @@ -843,6 +845,9 @@ public class CodecTest { } catch (Exception e) { Log.v(TAG, "playMediaSamples:" + e.getMessage()); } + // Check if playback state is unknown (neither completed nor erroneous) unless + // it's not interrupted in the middle. If true, that is an exceptional case to investigate. + mFailedToCompleteWithNoError = !(onCompleteSuccess || mPlaybackError); return onCompleteSuccess; } } diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaPlayerStressTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaPlayerStressTest.java index e289812..4221f1b 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaPlayerStressTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaPlayerStressTest.java @@ -65,6 +65,7 @@ public class MediaPlayerStressTest extends ActivityInstrumentationTestCase2<Medi private int mTotalBadInterleaving = 0; private int mTotalNotSeekable = 0; private int mTotalMetaDataUpdate = 0; + private int mTotalFailedToCompleteWithNoError = 0; //Test result output file private static final String PLAYBACK_RESULT = "PlaybackTestResult.txt"; @@ -78,6 +79,8 @@ public class MediaPlayerStressTest extends ActivityInstrumentationTestCase2<Medi output.write(" Bad Interleaving: " + CodecTest.mMediaInfoBadInterleavingCount); output.write(" Not Seekable: " + CodecTest.mMediaInfoNotSeekableCount); output.write(" Info Meta data update: " + CodecTest.mMediaInfoMetdataUpdateCount); + output.write(" Failed To Complete With No Error: " + + CodecTest.mFailedToCompleteWithNoError); output.write("\n"); } @@ -90,16 +93,21 @@ public class MediaPlayerStressTest extends ActivityInstrumentationTestCase2<Medi output.write("Total Bad Interleaving: " + mTotalBadInterleaving + "\n"); output.write("Total Not Seekable: " + mTotalNotSeekable + "\n"); output.write("Total Info Meta data update: " + mTotalMetaDataUpdate + "\n"); + output.write("Total Failed To Complete With No Error: " + + mTotalFailedToCompleteWithNoError); output.write("\n"); } private void updateTestResult(){ - if (CodecTest.onCompleteSuccess){ + if (CodecTest.onCompleteSuccess) { mTotalComplete++; } - else if (CodecTest.mPlaybackError){ + else if (CodecTest.mPlaybackError) { mTotalPlaybackError++; } + else if (CodecTest.mFailedToCompleteWithNoError) { + mTotalFailedToCompleteWithNoError++; + } mTotalInfoUnknown += CodecTest.mMediaInfoUnknownCount; mTotalVideoTrackLagging += CodecTest.mMediaInfoVideoTrackLaggingCount; mTotalBadInterleaving += CodecTest.mMediaInfoBadInterleavingCount; @@ -149,4 +157,4 @@ public class MediaPlayerStressTest extends ActivityInstrumentationTestCase2<Medi assertTrue("testMediaSamples", testResult); } } -}
\ No newline at end of file +} |