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
b95417e7
authored
Jun 13, 2017
by
ojw28
Committed by
GitHub
Jun 13, 2017
Browse files
Options
_('Browse Files')
Download
Plain Diff
Merge pull request #2943 from michalliu/dev-v2-fix
check if defaultRefreshRate is reasonable
parents
35099821
dbfbcd63
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
library/core/src/main/java/com/google/android/exoplayer2/video/VideoFrameReleaseTimeHelper.java
library/core/src/main/java/com/google/android/exoplayer2/video/VideoFrameReleaseTimeHelper.java
View file @
b95417e7
...
@@ -72,7 +72,7 @@ public final class VideoFrameReleaseTimeHelper {
...
@@ -72,7 +72,7 @@ public final class VideoFrameReleaseTimeHelper {
private
VideoFrameReleaseTimeHelper
(
double
defaultDisplayRefreshRate
,
private
VideoFrameReleaseTimeHelper
(
double
defaultDisplayRefreshRate
,
boolean
useDefaultDisplayVsync
)
{
boolean
useDefaultDisplayVsync
)
{
this
.
useDefaultDisplayVsync
=
useDefaultDisplayVsync
;
this
.
useDefaultDisplayVsync
=
useDefaultDisplayVsync
;
if
(
useDefaultDisplayVsync
)
{
if
(
useDefaultDisplayVsync
&&
defaultDisplayRefreshRate
>
0
f
)
{
vsyncSampler
=
VSyncSampler
.
getInstance
();
vsyncSampler
=
VSyncSampler
.
getInstance
();
vsyncDurationNs
=
(
long
)
(
C
.
NANOS_PER_SECOND
/
defaultDisplayRefreshRate
);
vsyncDurationNs
=
(
long
)
(
C
.
NANOS_PER_SECOND
/
defaultDisplayRefreshRate
);
vsyncOffsetNs
=
(
vsyncDurationNs
*
VSYNC_OFFSET_PERCENTAGE
)
/
100
;
vsyncOffsetNs
=
(
vsyncDurationNs
*
VSYNC_OFFSET_PERCENTAGE
)
/
100
;
...
@@ -202,7 +202,7 @@ public final class VideoFrameReleaseTimeHelper {
...
@@ -202,7 +202,7 @@ public final class VideoFrameReleaseTimeHelper {
private
static
float
getDefaultDisplayRefreshRate
(
Context
context
)
{
private
static
float
getDefaultDisplayRefreshRate
(
Context
context
)
{
WindowManager
manager
=
(
WindowManager
)
context
.
getSystemService
(
Context
.
WINDOW_SERVICE
);
WindowManager
manager
=
(
WindowManager
)
context
.
getSystemService
(
Context
.
WINDOW_SERVICE
);
return
manager
.
getDefaultDisplay
()
.
getRefreshRate
()
;
return
manager
.
getDefaultDisplay
()
!=
null
?
manager
.
getDefaultDisplay
().
getRefreshRate
()
:
0
f
;
}
}
/**
/**
...
...
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