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
952bd4e7
authored
Oct 12, 2015
by
Oliver Woodman
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Don't calculate a maximum input size for H.264 on Sony 4k TV.
Issue: #800
parent
a764b359
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
0 deletions
library/src/main/java/com/google/android/exoplayer/MediaCodecVideoTrackRenderer.java
library/src/main/java/com/google/android/exoplayer/util/Util.java
library/src/main/java/com/google/android/exoplayer/MediaCodecVideoTrackRenderer.java
View file @
952bd4e7
...
...
@@ -560,6 +560,11 @@ public class MediaCodecVideoTrackRenderer extends MediaCodecTrackRenderer {
// Already set. The source of the format may know better, so do nothing.
return
;
}
if
(
"BRAVIA 4K 2015"
.
equals
(
Util
.
MODEL
))
{
// The Sony BRAVIA 4k TV has input buffers that are too small for the calculated 4k video
// maximum input size, so use the default value.
return
;
}
int
maxHeight
=
format
.
getInteger
(
android
.
media
.
MediaFormat
.
KEY_HEIGHT
);
if
(
codecIsAdaptive
&&
format
.
containsKey
(
android
.
media
.
MediaFormat
.
KEY_MAX_HEIGHT
))
{
maxHeight
=
Math
.
max
(
maxHeight
,
format
.
getInteger
(
android
.
media
.
MediaFormat
.
KEY_MAX_HEIGHT
));
...
...
library/src/main/java/com/google/android/exoplayer/util/Util.java
View file @
952bd4e7
...
...
@@ -75,6 +75,12 @@ public final class Util {
*/
public
static
final
String
MANUFACTURER
=
android
.
os
.
Build
.
MANUFACTURER
;
/**
* Like {@link android.os.Build#MODEL}, but in a place where it can be conveniently overridden for
* local testing.
*/
public
static
final
String
MODEL
=
android
.
os
.
Build
.
MODEL
;
private
static
final
Pattern
XS_DATE_TIME_PATTERN
=
Pattern
.
compile
(
"(\\d\\d\\d\\d)\\-(\\d\\d)\\-(\\d\\d)[Tt]"
+
"(\\d\\d):(\\d\\d):(\\d\\d)(\\.(\\d+))?"
...
...
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