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
d5425bb6
authored
Jan 15, 2016
by
Bart van den Ende
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
resolve #1095 store the language as normalised attribute so we can access it from the track parser
parent
19cf2423
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletions
library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingManifestParser.java
library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingManifestParser.java
View file @
d5425bb6
...
...
@@ -543,6 +543,7 @@ public class SmoothStreamingManifestParser implements UriLoadable.Parser<SmoothS
displayWidth
=
parseInt
(
parser
,
KEY_DISPLAY_WIDTH
,
-
1
);
displayHeight
=
parseInt
(
parser
,
KEY_DISPLAY_HEIGHT
,
-
1
);
language
=
parser
.
getAttributeValue
(
null
,
KEY_LANGUAGE
);
putNormalizedAttribute
(
KEY_LANGUAGE
,
language
);
timescale
=
parseInt
(
parser
,
KEY_TIME_SCALE
,
-
1
);
if
(
timescale
==
-
1
)
{
timescale
=
(
Long
)
getNormalizedAttribute
(
KEY_TIME_SCALE
);
...
...
@@ -634,12 +635,12 @@ public class SmoothStreamingManifestParser implements UriLoadable.Parser<SmoothS
// If fourCC is missing and the stream type is audio, we assume AAC.
mimeType
=
fourCC
!=
null
?
fourCCToMimeType
(
fourCC
)
:
type
==
StreamElement
.
TYPE_AUDIO
?
MimeTypes
.
AUDIO_AAC
:
null
;
language
=
(
String
)
getNormalizedAttribute
(
KEY_LANGUAGE
);
}
if
(
type
==
StreamElement
.
TYPE_AUDIO
)
{
samplingRate
=
parseRequiredInt
(
parser
,
KEY_SAMPLING_RATE
);
channels
=
parseRequiredInt
(
parser
,
KEY_CHANNELS
);
language
=
(
String
)
getNormalizedAttribute
(
KEY_LANGUAGE
);
}
else
{
samplingRate
=
-
1
;
channels
=
-
1
;
...
...
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