Skip to content

Initialize mOriginUs lazily #167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Initialize mOriginUs lazily #167

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
355e01d
fix artifacts video
jumperson Jan 30, 2022
0499b0f
Merge branch 'main' into fix/video-artifacts
jumperson Mar 16, 2022
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 16 additions & 7 deletions lib/src/main/java/com/otaliastudios/transcoder/source/DefaultDataSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,6 @@ public void initialize() {
}
}

// Fetch the start timestamp. Only way to do this is select tracks.
// This is very important to have a timebase e.g. for seeks that happen before any read.
for (int i = 0; i < mExtractor.getTrackCount(); i++) mExtractor.selectTrack(i);
mOriginUs = mExtractor.getSampleTime();
LOG.v("initialize(): found origin=" + mOriginUs);
for (int i = 0; i < mExtractor.getTrackCount(); i++) mExtractor.unselectTrack(i);
mInitialized = true;

// Debugging mOriginUs issues.
Expand Down Expand Up @@ -141,6 +135,8 @@ public void releaseTrack(@NonNull TrackType type) {

@Override
public long seekTo(long desiredPositionUs) {
initializeMOriginUsIfNotYet();

boolean hasVideo = mSelectedTracks.contains(TrackType.VIDEO);
boolean hasAudio = mSelectedTracks.contains(TrackType.AUDIO);
LOG.i("seekTo(): seeking to " + (mOriginUs + desiredPositionUs)
Expand Down Expand Up @@ -193,6 +189,9 @@ public boolean canReadTrack(@NonNull TrackType type) {

@Override
public void readTrack(@NonNull Chunk chunk) {
// Must be called if not to seek.
initializeMOriginUsIfNotYet();

int index = mExtractor.getSampleTrackIndex();

int position = chunk.buffer.position();
Expand Down Expand Up @@ -236,7 +235,7 @@ public void readTrack(@NonNull Chunk chunk) {

@Override
public long getPositionUs() {
if (!isInitialized()) return 0;
if (!isInitializedOriginUs()) return 0;

// Return the fastest track.
// This ensures linear behavior over time: if a track is behind the other,
Expand Down Expand Up @@ -289,4 +288,14 @@ public MediaFormat getTrackFormat(@NonNull TrackType type) {
LOG.i("getTrackFormat(" + type + ")");
return mFormat.getOrNull(type);
}

private boolean isInitializedOriginUs() {
return mOriginUs != Long.MIN_VALUE;
}

private void initializeMOriginUsIfNotYet() {
if (!isInitializedOriginUs()) {
mOriginUs = mExtractor.getSampleTime();
}
}
}