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

Remove incorrect AudioTrack timestamp adjustment.

Browse source 
This is just wrong. I think there used to be an off-by-one
timestamp error in YouTube's fmp4 streams, and this code
was initially designed exclusively to play such streams. I
don't see this issue any more though, if it was ever there!
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=120447694
This commit is contained in:
olly 2016-04-21 08:50:24 -07:00 committed by Oliver Woodman
parent e390bdf98c
commit b1de997388
1 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
library/src/main/java/com/google/android/exoplayer/audio/AudioTrack.java
View file

@ -579,26 +579,23 @@ public final class AudioTrack {
// If this is the first encoded sample, calculate the sample size in frames. // If this is the first encoded sample, calculate the sample size in frames.
framesPerEncodedSample = getFramesPerEncodedSample(encoding, buffer); framesPerEncodedSample = getFramesPerEncodedSample(encoding, buffer);
} }
long frames = passthrough ? framesPerEncodedSample : pcmBytesToFrames(size);
long bufferDurationUs = framesToDurationUs(frames);
// Note: presentationTimeUs corresponds to the end of the sample, not the start.
long bufferStartTime = presentationTimeUs - bufferDurationUs;
if (startMediaTimeState == START_NOT_SET) { if (startMediaTimeState == START_NOT_SET) {
startMediaTimeUs = Math.max(0, bufferStartTime); startMediaTimeUs = Math.max(0, presentationTimeUs);
startMediaTimeState = START_IN_SYNC; startMediaTimeState = START_IN_SYNC;
} else { } else {
// Sanity check that bufferStartTime is consistent with the expected value. // Sanity check that presentationTimeUs is consistent with the expected value.
long expectedBufferStartTime = startMediaTimeUs + framesToDurationUs(getSubmittedFrames()); long expectedPresentationTimeUs = startMediaTimeUs
+ framesToDurationUs(getSubmittedFrames());
if (startMediaTimeState == START_IN_SYNC if (startMediaTimeState == START_IN_SYNC
&& Math.abs(expectedBufferStartTime - bufferStartTime) > 200000) { && Math.abs(expectedPresentationTimeUs - presentationTimeUs) > 200000) {
Log.e(TAG, "Discontinuity detected [expected " + expectedBufferStartTime + ", got " Log.e(TAG, "Discontinuity detected [expected " + expectedPresentationTimeUs + ", got "
+ bufferStartTime + "]"); + presentationTimeUs + "]");
startMediaTimeState = START_NEED_SYNC; startMediaTimeState = START_NEED_SYNC;
} }
if (startMediaTimeState == START_NEED_SYNC) { if (startMediaTimeState == START_NEED_SYNC) {
// Adjust startMediaTimeUs to be consistent with the current buffer's start time and the // Adjust startMediaTimeUs to be consistent with the current buffer's start time and the
// number of bytes submitted. // number of bytes submitted.
startMediaTimeUs += (bufferStartTime - expectedBufferStartTime); startMediaTimeUs += (presentationTimeUs - expectedPresentationTimeUs);
startMediaTimeState = START_IN_SYNC; startMediaTimeState = START_IN_SYNC;
result |= RESULT_POSITION_DISCONTINUITY; result |= RESULT_POSITION_DISCONTINUITY;
} }