Fixed MediaFormatTests

This commit is contained in:
Rik Heijdens 2015-10-26 09:59:05 -04:00
parent 282a3fe818
commit bc3125c5d2

View File

@ -15,11 +15,11 @@
*/
package com.google.android.exoplayer;
import com.google.android.exoplayer.util.Util;
import android.annotation.SuppressLint;
import android.annotation.TargetApi;
import com.google.android.exoplayer.util.Util;
import junit.framework.TestCase;
import java.nio.ByteBuffer;
@ -45,20 +45,20 @@ public final class MediaFormatTest extends TestCase {
initData.add(initData2);
testConversionToFrameworkFormatV16(MediaFormat.createVideoFormat(
null, MediaFormat.NO_VALUE, "video/xyz", 5000, 102400, 1000L, 1280, 720, initData));
null, "video/xyz", 5000, 102400, 1000L, 1280, 720, initData));
testConversionToFrameworkFormatV16(MediaFormat.createVideoFormat(
null, MediaFormat.NO_VALUE, "video/xyz", 5000, MediaFormat.NO_VALUE, C.UNKNOWN_TIME_US, 1280, 720,
null, "video/xyz", 5000, MediaFormat.NO_VALUE, C.UNKNOWN_TIME_US, 1280, 720,
null));
testConversionToFrameworkFormatV16(MediaFormat.createAudioFormat(
null, MediaFormat.NO_VALUE, "audio/xyz", 500, 128, 1000L, 5, 44100, initData, null));
null, "audio/xyz", 500, 128, 1000L, 5, 44100, initData, null));
testConversionToFrameworkFormatV16(MediaFormat.createAudioFormat(
null, MediaFormat.NO_VALUE, "audio/xyz", 500, MediaFormat.NO_VALUE, C.UNKNOWN_TIME_US, 5, 44100,
null, "audio/xyz", 500, MediaFormat.NO_VALUE, C.UNKNOWN_TIME_US, 5, 44100,
null, null));
testConversionToFrameworkFormatV16(
MediaFormat.createTextFormat(null, MediaFormat.NO_VALUE, "text/xyz", MediaFormat.NO_VALUE, 1000L,
MediaFormat.createTextFormat(null, "text/xyz", MediaFormat.NO_VALUE, 1000L,
"eng"));
testConversionToFrameworkFormatV16(
MediaFormat.createTextFormat(null, MediaFormat.NO_VALUE, "text/xyz", MediaFormat.NO_VALUE,
MediaFormat.createTextFormat(null, "text/xyz", MediaFormat.NO_VALUE,
C.UNKNOWN_TIME_US, null));
}