Skip to content

Improve mOriginUs handling #200

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

Merged
merged 2 commits into from
Aug 11, 2024
Merged

Improve mOriginUs handling #200

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4da483
fix artifacts video
jumperson Jan 30, 2022
0bfb78c
Improve originUs
natario1 Aug 11, 2024
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
24 changes: 17 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 All @@ -88,6 +82,18 @@ public void initialize() {
} */
}

/**
* Some properties are better initialized lazily instead of during initialize().
* For example, the origin - very important to have a timebase before reads and seeks -
* requires the extractor tracks to be selected, which is not true in initialize.
* Selecting and unselecting all tracks is not correct either.
*/
private void initializeLazyProperties() {
if (mOriginUs == Long.MIN_VALUE) {
mOriginUs = mExtractor.getSampleTime();
}
}

@Override
public void deinitialize() {
LOG.i("deinitialize(): deinitializing...");
Expand Down Expand Up @@ -141,6 +147,8 @@ public void releaseTrack(@NonNull TrackType type) {

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

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 +201,8 @@ public boolean canReadTrack(@NonNull TrackType type) {

@Override
public void readTrack(@NonNull Chunk chunk) {
initializeLazyProperties();

int index = mExtractor.getSampleTrackIndex();

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

@Override
public long getPositionUs() {
if (!isInitialized()) return 0;
if (mOriginUs == Long.MIN_VALUE) return 0;

// Return the fastest track.
// This ensures linear behavior over time: if a track is behind the other,
Expand Down