Commit 189a2502 by andrewlewis Committed by Oliver Woodman

Fix order of arguments in Format.copyWithDrmInitData.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=124705921
parent 41b86f66
...@@ -201,15 +201,15 @@ public final class Format implements Parcelable { ...@@ -201,15 +201,15 @@ public final class Format implements Parcelable {
null, OFFSET_SAMPLE_RELATIVE, initializationData, null, false); null, OFFSET_SAMPLE_RELATIVE, initializationData, null, false);
} }
public static Format createVideoSampleFormat(String id, String sampleMimeType, public static Format createVideoSampleFormat(String id, String sampleMimeType, String codecs,
String codecs, int bitrate, int maxInputSize, int width, int height, float frameRate, int bitrate, int maxInputSize, int width, int height, float frameRate,
List<byte[]> initializationData, DrmInitData drmInitData) { List<byte[]> initializationData, DrmInitData drmInitData) {
return createVideoSampleFormat(id, sampleMimeType, codecs, bitrate, maxInputSize, width, return createVideoSampleFormat(id, sampleMimeType, codecs, bitrate, maxInputSize, width,
height, frameRate, initializationData, NO_VALUE, NO_VALUE, drmInitData); height, frameRate, initializationData, NO_VALUE, NO_VALUE, drmInitData);
} }
public static Format createVideoSampleFormat(String id, String sampleMimeType, public static Format createVideoSampleFormat(String id, String sampleMimeType, String codecs,
String codecs, int bitrate, int maxInputSize, int width, int height, float frameRate, int bitrate, int maxInputSize, int width, int height, float frameRate,
List<byte[]> initializationData, int rotationDegrees, float pixelWidthHeightRatio, List<byte[]> initializationData, int rotationDegrees, float pixelWidthHeightRatio,
DrmInitData drmInitData) { DrmInitData drmInitData) {
return new Format(id, null, sampleMimeType, codecs, bitrate, maxInputSize, width, height, return new Format(id, null, sampleMimeType, codecs, bitrate, maxInputSize, width, height,
...@@ -303,10 +303,10 @@ public final class Format implements Parcelable { ...@@ -303,10 +303,10 @@ public final class Format implements Parcelable {
OFFSET_SAMPLE_RELATIVE, null, drmInitData, false); OFFSET_SAMPLE_RELATIVE, null, drmInitData, false);
} }
/* package */ Format(String id, String containerMimeType, String sampleMimeType, /* package */ Format(String id, String containerMimeType, String sampleMimeType, String codecs,
String codecs, int bitrate, int maxInputSize, int width, int height, float frameRate, int bitrate, int maxInputSize, int width, int height, float frameRate, int rotationDegrees,
int rotationDegrees, float pixelWidthHeightRatio, int channelCount, int sampleRate, float pixelWidthHeightRatio, int channelCount, int sampleRate, int pcmEncoding,
int pcmEncoding, int encoderDelay, int encoderPadding, int selectionFlags, String language, int encoderDelay, int encoderPadding, int selectionFlags, String language,
long subsampleOffsetUs, List<byte[]> initializationData, DrmInitData drmInitData, long subsampleOffsetUs, List<byte[]> initializationData, DrmInitData drmInitData,
boolean requiresSecureDecryption) { boolean requiresSecureDecryption) {
this.id = id; this.id = id;
...@@ -409,7 +409,7 @@ public final class Format implements Parcelable { ...@@ -409,7 +409,7 @@ public final class Format implements Parcelable {
} }
public Format copyWithDrmInitData(DrmInitData drmInitData) { public Format copyWithDrmInitData(DrmInitData drmInitData) {
return new Format(id, containerMimeType, codecs, sampleMimeType, bitrate, maxInputSize, return new Format(id, containerMimeType, sampleMimeType, codecs, bitrate, maxInputSize,
width, height, frameRate, rotationDegrees, pixelWidthHeightRatio, channelCount, sampleRate, width, height, frameRate, rotationDegrees, pixelWidthHeightRatio, channelCount, sampleRate,
pcmEncoding, encoderDelay, encoderPadding, selectionFlags, language, subsampleOffsetUs, pcmEncoding, encoderDelay, encoderPadding, selectionFlags, language, subsampleOffsetUs,
initializationData, drmInitData, requiresSecureDecryption); initializationData, drmInitData, requiresSecureDecryption);
......
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