Skip to content

SDK / exoplayer

Go to a project
Commit a572fb3f by aquilescanta Committed by Andrew Lewis
Options

Add a metadata argument to Format factory methods used in HLS 

Required for propagation of HlsMetadataEntry's in chunkless preparation.

PiperOrigin-RevId: 263324345
parent 213912b3
Inline Side-by-side
Showing with 23 additions and 6 deletions
library/core/src/main/java/com/google/android/exoplayer2/Format.java
...@@ -180,8 +180,8 @@ public final class Format implements Parcelable { ...@@ -180,8 +180,8 @@ public final class Format implements Parcelable {
// Video. // Video.
/** /**
* @deprecated Use {@link #createVideoContainerFormat(String, String, String, String, String, int, * @deprecated Use {@link #createVideoContainerFormat(String, String, String, String, String,
* int, int, float, List, int, int)} instead. * Metadata, int, int, int, float, List, int, int)} instead.
*/ */
@Deprecated @Deprecated
public static Format createVideoContainerFormat( public static Format createVideoContainerFormat(
...@@ -201,6 +201,7 @@ public final class Format implements Parcelable { ...@@ -201,6 +201,7 @@ public final class Format implements Parcelable {
containerMimeType, containerMimeType,
sampleMimeType, sampleMimeType,
codecs, codecs,
/* metadata= */ null,
bitrate, bitrate,
width, width,
height, height,
...@@ -216,6 +217,7 @@ public final class Format implements Parcelable { ...@@ -216,6 +217,7 @@ public final class Format implements Parcelable {
@Nullable String containerMimeType, @Nullable String containerMimeType,
String sampleMimeType, String sampleMimeType,
String codecs, String codecs,
@Nullable Metadata metadata,
int bitrate, int bitrate,
int width, int width,
int height, int height,
...@@ -230,7 +232,7 @@ public final class Format implements Parcelable { ...@@ -230,7 +232,7 @@ public final class Format implements Parcelable {
roleFlags, roleFlags,
bitrate, bitrate,
codecs, codecs,
/* metadata= */ null, metadata,
containerMimeType, containerMimeType,
sampleMimeType, sampleMimeType,
/* maxInputSize= */ NO_VALUE, /* maxInputSize= */ NO_VALUE,
...@@ -363,8 +365,8 @@ public final class Format implements Parcelable { ...@@ -363,8 +365,8 @@ public final class Format implements Parcelable {
// Audio. // Audio.
/** /**
* @deprecated Use {@link #createAudioContainerFormat(String, String, String, String, String, int, * @deprecated Use {@link #createAudioContainerFormat(String, String, String, String, String,
* int, int, List, int, int, String)} instead. * Metadata, int, int, int, List, int, int, String)} instead.
*/ */
@Deprecated @Deprecated
public static Format createAudioContainerFormat( public static Format createAudioContainerFormat(
...@@ -384,6 +386,7 @@ public final class Format implements Parcelable { ...@@ -384,6 +386,7 @@ public final class Format implements Parcelable {
containerMimeType, containerMimeType,
sampleMimeType, sampleMimeType,
codecs, codecs,
/* metadata= */ null,
bitrate, bitrate,
channelCount, channelCount,
sampleRate, sampleRate,
...@@ -399,6 +402,7 @@ public final class Format implements Parcelable { ...@@ -399,6 +402,7 @@ public final class Format implements Parcelable {
@Nullable String containerMimeType, @Nullable String containerMimeType,
@Nullable String sampleMimeType, @Nullable String sampleMimeType,
@Nullable String codecs, @Nullable String codecs,
@Nullable Metadata metadata,
int bitrate, int bitrate,
int channelCount, int channelCount,
int sampleRate, int sampleRate,
...@@ -413,7 +417,7 @@ public final class Format implements Parcelable { ...@@ -413,7 +417,7 @@ public final class Format implements Parcelable {
roleFlags, roleFlags,
bitrate, bitrate,
codecs, codecs,
/* metadata= */ null, metadata,
containerMimeType, containerMimeType,
sampleMimeType, sampleMimeType,
/* maxInputSize= */ NO_VALUE, /* maxInputSize= */ NO_VALUE,
......
library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
...@@ -596,6 +596,7 @@ public class DashManifestParser extends DefaultHandler ...@@ -596,6 +596,7 @@ public class DashManifestParser extends DefaultHandler
containerMimeType, containerMimeType,
sampleMimeType, sampleMimeType,
codecs, codecs,
/* metadata= */ null,
bitrate, bitrate,
width, width,
height, height,
...@@ -610,6 +611,7 @@ public class DashManifestParser extends DefaultHandler ...@@ -610,6 +611,7 @@ public class DashManifestParser extends DefaultHandler
containerMimeType, containerMimeType,
sampleMimeType, sampleMimeType,
codecs, codecs,
/* metadata= */ null,
bitrate, bitrate,
audioChannels, audioChannels,
audioSamplingRate, audioSamplingRate,
......
library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashUtilTest.java
...@@ -80,6 +80,7 @@ public final class DashUtilTest { ...@@ -80,6 +80,7 @@ public final class DashUtilTest {
MimeTypes.VIDEO_MP4, MimeTypes.VIDEO_MP4,
MimeTypes.VIDEO_H264, MimeTypes.VIDEO_H264,
/* codecs= */ "", /* codecs= */ "",
/* metadata= */ null,
Format.NO_VALUE, Format.NO_VALUE,
/* width= */ 1024, /* width= */ 1024,
/* height= */ 768, /* height= */ 768,
......
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java
...@@ -787,6 +787,7 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper ...@@ -787,6 +787,7 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
variantFormat.containerMimeType, variantFormat.containerMimeType,
sampleMimeType, sampleMimeType,
codecs, codecs,
/* metadata= */ null,
variantFormat.bitrate, variantFormat.bitrate,
variantFormat.width, variantFormat.width,
variantFormat.height, variantFormat.height,
...@@ -829,6 +830,7 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper ...@@ -829,6 +830,7 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
variantFormat.containerMimeType, variantFormat.containerMimeType,
sampleMimeType, sampleMimeType,
codecs, codecs,
/* metadata= */ null,
bitrate, bitrate,
channelCount, channelCount,
/* sampleRate= */ Format.NO_VALUE, /* sampleRate= */ Format.NO_VALUE,
......
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
...@@ -349,6 +349,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli ...@@ -349,6 +349,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
/* containerMimeType= */ MimeTypes.APPLICATION_M3U8, /* containerMimeType= */ MimeTypes.APPLICATION_M3U8,
/* sampleMimeType= */ null, /* sampleMimeType= */ null,
codecs, codecs,
/* metadata= */ null,
bitrate, bitrate,
width, width,
height, height,
...@@ -422,6 +423,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli ...@@ -422,6 +423,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
/* containerMimeType= */ MimeTypes.APPLICATION_M3U8, /* containerMimeType= */ MimeTypes.APPLICATION_M3U8,
sampleMimeType, sampleMimeType,
codecs, codecs,
/* metadata= */ null,
/* bitrate= */ Format.NO_VALUE, /* bitrate= */ Format.NO_VALUE,
width, width,
height, height,
...@@ -451,6 +453,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli ...@@ -451,6 +453,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
/* containerMimeType= */ MimeTypes.APPLICATION_M3U8, /* containerMimeType= */ MimeTypes.APPLICATION_M3U8,
sampleMimeType, sampleMimeType,
codecs, codecs,
/* metadata= */ null,
/* bitrate= */ Format.NO_VALUE, /* bitrate= */ Format.NO_VALUE,
channelCount, channelCount,
/* sampleRate= */ Format.NO_VALUE, /* sampleRate= */ Format.NO_VALUE,
......
library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriodTest.java
...@@ -128,6 +128,7 @@ public final class HlsMediaPeriodTest { ...@@ -128,6 +128,7 @@ public final class HlsMediaPeriodTest {
/* containerMimeType= */ MimeTypes.APPLICATION_M3U8, /* containerMimeType= */ MimeTypes.APPLICATION_M3U8,
/* sampleMimeType= */ null, /* sampleMimeType= */ null,
/* codecs= */ "avc1.100.41,mp4a.40.2", /* codecs= */ "avc1.100.41,mp4a.40.2",
/* metadata= */ null,
bitrate, bitrate,
/* width= */ Format.NO_VALUE, /* width= */ Format.NO_VALUE,
/* height= */ Format.NO_VALUE, /* height= */ Format.NO_VALUE,
...@@ -145,6 +146,7 @@ public final class HlsMediaPeriodTest { ...@@ -145,6 +146,7 @@ public final class HlsMediaPeriodTest {
/* containerMimeType= */ MimeTypes.APPLICATION_M3U8, /* containerMimeType= */ MimeTypes.APPLICATION_M3U8,
/* sampleMimeType= */ null, /* sampleMimeType= */ null,
/* codecs= */ "mp4a.40.2", /* codecs= */ "mp4a.40.2",
/* metadata= */ null,
bitrate, bitrate,
/* width= */ Format.NO_VALUE, /* width= */ Format.NO_VALUE,
/* height= */ Format.NO_VALUE, /* height= */ Format.NO_VALUE,
...@@ -177,6 +179,7 @@ public final class HlsMediaPeriodTest { ...@@ -177,6 +179,7 @@ public final class HlsMediaPeriodTest {
/* containerMimeType= */ MimeTypes.APPLICATION_M3U8, /* containerMimeType= */ MimeTypes.APPLICATION_M3U8,
MimeTypes.getMediaMimeType("mp4a.40.2"), MimeTypes.getMediaMimeType("mp4a.40.2"),
/* codecs= */ "mp4a.40.2", /* codecs= */ "mp4a.40.2",
/* metadata= */ null,
/* bitrate= */ Format.NO_VALUE, /* bitrate= */ Format.NO_VALUE,
/* channelCount= */ Format.NO_VALUE, /* channelCount= */ Format.NO_VALUE,
/* sampleRate= */ Format.NO_VALUE, /* sampleRate= */ Format.NO_VALUE,
......
library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParser.java
...@@ -681,6 +681,7 @@ public class SsManifestParser implements ParsingLoadable.Parser<SsManifest> { ...@@ -681,6 +681,7 @@ public class SsManifestParser implements ParsingLoadable.Parser<SsManifest> {
MimeTypes.VIDEO_MP4, MimeTypes.VIDEO_MP4,
sampleMimeType, sampleMimeType,
/* codecs= */ null, /* codecs= */ null,
/* metadata= */ null,
bitrate, bitrate,
width, width,
height, height,
...@@ -706,6 +707,7 @@ public class SsManifestParser implements ParsingLoadable.Parser<SsManifest> { ...@@ -706,6 +707,7 @@ public class SsManifestParser implements ParsingLoadable.Parser<SsManifest> {
MimeTypes.AUDIO_MP4, MimeTypes.AUDIO_MP4,
sampleMimeType, sampleMimeType,
/* codecs= */ null, /* codecs= */ null,
/* metadata= */ null,
bitrate, bitrate,
channels, channels,
samplingRate, samplingRate,
......
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