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
60f000c8
authored
Jan 19, 2021
by
andrewlewis
Committed by
Oliver Woodman
Jan 19, 2021
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Remove incorrect TODOs
PiperOrigin-RevId: 352552961
parent
dc1842ef
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
3 deletions
library/common/src/main/java/com/google/android/exoplayer2/util/Util.java
library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSchemeDataSource.java
library/common/src/main/java/com/google/android/exoplayer2/util/Util.java
View file @
60f000c8
...
@@ -2045,8 +2045,6 @@ public final class Util {
...
@@ -2045,8 +2045,6 @@ public final class Util {
/** Returns a data URI with the specified MIME type and data. */
/** Returns a data URI with the specified MIME type and data. */
public
static
Uri
getDataUriForString
(
String
mimeType
,
String
data
)
{
public
static
Uri
getDataUriForString
(
String
mimeType
,
String
data
)
{
// TODO(internal: b/169937045): For now we don't pass the URL_SAFE flag as DataSchemeDataSource
// doesn't decode using it.
return
Uri
.
parse
(
return
Uri
.
parse
(
"data:"
+
mimeType
+
";base64,"
+
Base64
.
encodeToString
(
data
.
getBytes
(),
Base64
.
NO_WRAP
));
"data:"
+
mimeType
+
";base64,"
+
Base64
.
encodeToString
(
data
.
getBytes
(),
Base64
.
NO_WRAP
));
}
}
...
...
library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSchemeDataSource.java
View file @
60f000c8
...
@@ -59,7 +59,6 @@ public final class DataSchemeDataSource extends BaseDataSource {
...
@@ -59,7 +59,6 @@ public final class DataSchemeDataSource extends BaseDataSource {
String
dataString
=
uriParts
[
1
];
String
dataString
=
uriParts
[
1
];
if
(
uriParts
[
0
].
contains
(
";base64"
))
{
if
(
uriParts
[
0
].
contains
(
";base64"
))
{
try
{
try
{
// TODO(internal: b/169937045): Consider passing Base64.URL_SAFE flag.
data
=
Base64
.
decode
(
dataString
,
/* flags= */
Base64
.
DEFAULT
);
data
=
Base64
.
decode
(
dataString
,
/* flags= */
Base64
.
DEFAULT
);
}
catch
(
IllegalArgumentException
e
)
{
}
catch
(
IllegalArgumentException
e
)
{
throw
new
ParserException
(
"Error while parsing Base64 encoded string: "
+
dataString
,
e
);
throw
new
ParserException
(
"Error while parsing Base64 encoded string: "
+
dataString
,
e
);
...
...
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