loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-17 04:29:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix order of arguments in Format.copyWithDrmInitData.

Browse Source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=124705921
This commit is contained in:
andrewlewis 2016-06-13 02:07:13 -07:00 committed by Oliver Woodman
parent 41b86f660c
commit 189a2502c5
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
library/src/main/java/com/google/android/exoplayer/Format.java
View File

@ -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 {
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 {
} }
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);