Commit 448ca0cf by olly Committed by Oliver Woodman

Sanitize internal parameter ordering in Format

This is a precursor to merging https://github.com/google/ExoPlayer/pull/5578

PiperOrigin-RevId: 239371046
parent d775b9b4
...@@ -38,14 +38,15 @@ import org.junit.runner.RunWith; ...@@ -38,14 +38,15 @@ import org.junit.runner.RunWith;
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
public final class FormatTest { public final class FormatTest {
private static final List<byte[]> INIT_DATA; private static final List<byte[]> initData;
static { static {
byte[] initData1 = new byte[] {1, 2, 3}; byte[] initData1 = new byte[] {1, 2, 3};
byte[] initData2 = new byte[] {4, 5, 6}; byte[] initData2 = new byte[] {4, 5, 6};
List<byte[]> initData = new ArrayList<>(); List<byte[]> initDataList = new ArrayList<>();
initData.add(initData1); initDataList.add(initData1);
initData.add(initData2); initDataList.add(initData2);
INIT_DATA = Collections.unmodifiableList(initData); initData = Collections.unmodifiableList(initDataList);
} }
@Test @Test
...@@ -66,11 +67,16 @@ public final class FormatTest { ...@@ -66,11 +67,16 @@ public final class FormatTest {
new Format( new Format(
"id", "id",
"label", "label",
C.SELECTION_FLAG_DEFAULT,
/* bitrate= */ 1024,
"codec",
metadata,
/* containerMimeType= */ MimeTypes.VIDEO_MP4, /* containerMimeType= */ MimeTypes.VIDEO_MP4,
/* sampleMimeType= */ MimeTypes.VIDEO_H264, /* sampleMimeType= */ MimeTypes.VIDEO_H264,
"codec",
/* bitrate= */ 1024,
/* maxInputSize= */ 2048, /* maxInputSize= */ 2048,
initData,
drmInitData,
Format.OFFSET_SAMPLE_RELATIVE,
/* width= */ 1920, /* width= */ 1920,
/* height= */ 1080, /* height= */ 1080,
/* frameRate= */ 24, /* frameRate= */ 24,
...@@ -84,13 +90,8 @@ public final class FormatTest { ...@@ -84,13 +90,8 @@ public final class FormatTest {
C.ENCODING_PCM_24BIT, C.ENCODING_PCM_24BIT,
/* encoderDelay= */ 1001, /* encoderDelay= */ 1001,
/* encoderPadding= */ 1002, /* encoderPadding= */ 1002,
C.SELECTION_FLAG_DEFAULT,
"language", "language",
/* accessibilityChannel= */ Format.NO_VALUE, /* accessibilityChannel= */ Format.NO_VALUE);
Format.OFFSET_SAMPLE_RELATIVE,
INIT_DATA,
drmInitData,
metadata);
Parcel parcel = Parcel.obtain(); Parcel parcel = Parcel.obtain();
formatToParcel.writeToParcel(parcel, 0); formatToParcel.writeToParcel(parcel, 0);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment