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

Merge pull request #10214 from cedricxperi:dev-v2

Browse Source 
PiperOrigin-RevId: 444585404
This commit is contained in:
Ian Baker 2022-05-09 10:14:11 +01:00
commit 9e7c8380c2
2 changed files with 50 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
RELEASENOTES.md
View File

@ -49,13 +49,17 @@
* Don't show forced text tracks in the `PlayerView` track selector, and * Don't show forced text tracks in the `PlayerView` track selector, and
keep a suitable forced text track selected if "None" is selected keep a suitable forced text track selected if "None" is selected
([#9432](https://github.com/google/ExoPlayer/issues/9432)). ([#9432](https://github.com/google/ExoPlayer/issues/9432)).
* DASH:
* Parse channel count from DTS `AudioChannelConfiguration` elements. This
re-enables audio passthrough for DTS streams
([#10159](https://github.com/google/ExoPlayer/issues/10159)).
* HLS: * HLS:
* Fallback to chunkful preparation if the playlist CODECS attribute * Fallback to chunkful preparation if the playlist CODECS attribute
does not contain the audio codec does not contain the audio codec
([#10065](https://github.com/google/ExoPlayer/issues/10065)). ([#10065](https://github.com/google/ExoPlayer/issues/10065)).
* RTSP: * RTSP:
* Add RTP reader for MPEG4 * Add RTP reader for MPEG4
([#35](https://github.com/androidx/media/pull/35)) ([#35](https://github.com/androidx/media/pull/35)).
* Add RTP reader for HEVC * Add RTP reader for HEVC
([#36](https://github.com/androidx/media/pull/36)). ([#36](https://github.com/androidx/media/pull/36)).
* Add RTP reader for AMR. Currently only mono-channel, non-interleaved * Add RTP reader for AMR. Currently only mono-channel, non-interleaved

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

@ -77,7 +77,7 @@ public class DashManifestParser extends DefaultHandler
Pattern.compile("([1-9]|[1-5][0-9]|6[0-3])=.*"); Pattern.compile("([1-9]|[1-5][0-9]|6[0-3])=.*");
/** /**
* Maps the value attribute of an AudioElementConfiguration with schemeIdUri * Maps the value attribute of an AudioChannelConfiguration with schemeIdUri
* "urn:mpeg:mpegB:cicp:ChannelConfiguration", as defined by ISO 23001-8 clause 8.1, to a channel * "urn:mpeg:mpegB:cicp:ChannelConfiguration", as defined by ISO 23001-8 clause 8.1, to a channel
* count. * count.
*/ */
@ -1465,6 +1465,13 @@ public class DashManifestParser extends DefaultHandler
case "urn:mpeg:mpegB:cicp:ChannelConfiguration": case "urn:mpeg:mpegB:cicp:ChannelConfiguration":
audioChannels = parseMpegChannelConfiguration(xpp); audioChannels = parseMpegChannelConfiguration(xpp);
break; break;
case "tag:dts.com,2014:dash:audio_channel_configuration:2012":
case "urn:dts:dash:audio_channel_configuration:2012":
audioChannels = parseDtsChannelConfiguration(xpp);
break;
case "tag:dts.com,2018:uhd:audio_channel_configuration":
audioChannels = parseDtsxChannelConfiguration(xpp);
break;
case "tag:dolby.com,2014:dash:audio_channel_configuration:2011": case "tag:dolby.com,2014:dash:audio_channel_configuration:2011":
case "urn:dolby:dash:audio_channel_configuration:2011": case "urn:dolby:dash:audio_channel_configuration:2011":
audioChannels = parseDolbyChannelConfiguration(xpp); audioChannels = parseDolbyChannelConfiguration(xpp);
@ -1868,7 +1875,7 @@ public class DashManifestParser extends DefaultHandler
} }
/** /**
* Parses the number of channels from the value attribute of an AudioElementConfiguration with * Parses the number of channels from the value attribute of an AudioChannelConfiguration with
* schemeIdUri "urn:mpeg:mpegB:cicp:ChannelConfiguration", as defined by ISO 23001-8 clause 8.1. * schemeIdUri "urn:mpeg:mpegB:cicp:ChannelConfiguration", as defined by ISO 23001-8 clause 8.1.
* *
* @param xpp The parser from which to read. * @param xpp The parser from which to read.
@ -1883,9 +1890,42 @@ public class DashManifestParser extends DefaultHandler
} }
/** /**
* Parses the number of channels from the value attribute of an AudioElementConfiguration with * Parses the number of channels from the value attribute of an AudioChannelConfiguration with
* schemeIdUri "tag:dolby.com,2014:dash:audio_channel_configuration:2011", as defined by table E.5 * schemeIdUri "tag:dts.com,2014:dash:audio_channel_configuration:2012" as defined by Annex G
* in ETSI TS 102 366, or the legacy schemeIdUri * (3.2) in ETSI TS 102 114 V1.6.1, or by the legacy schemeIdUri
* "urn:dts:dash:audio_channel_configuration:2012".
*
* @param xpp The parser from which to read.
* @return The parsed number of channels, or {@link Format#NO_VALUE} if the channel count could
* not be parsed.
*/
protected static int parseDtsChannelConfiguration(XmlPullParser xpp) {
int channelCount = parseInt(xpp, "value", Format.NO_VALUE);
return 0 < channelCount && channelCount < 33 ? channelCount : Format.NO_VALUE;
}
/**
* Parses the number of channels from the value attribute of an AudioChannelConfiguration with
* schemeIdUri "tag:dts.com,2018:uhd:audio_channel_configuration" as defined by table B-5 in ETSI
* TS 103 491 v1.2.1.
*
* @param xpp The parser from which to read.
* @return The parsed number of channels, or {@link Format#NO_VALUE} if the channel count could
* not be parsed.
*/
protected static int parseDtsxChannelConfiguration(XmlPullParser xpp) {
@Nullable String value = xpp.getAttributeValue(null, "value");
if (value == null) {
return Format.NO_VALUE;
}
int channelCount = Integer.bitCount(Integer.parseInt(value, /* radix= */ 16));
return channelCount == 0 ? Format.NO_VALUE : channelCount;
}
/**
* Parses the number of channels from the value attribute of an AudioChannelConfiguration with
* schemeIdUri "tag:dolby.com,2014:dash:audio_channel_configuration:2011" as defined by table E.5
* in ETSI TS 102 366, or by the legacy schemeIdUri
* "urn:dolby:dash:audio_channel_configuration:2011". * "urn:dolby:dash:audio_channel_configuration:2011".
* *
* @param xpp The parser from which to read. * @param xpp The parser from which to read.