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

DASH: Stop interpreting main track role as SELECTION_FLAG_DEFAULT

Browse Source 
The `main` role distinguishes a track from an `alternate`, but unlike
`SELECTION_FLAG_DEFAULT` it doesn't imply the track should be selected
unless user preferences state otherwise. e.g. in the case of a text
track, the player shouldn't enable subtitle rendering just because a
`main` text track is present in the manifest.

The `main`/`alternate` distinction is still available through
`Format.roleFlags` and the `ROLE_FLAG_MAIN` and `ROLE_FLAG_ALTERNATE`
values.

This behaviour was originally [added in 2.2.0](7f967f3057),
however at the time the `C.RoleFlags` IntDef did not exist. The IntDef
was [added in 2.10.0](a86a9137be).

PiperOrigin-RevId: 418937747
This commit is contained in:
ibaker 2021-12-30 12:20:37 +00:00 committed by tonihei
parent 1af1213154
commit b05583f00d
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/exoplayer_dash/src/main/java/androidx/media3/exoplayer/dash/manifest/DashManifestParser.java
View File

@ -1474,8 +1474,6 @@ public class DashManifestParser extends DefaultHandler
return 0; return 0;
} }
switch (value) { switch (value) {
case "main":
return C.SELECTION_FLAG_DEFAULT;
case "forced_subtitle": case "forced_subtitle":
// Support both hyphen and underscore (https://github.com/google/ExoPlayer/issues/9727). // Support both hyphen and underscore (https://github.com/google/ExoPlayer/issues/9727).
case "forced-subtitle": case "forced-subtitle":

3
libraries/exoplayer_dash/src/test/java/androidx/media3/exoplayer/dash/manifest/DashManifestParserTest.java
View File

@ -243,7 +243,8 @@ public class DashManifestParserTest {
assertThat(format.containerMimeType).isEqualTo(MimeTypes.APPLICATION_RAWCC); assertThat(format.containerMimeType).isEqualTo(MimeTypes.APPLICATION_RAWCC);
assertThat(format.sampleMimeType).isEqualTo(MimeTypes.APPLICATION_CEA608); assertThat(format.sampleMimeType).isEqualTo(MimeTypes.APPLICATION_CEA608);
assertThat(format.codecs).isEqualTo("cea608"); assertThat(format.codecs).isEqualTo("cea608");
assertThat(format.roleFlags).isEqualTo(C.ROLE_FLAG_SUBTITLE); assertThat(format.roleFlags).isEqualTo(C.ROLE_FLAG_SUBTITLE | C.ROLE_FLAG_MAIN);
assertThat(format.selectionFlags).isEqualTo(0);
assertThat(adaptationSets.get(0).type).isEqualTo(C.TRACK_TYPE_TEXT); assertThat(adaptationSets.get(0).type).isEqualTo(C.TRACK_TYPE_TEXT);
format = adaptationSets.get(1).representations.get(0).format; format = adaptationSets.get(1).representations.get(0).format;

1
libraries/test_data/src/test/assets/media/mpd/sample_mpd_text
View File

@ -8,6 +8,7 @@
</SegmentTemplate> </SegmentTemplate>
<AdaptationSet id="0" mimeType="application/x-rawcc" subsegmentAlignment="true"> <AdaptationSet id="0" mimeType="application/x-rawcc" subsegmentAlignment="true">
<Role schemeIdUri="urn:mpeg:DASH:role:2011" value="subtitle"/> <Role schemeIdUri="urn:mpeg:DASH:role:2011" value="subtitle"/>
<Role schemeIdUri="urn:mpeg:DASH:role:2011" value="main"/>
<Representation id="0" codecs="cea608" bandwidth="16"> <Representation id="0" codecs="cea608" bandwidth="16">
<BaseURL>https://test.com/0</BaseURL> <BaseURL>https://test.com/0</BaseURL>
</Representation> </Representation>