sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix handling of timestamps before play()

Browse source 
If the AudioTimestamp was sampled before play() was called, it was incorrectly
returned to the caller for sanity-checking. Fix this behavior by dropping the
timestamp internally in the AudioTimestampPoller.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=190584412
This commit is contained in:
andrewlewis 2018-03-27 01:18:05 -07:00 committed by Oliver Woodman
parent eb34a2a102
commit 6cb07adcee
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTimestampPoller.java
View file

@ -121,11 +121,15 @@ import java.lang.annotation.RetentionPolicy;
boolean updatedTimestamp = audioTimestamp.maybeUpdateTimestamp(); boolean updatedTimestamp = audioTimestamp.maybeUpdateTimestamp();
switch (state) { switch (state) {
case STATE_INITIALIZING: case STATE_INITIALIZING:
if (updatedTimestamp if (updatedTimestamp) {
&& audioTimestamp.getTimestampSystemTimeUs() >= initializeSystemTimeUs) { if (audioTimestamp.getTimestampSystemTimeUs() >= initializeSystemTimeUs) {
// We have an initial timestamp, but don't know if it's advancing yet. // We have an initial timestamp, but don't know if it's advancing yet.
initialTimestampPositionFrames = audioTimestamp.getTimestampPositionFrames(); initialTimestampPositionFrames = audioTimestamp.getTimestampPositionFrames();
updateState(STATE_TIMESTAMP); updateState(STATE_TIMESTAMP);
} else {
// Drop the timestamp, as it was sampled before the last reset.
updatedTimestamp = false;
}
} else if (systemTimeUs - initializeSystemTimeUs > INITIALIZING_DURATION_US) { } else if (systemTimeUs - initializeSystemTimeUs > INITIALIZING_DURATION_US) {
// We haven't received a timestamp for a while, so they probably aren't available for the // We haven't received a timestamp for a while, so they probably aren't available for the
// current audio route. Poll infrequently in case the route changes later. // current audio route. Poll infrequently in case the route changes later.