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
c19faa63
authored
Sep 11, 2014
by
Oliver Woodman
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
A few tiny bug fixes.
parent
ec90eac3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
4 deletions
library/src/main/java/com/google/android/exoplayer/MediaCodecVideoTrackRenderer.java
library/src/main/java/com/google/android/exoplayer/util/ManifestFetcher.java
library/src/main/java/com/google/android/exoplayer/MediaCodecVideoTrackRenderer.java
View file @
c19faa63
...
...
@@ -329,7 +329,8 @@ public class MediaCodecVideoTrackRenderer extends MediaCodecTrackRenderer {
super
.
onInputFormatChanged
(
holder
);
// TODO: Ideally this would be read in onOutputFormatChanged, but there doesn't seem
// to be a way to pass a custom key/value pair value through to the output format.
currentPixelWidthHeightRatio
=
holder
.
format
.
pixelWidthHeightRatio
;
currentPixelWidthHeightRatio
=
holder
.
format
.
pixelWidthHeightRatio
==
MediaFormat
.
NO_VALUE
?
1
:
holder
.
format
.
pixelWidthHeightRatio
;
}
@Override
...
...
library/src/main/java/com/google/android/exoplayer/util/ManifestFetcher.java
View file @
c19faa63
...
...
@@ -97,9 +97,6 @@ public class ManifestFetcher<T> extends AsyncTask<String, Void, T> {
HttpURLConnection
connection
=
configureHttpConnection
(
new
URL
(
urlString
));
inputStream
=
connection
.
getInputStream
();
inputEncoding
=
connection
.
getContentEncoding
();
if
(
inputEncoding
==
null
)
{
inputEncoding
=
C
.
UTF8_NAME
;
}
return
parser
.
parse
(
inputStream
,
inputEncoding
,
contentId
,
baseUri
);
}
finally
{
if
(
inputStream
!=
null
)
{
...
...
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