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

Update LPMS and use livepeer's custom FFmpeg fork #1862

Merged
merged 3 commits into from
May 5, 2021
Merged

Conversation

jailuthra
Copy link
Contributor

@jailuthra jailuthra commented Apr 30, 2021

What does this pull request do? Explain your changes. (required)

See title

Specific updates (required)

See commits

How did you test each of these updates (required)

Does this pull request close any open issues?

Fixes livepeer/lpms#232

Checklist:

@jailuthra jailuthra changed the title mod: Update lpms to https://github.com/livepeer/lpms/commit/26da1168d… Update LPMS and use livepeer's custom FFmpeg fork May 4, 2021
@jailuthra jailuthra requested a review from yondonfu May 4, 2021 22:20
@jailuthra jailuthra marked this pull request as ready for review May 4, 2021 22:22
iameli
iameli previously requested changes May 4, 2021
install_ffmpeg.sh Show resolved Hide resolved
@yondonfu
Copy link
Member

yondonfu commented May 5, 2021

Pushed the following commits:

7792aeb to update the go mod files to point to the latest commit on LPMS master (with livepeer/lpms#229 merged)

cb944d1 to update install_ffmpeg.sh to point to the latest commit in livepeer/ffmpeg (with livepeer/FFmpeg#2 merged)

09b6477 to update CHANGELOG_PENDING with an entry for this PR (and the credit to @jailuthra for authoring everything)

Copy link
Member

@yondonfu yondonfu left a comment

Choose a reason for hiding this comment

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

Tested that passthrough FPS and non-passthrough FPS both work - LGTM

@yondonfu yondonfu dismissed iameli’s stale review May 5, 2021 03:08

Resolved by pointing to commit hash in install_ffmpeg.sh

@yondonfu yondonfu merged commit 1e5154a into master May 5, 2021
@yondonfu yondonfu deleted the jai/streamfps branch May 5, 2021 03:09
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.

Wrong fps reported in output segments when passthrough enabled
3 participants