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
57250036
authored
Aug 19, 2015
by
ojw28
Browse files
Options
_('Browse Files')
Download
Plain Diff
Merge pull request #724 from hori-ryota/feature/bugfix-of-parse-aes-url-for-hls
Fixed bug of AES URI Pattern for hls
parents
3b9ca40b
3714751b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 additions
and
1 deletions
library/src/main/java/com/google/android/exoplayer/hls/HlsPlaylistParser.java
library/src/main/java/com/google/android/exoplayer/hls/HlsPlaylistParser.java
View file @
57250036
...
@@ -87,7 +87,7 @@ public final class HlsPlaylistParser implements UriLoadable.Parser<HlsPlaylist>
...
@@ -87,7 +87,7 @@ public final class HlsPlaylistParser implements UriLoadable.Parser<HlsPlaylist>
private
static
final
Pattern
METHOD_ATTR_REGEX
=
private
static
final
Pattern
METHOD_ATTR_REGEX
=
Pattern
.
compile
(
METHOD_ATTR
+
"=("
+
METHOD_NONE
+
"|"
+
METHOD_AES128
+
")"
);
Pattern
.
compile
(
METHOD_ATTR
+
"=("
+
METHOD_NONE
+
"|"
+
METHOD_AES128
+
")"
);
private
static
final
Pattern
URI_ATTR_REGEX
=
private
static
final
Pattern
URI_ATTR_REGEX
=
Pattern
.
compile
(
URI_ATTR
+
"=\"(.+)\""
);
Pattern
.
compile
(
URI_ATTR
+
"=\"(.+
?
)\""
);
private
static
final
Pattern
IV_ATTR_REGEX
=
private
static
final
Pattern
IV_ATTR_REGEX
=
Pattern
.
compile
(
IV_ATTR
+
"=([^,.*]+)"
);
Pattern
.
compile
(
IV_ATTR
+
"=([^,.*]+)"
);
private
static
final
Pattern
TYPE_ATTR_REGEX
=
private
static
final
Pattern
TYPE_ATTR_REGEX
=
...
...
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