sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove deprecated Format.createSampleFormat

Browse source 
PiperOrigin-RevId: 292888026
This commit is contained in:
olly 2020-02-03 11:39:44 +00:00 committed by Oliver Woodman
parent 97fbbad6a7
commit 8ac5698aac
1 changed files with 0 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
library/common/src/main/java/com/google/android/exoplayer2/Format.java
View file

@ -684,19 +684,7 @@ public final class Format implements Parcelable {
/* exoMediaCryptoType= */ null); /* exoMediaCryptoType= */ null);
} }
@SuppressWarnings("deprecation")
public static Format createSampleFormat(@Nullable String id, @Nullable String sampleMimeType) { public static Format createSampleFormat(@Nullable String id, @Nullable String sampleMimeType) {
return createSampleFormat(id, sampleMimeType, OFFSET_SAMPLE_RELATIVE);
}
/**
* @deprecated Use {@link #createSampleFormat(String, String)} and (for values of {@link
* #subsampleOffsetUs} other than {@link #OFFSET_SAMPLE_RELATIVE}) {@link
* #copyWithSubsampleOffsetUs(long)}.
*/
@Deprecated
public static Format createSampleFormat(
@Nullable String id, @Nullable String sampleMimeType, long subsampleOffsetUs) {
return new Format( return new Format(
id, id,
/* label= */ null, /* label= */ null,
@ -710,49 +698,6 @@ public final class Format implements Parcelable {
/* maxInputSize= */ NO_VALUE, /* maxInputSize= */ NO_VALUE,
/* initializationData= */ null, /* initializationData= */ null,
/* drmInitData= */ null, /* drmInitData= */ null,
subsampleOffsetUs,
/* width= */ NO_VALUE,
/* height= */ NO_VALUE,
/* frameRate= */ NO_VALUE,
/* rotationDegrees= */ NO_VALUE,
/* pixelWidthHeightRatio= */ NO_VALUE,
/* projectionData= */ null,
/* stereoMode= */ NO_VALUE,
/* colorInfo= */ null,
/* channelCount= */ NO_VALUE,
/* sampleRate= */ NO_VALUE,
/* pcmEncoding= */ NO_VALUE,
/* encoderDelay= */ NO_VALUE,
/* encoderPadding= */ NO_VALUE,
/* language= */ null,
/* accessibilityChannel= */ NO_VALUE,
/* exoMediaCryptoType= */ null);
}
/**
* @deprecated Most usages should use one of the {@link #createVideoSampleFormat} or {@link
* #createAudioSampleFormat} methods.
*/
@Deprecated
public static Format createSampleFormat(
@Nullable String id,
@Nullable String sampleMimeType,
@Nullable String codecs,
int bitrate,
@Nullable DrmInitData drmInitData) {
return new Format(
id,
/* label= */ null,
/* selectionFlags= */ 0,
/* roleFlags= */ 0,
bitrate,
codecs,
/* metadata= */ null,
/* containerMimeType= */ null,
sampleMimeType,
/* maxInputSize= */ NO_VALUE,
/* initializationData= */ null,
drmInitData,
OFFSET_SAMPLE_RELATIVE, OFFSET_SAMPLE_RELATIVE,
/* width= */ NO_VALUE, /* width= */ NO_VALUE,
/* height= */ NO_VALUE, /* height= */ NO_VALUE,