loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add a metadata argument to Format factory methods used in HLS

Browse Source 
Required for propagation of HlsMetadataEntry's in chunkless preparation.

PiperOrigin-RevId: 263324345
This commit is contained in:
aquilescanta 2019-08-14 12:37:44 +01:00 committed by Oliver Woodman
parent b4a2f27cdd
commit 47e405ee11
7 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
library/core/src/main/java/com/google/android/exoplayer2/Format.java
View File

@ -168,6 +168,10 @@ public final class Format implements Parcelable {
// Video.
/**
* @deprecated Use {@link #createVideoContainerFormat(String, String, String, String, String,
* Metadata, int, int, int, float, List, int, int)} instead.
*/
@Deprecated
public static Format createVideoContainerFormat(
@Nullable String id,
@ -186,6 +190,7 @@ public final class Format implements Parcelable {
containerMimeType,
sampleMimeType,
codecs,
/* metadata= */ null,
bitrate,
width,
height,
@ -201,6 +206,7 @@ public final class Format implements Parcelable {
@Nullable String containerMimeType,
String sampleMimeType,
String codecs,
@Nullable Metadata metadata,
int bitrate,
int width,
int height,
@ -215,7 +221,7 @@ public final class Format implements Parcelable {
roleFlags,
bitrate,
codecs,
/* metadata= */ null,
metadata,
containerMimeType,
sampleMimeType,
/* maxInputSize= */ NO_VALUE,
@ -345,6 +351,10 @@ public final class Format implements Parcelable {
// Audio.
/**
* @deprecated Use {@link #createAudioContainerFormat(String, String, String, String, String,
* Metadata, int, int, int, List, int, int, String)} instead.
*/
@Deprecated
public static Format createAudioContainerFormat(
@Nullable String id,
@ -363,6 +373,7 @@ public final class Format implements Parcelable {
containerMimeType,
sampleMimeType,
codecs,
/* metadata= */ null,
bitrate,
channelCount,
sampleRate,
@ -378,6 +389,7 @@ public final class Format implements Parcelable {
@Nullable String containerMimeType,
@Nullable String sampleMimeType,
@Nullable String codecs,
@Nullable Metadata metadata,
int bitrate,
int channelCount,
int sampleRate,
@ -392,7 +404,7 @@ public final class Format implements Parcelable {
roleFlags,
bitrate,
codecs,
/* metadata= */ null,
metadata,
containerMimeType,
sampleMimeType,
/* maxInputSize= */ NO_VALUE,

2
library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
View File

@ -600,6 +600,7 @@ public class DashManifestParser extends DefaultHandler
containerMimeType,
sampleMimeType,
codecs,
/* metadata= */ null,
bitrate,
width,
height,
@ -614,6 +615,7 @@ public class DashManifestParser extends DefaultHandler
containerMimeType,
sampleMimeType,
codecs,
/* metadata= */ null,
bitrate,
audioChannels,
audioSamplingRate,

1
library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashUtilTest.java
View File

@ -80,6 +80,7 @@ public final class DashUtilTest {
MimeTypes.VIDEO_MP4,
MimeTypes.VIDEO_H264,
/* codecs= */ "",
/* metadata= */ null,
Format.NO_VALUE,
/* width= */ 1024,
/* height= */ 768,

2
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriod.java
View File

@ -773,6 +773,7 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
variantFormat.containerMimeType,
sampleMimeType,
codecs,
/* metadata= */ null,
variantFormat.bitrate,
variantFormat.width,
variantFormat.height,
@ -815,6 +816,7 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
variantFormat.containerMimeType,
sampleMimeType,
codecs,
/* metadata= */ null,
bitrate,
channelCount,
/* sampleRate= */ Format.NO_VALUE,

3
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsPlaylistParser.java
View File

@ -349,6 +349,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
/* containerMimeType= */ MimeTypes.APPLICATION_M3U8,
/* sampleMimeType= */ null,
codecs,
/* metadata= */ null,
bitrate,
width,
height,
@ -422,6 +423,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
/* containerMimeType= */ MimeTypes.APPLICATION_M3U8,
sampleMimeType,
codecs,
/* metadata= */ null,
/* bitrate= */ Format.NO_VALUE,
width,
height,
@ -451,6 +453,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
/* containerMimeType= */ MimeTypes.APPLICATION_M3U8,
sampleMimeType,
codecs,
/* metadata= */ null,
/* bitrate= */ Format.NO_VALUE,
channelCount,
/* sampleRate= */ Format.NO_VALUE,

3
library/hls/src/test/java/com/google/android/exoplayer2/source/hls/HlsMediaPeriodTest.java
View File

@ -127,6 +127,7 @@ public final class HlsMediaPeriodTest {
/* containerMimeType= */ MimeTypes.APPLICATION_M3U8,
/* sampleMimeType= */ null,
/* codecs= */ "avc1.100.41,mp4a.40.2",
/* metadata= */ null,
bitrate,
/* width= */ Format.NO_VALUE,
/* height= */ Format.NO_VALUE,
@ -144,6 +145,7 @@ public final class HlsMediaPeriodTest {
/* containerMimeType= */ MimeTypes.APPLICATION_M3U8,
/* sampleMimeType= */ null,
/* codecs= */ "mp4a.40.2",
/* metadata= */ null,
bitrate,
/* width= */ Format.NO_VALUE,
/* height= */ Format.NO_VALUE,
@ -176,6 +178,7 @@ public final class HlsMediaPeriodTest {
/* containerMimeType= */ MimeTypes.APPLICATION_M3U8,
MimeTypes.getMediaMimeType("mp4a.40.2"),
/* codecs= */ "mp4a.40.2",
/* metadata= */ null,
/* bitrate= */ Format.NO_VALUE,
/* channelCount= */ Format.NO_VALUE,
/* sampleRate= */ Format.NO_VALUE,

2
library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestParser.java
View File

@ -678,6 +678,7 @@ public class SsManifestParser implements ParsingLoadable.Parser<SsManifest> {
MimeTypes.VIDEO_MP4,
sampleMimeType,
/* codecs= */ null,
/* metadata= */ null,
bitrate,
width,
height,
@ -703,6 +704,7 @@ public class SsManifestParser implements ParsingLoadable.Parser<SsManifest> {
MimeTypes.AUDIO_MP4,
sampleMimeType,
/* codecs= */ null,
/* metadata= */ null,
bitrate,
channels,
samplingRate,