Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
SDK
/
exoplayer
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
5f71e863
authored
Oct 11, 2019
by
andrewlewis
Committed by
Oliver Woodman
Oct 13, 2019
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Handle legacy DASH audio channel configuration
Issue: #6523 PiperOrigin-RevId: 274160232
parent
a81dea6a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
5 deletions
RELEASENOTES.md
library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
RELEASENOTES.md
View file @
5f71e863
...
...
@@ -32,6 +32,8 @@
(
[
#1787
](
https://github.com/google/ExoPlayer/issues/1787
)
).
*
Support
`Label`
elements
(
[
#6297
](
https://github.com/google/ExoPlayer/issues/6297
)
).
*
Support legacy audio channel configuration
(
[
#6523
](
https://github.com/google/ExoPlayer/issues/6523
)
).
*
Add
`allowedCapturePolicy`
field to
`AudioAttributes`
wrapper to allow to
opt-out of audio recording.
*
Add
`DataSpec.httpRequestHeaders`
to set HTTP request headers when connecting
...
...
library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
View file @
5f71e863
...
...
@@ -1169,10 +1169,13 @@ public class DashManifestParser extends DefaultHandler
protected
int
parseAudioChannelConfiguration
(
XmlPullParser
xpp
)
throws
XmlPullParserException
,
IOException
{
String
schemeIdUri
=
parseString
(
xpp
,
"schemeIdUri"
,
null
);
int
audioChannels
=
"urn:mpeg:dash:23003:3:audio_channel_configuration:2011"
.
equals
(
schemeIdUri
)
?
parseInt
(
xpp
,
"value"
,
Format
.
NO_VALUE
)
:
(
"tag:dolby.com,2014:dash:audio_channel_configuration:2011"
.
equals
(
schemeIdUri
)
?
parseDolbyChannelConfiguration
(
xpp
)
:
Format
.
NO_VALUE
);
int
audioChannels
=
"urn:mpeg:dash:23003:3:audio_channel_configuration:2011"
.
equals
(
schemeIdUri
)
?
parseInt
(
xpp
,
"value"
,
Format
.
NO_VALUE
)
:
(
"tag:dolby.com,2014:dash:audio_channel_configuration:2011"
.
equals
(
schemeIdUri
)
||
"urn:dolby:dash:audio_channel_configuration:2011"
.
equals
(
schemeIdUri
)
?
parseDolbyChannelConfiguration
(
xpp
)
:
Format
.
NO_VALUE
);
do
{
xpp
.
next
();
}
while
(!
XmlPullParserUtil
.
isEndTag
(
xpp
,
"AudioChannelConfiguration"
));
...
...
@@ -1551,7 +1554,8 @@ public class DashManifestParser extends DefaultHandler
/**
* Parses the number of channels from the value attribute of an AudioElementConfiguration with
* schemeIdUri "tag:dolby.com,2014:dash:audio_channel_configuration:2011", as defined by table E.5
* in ETSI TS 102 366.
* in ETSI TS 102 366, or the legacy schemeIdUri
* "urn:dolby:dash:audio_channel_configuration:2011".
*
* @param xpp The parser from which to read.
* @return The parsed number of channels, or {@link Format#NO_VALUE} if the channel count could
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment