Skip to content

SDK / exoplayer

Go to a project
Commit 69d51fee by tonihei
Options

Add parsed essential/supplemental properties to the Representation. 

We already parse essential and supplemental properties from the
Representation, but don't add them to our Representation class so that
they can be accessed by users.

Issue: google/ExoPlayer#9579
PiperOrigin-RevId: 409961990
parent 9e8af7c2
Inline Side-by-side
Showing with 187 additions and 28 deletions
RELEASENOTES.md
...@@ -14,6 +14,9 @@ ...@@ -14,6 +14,9 @@
* Extractors: * Extractors:
* WAV: Add support for RF64 streams * WAV: Add support for RF64 streams
([#9543](https://github.com/google/ExoPlayer/issues/9543). ([#9543](https://github.com/google/ExoPlayer/issues/9543).
* DASH:
* Add parsed essential and supplemental properties to the `Representation`
([#9579](https://github.com/google/ExoPlayer/issues/9579)).
### 2.16.0 (2021-11-04) ### 2.16.0 (2021-11-04)
......
library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
...@@ -753,6 +753,8 @@ public class DashManifestParser extends DefaultHandler ...@@ -753,6 +753,8 @@ public class DashManifestParser extends DefaultHandler
drmSchemeType, drmSchemeType,
drmSchemeDatas, drmSchemeDatas,
inbandEventStreams, inbandEventStreams,
essentialProperties,
supplementalProperties,
Representation.REVISION_ID_DEFAULT); Representation.REVISION_ID_DEFAULT);
} }
...@@ -841,7 +843,10 @@ public class DashManifestParser extends DefaultHandler ...@@ -841,7 +843,10 @@ public class DashManifestParser extends DefaultHandler
formatBuilder.build(), formatBuilder.build(),
representationInfo.baseUrls, representationInfo.baseUrls,
representationInfo.segmentBase, representationInfo.segmentBase,
inbandEventStreams); inbandEventStreams,
representationInfo.essentialProperties,
representationInfo.supplementalProperties,
/* cacheKey= */ null);
} }
// SegmentBase, SegmentList and SegmentTemplate parsing. // SegmentBase, SegmentList and SegmentTemplate parsing.
...@@ -1910,6 +1915,8 @@ public class DashManifestParser extends DefaultHandler ...@@ -1910,6 +1915,8 @@ public class DashManifestParser extends DefaultHandler
public final ArrayList<SchemeData> drmSchemeDatas; public final ArrayList<SchemeData> drmSchemeDatas;
public final ArrayList<Descriptor> inbandEventStreams; public final ArrayList<Descriptor> inbandEventStreams;
public final long revisionId; public final long revisionId;
public final List<Descriptor> essentialProperties;
public final List<Descriptor> supplementalProperties;
public RepresentationInfo( public RepresentationInfo(
Format format, Format format,
...@@ -1918,6 +1925,8 @@ public class DashManifestParser extends DefaultHandler ...@@ -1918,6 +1925,8 @@ public class DashManifestParser extends DefaultHandler
@Nullable String drmSchemeType, @Nullable String drmSchemeType,
ArrayList<SchemeData> drmSchemeDatas, ArrayList<SchemeData> drmSchemeDatas,
ArrayList<Descriptor> inbandEventStreams, ArrayList<Descriptor> inbandEventStreams,
List<Descriptor> essentialProperties,
List<Descriptor> supplementalProperties,
long revisionId) { long revisionId) {
this.format = format; this.format = format;
this.baseUrls = ImmutableList.copyOf(baseUrls); this.baseUrls = ImmutableList.copyOf(baseUrls);
...@@ -1925,6 +1934,8 @@ public class DashManifestParser extends DefaultHandler ...@@ -1925,6 +1934,8 @@ public class DashManifestParser extends DefaultHandler
this.drmSchemeType = drmSchemeType; this.drmSchemeType = drmSchemeType;
this.drmSchemeDatas = drmSchemeDatas; this.drmSchemeDatas = drmSchemeDatas;
this.inbandEventStreams = inbandEventStreams; this.inbandEventStreams = inbandEventStreams;
this.essentialProperties = essentialProperties;
this.supplementalProperties = supplementalProperties;
this.revisionId = revisionId; this.revisionId = revisionId;
} }
} }
......
library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/Representation.java
...@@ -50,6 +50,10 @@ public abstract class Representation { ...@@ -50,6 +50,10 @@ public abstract class Representation {
public final long presentationTimeOffsetUs; public final long presentationTimeOffsetUs;
/** The in-band event streams in the representation. May be empty. */ /** The in-band event streams in the representation. May be empty. */
public final List<Descriptor> inbandEventStreams; public final List<Descriptor> inbandEventStreams;
/** Essential properties in the representation. May be empty. */
public final List<Descriptor> essentialProperties;
/** Supplemental properties in the adaptation set. May be empty. */
public final List<Descriptor> supplementalProperties;
private final RangedUri initializationUri; private final RangedUri initializationUri;
...@@ -64,27 +68,15 @@ public abstract class Representation { ...@@ -64,27 +68,15 @@ public abstract class Representation {
*/ */
public static Representation newInstance( public static Representation newInstance(
long revisionId, Format format, List<BaseUrl> baseUrls, SegmentBase segmentBase) { long revisionId, Format format, List<BaseUrl> baseUrls, SegmentBase segmentBase) {
return newInstance(revisionId, format, baseUrls, segmentBase, /* inbandEventStreams= */ null);
}
/**
* Constructs a new instance.
*
* @param revisionId Identifies the revision of the content.
* @param format The format of the representation.
* @param baseUrls The list of base URLs of the representation.
* @param segmentBase A segment base element for the representation.
* @param inbandEventStreams The in-band event streams in the representation. May be null.
* @return The constructed instance.
*/
public static Representation newInstance(
long revisionId,
Format format,
List<BaseUrl> baseUrls,
SegmentBase segmentBase,
@Nullable List<Descriptor> inbandEventStreams) {
return newInstance( return newInstance(
revisionId, format, baseUrls, segmentBase, inbandEventStreams, /* cacheKey= */ null); revisionId,
format,
baseUrls,
segmentBase,
/* inbandEventStreams= */ null,
/* essentialProperties= */ ImmutableList.of(),
/* supplementalProperties= */ ImmutableList.of(),
/* cacheKey= */ null);
} }
/** /**
...@@ -95,6 +87,8 @@ public abstract class Representation { ...@@ -95,6 +87,8 @@ public abstract class Representation {
* @param baseUrls The list of base URLs of the representation. * @param baseUrls The list of base URLs of the representation.
* @param segmentBase A segment base element for the representation. * @param segmentBase A segment base element for the representation.
* @param inbandEventStreams The in-band event streams in the representation. May be null. * @param inbandEventStreams The in-band event streams in the representation. May be null.
* @param essentialProperties Essential properties in the representation. May be empty.
* @param supplementalProperties Supplemental properties in the representation. May be empty.
* @param cacheKey An optional key to be returned from {@link #getCacheKey()}, or null. This * @param cacheKey An optional key to be returned from {@link #getCacheKey()}, or null. This
* parameter is ignored if {@code segmentBase} consists of multiple segments. * parameter is ignored if {@code segmentBase} consists of multiple segments.
* @return The constructed instance. * @return The constructed instance.
...@@ -105,6 +99,8 @@ public abstract class Representation { ...@@ -105,6 +99,8 @@ public abstract class Representation {
List<BaseUrl> baseUrls, List<BaseUrl> baseUrls,
SegmentBase segmentBase, SegmentBase segmentBase,
@Nullable List<Descriptor> inbandEventStreams, @Nullable List<Descriptor> inbandEventStreams,
List<Descriptor> essentialProperties,
List<Descriptor> supplementalProperties,
@Nullable String cacheKey) { @Nullable String cacheKey) {
if (segmentBase instanceof SingleSegmentBase) { if (segmentBase instanceof SingleSegmentBase) {
return new SingleSegmentRepresentation( return new SingleSegmentRepresentation(
...@@ -113,11 +109,19 @@ public abstract class Representation { ...@@ -113,11 +109,19 @@ public abstract class Representation {
baseUrls, baseUrls,
(SingleSegmentBase) segmentBase, (SingleSegmentBase) segmentBase,
inbandEventStreams, inbandEventStreams,
essentialProperties,
supplementalProperties,
cacheKey, cacheKey,
C.LENGTH_UNSET); /* contentLength= */ C.LENGTH_UNSET);
} else if (segmentBase instanceof MultiSegmentBase) { } else if (segmentBase instanceof MultiSegmentBase) {
return new MultiSegmentRepresentation( return new MultiSegmentRepresentation(
revisionId, format, baseUrls, (MultiSegmentBase) segmentBase, inbandEventStreams); revisionId,
format,
baseUrls,
(MultiSegmentBase) segmentBase,
inbandEventStreams,
essentialProperties,
supplementalProperties);
} else { } else {
throw new IllegalArgumentException( throw new IllegalArgumentException(
"segmentBase must be of type SingleSegmentBase or " + "MultiSegmentBase"); "segmentBase must be of type SingleSegmentBase or " + "MultiSegmentBase");
...@@ -129,7 +133,9 @@ public abstract class Representation { ...@@ -129,7 +133,9 @@ public abstract class Representation {
Format format, Format format,
List<BaseUrl> baseUrls, List<BaseUrl> baseUrls,
SegmentBase segmentBase, SegmentBase segmentBase,
@Nullable List<Descriptor> inbandEventStreams) { @Nullable List<Descriptor> inbandEventStreams,
List<Descriptor> essentialProperties,
List<Descriptor> supplementalProperties) {
checkArgument(!baseUrls.isEmpty()); checkArgument(!baseUrls.isEmpty());
this.revisionId = revisionId; this.revisionId = revisionId;
this.format = format; this.format = format;
...@@ -138,6 +144,8 @@ public abstract class Representation { ...@@ -138,6 +144,8 @@ public abstract class Representation {
inbandEventStreams == null inbandEventStreams == null
? Collections.emptyList() ? Collections.emptyList()
: Collections.unmodifiableList(inbandEventStreams); : Collections.unmodifiableList(inbandEventStreams);
this.essentialProperties = essentialProperties;
this.supplementalProperties = supplementalProperties;
initializationUri = segmentBase.getInitialization(this); initializationUri = segmentBase.getInitialization(this);
presentationTimeOffsetUs = segmentBase.getPresentationTimeOffsetUs(); presentationTimeOffsetUs = segmentBase.getPresentationTimeOffsetUs();
} }
...@@ -207,7 +215,15 @@ public abstract class Representation { ...@@ -207,7 +215,15 @@ public abstract class Representation {
new SingleSegmentBase(rangedUri, 1, 0, indexStart, indexEnd - indexStart + 1); new SingleSegmentBase(rangedUri, 1, 0, indexStart, indexEnd - indexStart + 1);
List<BaseUrl> baseUrls = ImmutableList.of(new BaseUrl(uri)); List<BaseUrl> baseUrls = ImmutableList.of(new BaseUrl(uri));
return new SingleSegmentRepresentation( return new SingleSegmentRepresentation(
revisionId, format, baseUrls, segmentBase, inbandEventStreams, cacheKey, contentLength); revisionId,
format,
baseUrls,
segmentBase,
inbandEventStreams,
/* essentialProperties= */ ImmutableList.of(),
/* supplementalProperties= */ ImmutableList.of(),
cacheKey,
contentLength);
} }
/** /**
...@@ -216,6 +232,8 @@ public abstract class Representation { ...@@ -216,6 +232,8 @@ public abstract class Representation {
* @param baseUrls The base urls of the representation. * @param baseUrls The base urls of the representation.
* @param segmentBase The segment base underlying the representation. * @param segmentBase The segment base underlying the representation.
* @param inbandEventStreams The in-band event streams in the representation. May be null. * @param inbandEventStreams The in-band event streams in the representation. May be null.
* @param essentialProperties Essential properties in the representation. May be empty.
* @param supplementalProperties Supplemental properties in the representation. May be empty.
* @param cacheKey An optional key to be returned from {@link #getCacheKey()}, or null. * @param cacheKey An optional key to be returned from {@link #getCacheKey()}, or null.
* @param contentLength The content length, or {@link C#LENGTH_UNSET} if unknown. * @param contentLength The content length, or {@link C#LENGTH_UNSET} if unknown.
*/ */
...@@ -225,9 +243,18 @@ public abstract class Representation { ...@@ -225,9 +243,18 @@ public abstract class Representation {
List<BaseUrl> baseUrls, List<BaseUrl> baseUrls,
SingleSegmentBase segmentBase, SingleSegmentBase segmentBase,
@Nullable List<Descriptor> inbandEventStreams, @Nullable List<Descriptor> inbandEventStreams,
List<Descriptor> essentialProperties,
List<Descriptor> supplementalProperties,
@Nullable String cacheKey, @Nullable String cacheKey,
long contentLength) { long contentLength) {
super(revisionId, format, baseUrls, segmentBase, inbandEventStreams); super(
revisionId,
format,
baseUrls,
segmentBase,
inbandEventStreams,
essentialProperties,
supplementalProperties);
this.uri = Uri.parse(baseUrls.get(0).url); this.uri = Uri.parse(baseUrls.get(0).url);
this.indexUri = segmentBase.getIndex(); this.indexUri = segmentBase.getIndex();
this.cacheKey = cacheKey; this.cacheKey = cacheKey;
...@@ -271,14 +298,25 @@ public abstract class Representation { ...@@ -271,14 +298,25 @@ public abstract class Representation {
* @param baseUrls The base URLs of the representation. * @param baseUrls The base URLs of the representation.
* @param segmentBase The segment base underlying the representation. * @param segmentBase The segment base underlying the representation.
* @param inbandEventStreams The in-band event streams in the representation. May be null. * @param inbandEventStreams The in-band event streams in the representation. May be null.
* @param essentialProperties Essential properties in the representation. May be empty.
* @param supplementalProperties Supplemental properties in the representation. May be empty.
*/ */
public MultiSegmentRepresentation( public MultiSegmentRepresentation(
long revisionId, long revisionId,
Format format, Format format,
List<BaseUrl> baseUrls, List<BaseUrl> baseUrls,
MultiSegmentBase segmentBase, MultiSegmentBase segmentBase,
@Nullable List<Descriptor> inbandEventStreams) { @Nullable List<Descriptor> inbandEventStreams,
super(revisionId, format, baseUrls, segmentBase, inbandEventStreams); List<Descriptor> essentialProperties,
List<Descriptor> supplementalProperties) {
super(
revisionId,
format,
baseUrls,
segmentBase,
inbandEventStreams,
essentialProperties,
supplementalProperties);
this.segmentBase = segmentBase; this.segmentBase = segmentBase;
} }
......
library/dash/src/test/java/com/google/android/exoplayer2/source/dash/DashUtilTest.java
...@@ -79,6 +79,8 @@ public final class DashUtilTest { ...@@ -79,6 +79,8 @@ public final class DashUtilTest {
baseUrls, baseUrls,
new SingleSegmentBase(), new SingleSegmentBase(),
/* inbandEventStreams= */ null, /* inbandEventStreams= */ null,
/* essentialProperties= */ ImmutableList.of(),
/* supplementalProperties= */ ImmutableList.of(),
/* cacheKey= */ null, /* cacheKey= */ null,
/* contentLength= */ 1); /* contentLength= */ 1);
RangedUri rangedUri = new RangedUri("path/to/resource", /* start= */ 0, /* length= */ 1); RangedUri rangedUri = new RangedUri("path/to/resource", /* start= */ 0, /* length= */ 1);
...@@ -99,6 +101,8 @@ public final class DashUtilTest { ...@@ -99,6 +101,8 @@ public final class DashUtilTest {
baseUrls, baseUrls,
new SingleSegmentBase(), new SingleSegmentBase(),
/* inbandEventStreams= */ null, /* inbandEventStreams= */ null,
/* essentialProperties= */ ImmutableList.of(),
/* supplementalProperties= */ ImmutableList.of(),
"cacheKey", "cacheKey",
/* contentLength= */ 1); /* contentLength= */ 1);
RangedUri rangedUri = new RangedUri("path/to/resource", /* start= */ 0, /* length= */ 1); RangedUri rangedUri = new RangedUri("path/to/resource", /* start= */ 0, /* length= */ 1);
......
library/dash/src/test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java
...@@ -24,6 +24,8 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; ...@@ -24,6 +24,8 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.metadata.emsg.EventMessage; import com.google.android.exoplayer2.metadata.emsg.EventMessage;
import com.google.android.exoplayer2.source.dash.manifest.Representation.MultiSegmentRepresentation;
import com.google.android.exoplayer2.source.dash.manifest.Representation.SingleSegmentRepresentation;
import com.google.android.exoplayer2.source.dash.manifest.SegmentBase.SegmentTimelineElement; import com.google.android.exoplayer2.source.dash.manifest.SegmentBase.SegmentTimelineElement;
import com.google.android.exoplayer2.testutil.TestUtil; import com.google.android.exoplayer2.testutil.TestUtil;
import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.MimeTypes;
...@@ -53,6 +55,8 @@ public class DashManifestParserTest { ...@@ -53,6 +55,8 @@ public class DashManifestParserTest {
private static final String SAMPLE_MPD_ASSET_IDENTIFIER = "media/mpd/sample_mpd_asset_identifier"; private static final String SAMPLE_MPD_ASSET_IDENTIFIER = "media/mpd/sample_mpd_asset_identifier";
private static final String SAMPLE_MPD_TEXT = "media/mpd/sample_mpd_text"; private static final String SAMPLE_MPD_TEXT = "media/mpd/sample_mpd_text";
private static final String SAMPLE_MPD_TRICK_PLAY = "media/mpd/sample_mpd_trick_play"; private static final String SAMPLE_MPD_TRICK_PLAY = "media/mpd/sample_mpd_trick_play";
private static final String SAMPLE_MPD_ESSENTIAL_SUPPLEMENTAL_PROPERTIES =
"media/mpd/sample_mpd_essential_supplemental_properties";
private static final String SAMPLE_MPD_AVAILABILITY_TIME_OFFSET_BASE_URL = private static final String SAMPLE_MPD_AVAILABILITY_TIME_OFFSET_BASE_URL =
"media/mpd/sample_mpd_availabilityTimeOffset_baseUrl"; "media/mpd/sample_mpd_availabilityTimeOffset_baseUrl";
private static final String SAMPLE_MPD_MULTIPLE_BASE_URLS = private static final String SAMPLE_MPD_MULTIPLE_BASE_URLS =
...@@ -505,6 +509,74 @@ public class DashManifestParserTest { ...@@ -505,6 +509,74 @@ public class DashManifestParserTest {
} }
@Test @Test
public void parseEssentialAndSupplementalProperties() throws IOException {
DashManifestParser parser = new DashManifestParser();
DashManifest manifest =
parser.parse(
Uri.parse("https://example.com/test.mpd"),
TestUtil.getInputStream(
ApplicationProvider.getApplicationContext(),
SAMPLE_MPD_ESSENTIAL_SUPPLEMENTAL_PROPERTIES));
// Verify test setup.
assertThat(manifest.getPeriodCount()).isEqualTo(1);
assertThat(manifest.getPeriod(0).adaptationSets).hasSize(1);
AdaptationSet adaptationSet = manifest.getPeriod(0).adaptationSets.get(0);
assertThat(adaptationSet.representations).hasSize(2);
Representation representation0 = adaptationSet.representations.get(0);
Representation representation1 = adaptationSet.representations.get(1);
assertThat(representation0).isInstanceOf(SingleSegmentRepresentation.class);
assertThat(representation1).isInstanceOf(MultiSegmentRepresentation.class);
// Verify parsed properties.
assertThat(adaptationSet.essentialProperties).hasSize(1);
assertThat(adaptationSet.essentialProperties.get(0).schemeIdUri)
.isEqualTo("urn:mpeg:dash:essential-scheme:2050");
assertThat(adaptationSet.essentialProperties.get(0).value).isEqualTo("adaptationEssential");
assertThat(adaptationSet.supplementalProperties).hasSize(1);
assertThat(adaptationSet.supplementalProperties.get(0).schemeIdUri)
.isEqualTo("urn:mpeg:dash:supplemental-scheme:2050");
assertThat(adaptationSet.supplementalProperties.get(0).value)
.isEqualTo("adaptationSupplemental");
assertThat(representation0.essentialProperties).hasSize(2);
assertThat(representation0.essentialProperties.get(0).schemeIdUri)
.isEqualTo("urn:mpeg:dash:essential-scheme:2050");
assertThat(representation0.essentialProperties.get(0).value).isEqualTo("adaptationEssential");
assertThat(representation0.essentialProperties.get(1).schemeIdUri)
.isEqualTo("urn:mpeg:dash:essential-scheme:2050");
assertThat(representation0.essentialProperties.get(1).value)
.isEqualTo("representationEssential");
assertThat(representation0.supplementalProperties).hasSize(2);
assertThat(representation0.supplementalProperties.get(0).schemeIdUri)
.isEqualTo("urn:mpeg:dash:supplemental-scheme:2050");
assertThat(representation0.supplementalProperties.get(0).value)
.isEqualTo("adaptationSupplemental");
assertThat(representation0.supplementalProperties.get(1).schemeIdUri)
.isEqualTo("urn:mpeg:dash:supplemental-scheme:2050");
assertThat(representation0.supplementalProperties.get(1).value)
.isEqualTo("representationSupplemental");
assertThat(representation1.essentialProperties).hasSize(2);
assertThat(representation0.essentialProperties.get(0).schemeIdUri)
.isEqualTo("urn:mpeg:dash:essential-scheme:2050");
assertThat(representation0.essentialProperties.get(0).value).isEqualTo("adaptationEssential");
assertThat(representation1.essentialProperties.get(1).schemeIdUri)
.isEqualTo("urn:mpeg:dash:essential-scheme:2050");
assertThat(representation1.essentialProperties.get(1).value)
.isEqualTo("representationEssential");
assertThat(representation1.supplementalProperties).hasSize(2);
assertThat(representation0.supplementalProperties.get(0).schemeIdUri)
.isEqualTo("urn:mpeg:dash:supplemental-scheme:2050");
assertThat(representation0.supplementalProperties.get(0).value)
.isEqualTo("adaptationSupplemental");
assertThat(representation1.supplementalProperties.get(1).schemeIdUri)
.isEqualTo("urn:mpeg:dash:supplemental-scheme:2050");
assertThat(representation1.supplementalProperties.get(1).value)
.isEqualTo("representationSupplemental");
}
@Test
public void availabilityTimeOffset_staticManifest_setToTimeUnset() throws IOException { public void availabilityTimeOffset_staticManifest_setToTimeUnset() throws IOException {
DashManifestParser parser = new DashManifestParser(); DashManifestParser parser = new DashManifestParser();
DashManifest manifest = DashManifest manifest =
......
testdata/src/test/assets/media/mpd/sample_mpd_essential_supplemental_properties 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<MPD availabilityStartTime="2014-06-19T23:07:42" type="dynamic">
<Period start="PT7462826.784S" id="0">
<AdaptationSet id="0" mimeType="video/mp4">
<SupplementalProperty
schemeIdUri="urn:mpeg:dash:supplemental-scheme:2050"
value="adaptationSupplemental"/>
<EssentialProperty
schemeIdUri="urn:mpeg:dash:essential-scheme:2050"
value="adaptationEssential"/>
<Representation id="singleSegment">
<SegmentBase/>
<SupplementalProperty
schemeIdUri="urn:mpeg:dash:supplemental-scheme:2050"
value="representationSupplemental"/>
<EssentialProperty
schemeIdUri="urn:mpeg:dash:essential-scheme:2050"
value="representationEssential"/>
</Representation>
<Representation id="multiSegment">
<SegmentList/>
<SupplementalProperty
schemeIdUri="urn:mpeg:dash:supplemental-scheme:2050"
value="representationSupplemental"/>
<EssentialProperty
schemeIdUri="urn:mpeg:dash:essential-scheme:2050"
value="representationEssential"/>
</Representation>
</AdaptationSet>
</Period>
</MPD>
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