Merge "Fix for MediaPlayerStreamingStressTest/HLS" into oc-dev (abf54a61) · Commits · e / os / android_frameworks_base

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/CodecTest.java

+23 −17

Original line number	Diff line number	Diff line
		@@ -789,11 +789,12 @@ public class CodecTest {
		};

		public static boolean playMediaSamples(String filePath) throws Exception {
		return playMediaSamples(filePath, 2000);
		return playMediaSamples(filePath, 2000, false /* streamingTest */);
		}

		// For each media file, forward twice and backward once, then play to the end
		public static boolean playMediaSamples(String filePath, int buffertime) throws Exception {
		public static boolean playMediaSamples(String filePath, int buffertime, boolean streamingTest)
		throws Exception {
		int duration = 0;
		int curPosition = 0;
		int nextPosition = 0;
		@@ -808,9 +809,11 @@ public class CodecTest {
		mFailedToCompleteWithNoError = true;
		String testResult;

		boolean hasSupportedVideo = false;

		if (!streamingTest) {
		final MediaCodecList list = new MediaCodecList(MediaCodecList.REGULAR_CODECS);
		final MediaExtractor extractor = new MediaExtractor();
		boolean hasSupportedVideo = false;

		try {
		extractor.setDataSource(filePath);
		@@ -830,6 +833,9 @@ public class CodecTest {
		} finally {
		extractor.release();
		}
		} else { // streamingTest
		hasSupportedVideo = true;
		}

		initializeMessageLooper();
		synchronized (lock) {

+1 −1

Original line number	Diff line number	Diff line
		@@ -144,7 +144,7 @@ public class MediaPlayerStreamingStressTest extends ActivityInstrumentationTestC
		//Get url
		String filename = urls.get(i);
		onCompleteSuccess =
		CodecTest.playMediaSamples(filename, 60000);
		CodecTest.playMediaSamples(filename, 60000, true /* streamingTest */);
		if (!onCompleteSuccess){
		//Don't fail the test right away, print out the failure file.
		fileWithError += filename + '\n';