Skip to content
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.

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

Psmf: Ignore last timestamp with old PsmfPlayer libs #6

Merged
merged 1 commit into from
Aug 16, 2016

Conversation

sum2012
Copy link

@sum2012 sum2012 commented Aug 15, 2016

Until 5.50
Fix hrydgard#6574

bool videoPtsEnd = (s64)psmfPlayerAvcAu.pts >= (s64)totalDurationTimestamp - VIDEO_FRAME_DURATION_TS;
// If we're out of video data and have no audio, it's over even if the pts isn't there yet.
return videoPtsEnd || (mediaengine->IsVideoEnd() && mediaengine->IsNoAudioData());
if (psmfPlayerLibVersion >= 0x05050010) {
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did some testing - this looks incorrect. I added it in hrydgard#6125, but I can't reproduce it now. I think that part may not have been carefully based on tests.

From my current testing, no version of firmware looks at the "last timestamp" value in the file. It always just waits until the end of the file.

I'm going to merge this, since it's basically right, but remove the if in a second commit.

-[Unknown]

@unknownbrackets unknownbrackets merged commit 4eca128 into unknownbrackets:psmf-size Aug 16, 2016
@sum2012 sum2012 deleted the psmf-size branch August 16, 2016 11:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants