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.

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

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

Merged
merged 3 commits into from
May 5, 2021
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7792aeb
mod: Update lpms to livepeer/lpms@6e5c36f
yondonfu May 5, 2021
cb944d1
install_ffmpeg: Use livepeer/ffmpeg@1fdf06e
yondonfu May 5, 2021
09b6477
CHANGELOG_PENDING: Add entry for fps passthrough fix
yondonfu May 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG_PENDING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,5 @@
- \#1860 Discard low gas prices to prevent insufficient ticket faceValue errors (@kyriediculous)

#### Transcoder

- \#1862 Report the correct FPS in outputs when FPS passthrough is enabled for GPU transcoding (@jailuthra)
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ require (
github.com/jackpal/go-nat-pmp v1.0.1 // indirect
github.com/jaypipes/ghw v0.7.0
github.com/karalabe/usb v0.0.0-20190919080040-51dc0efba356 // indirect
github.com/livepeer/lpms v0.0.0-20210405233628-731af8d684c5
github.com/livepeer/lpms v0.0.0-20210505021749-6e5c36facc44
github.com/livepeer/m3u8 v0.11.1
github.com/mattn/go-colorable v0.1.2 // indirect
github.com/mattn/go-sqlite3 v1.11.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,8 +223,8 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/livepeer/joy4 v0.1.2-0.20191121080656-b2fea45cbded h1:ZQlvR5RB4nfT+cOQee+WqmaDOgGtP2oDMhcVvR4L0yA=
github.com/livepeer/joy4 v0.1.2-0.20191121080656-b2fea45cbded/go.mod h1:xkDdm+akniYxVT9KW1Y2Y7Hso6aW+rZObz3nrA9yTHw=
github.com/livepeer/lpms v0.0.0-20210405233628-731af8d684c5 h1:S1nPIefPjiwdrmkrjvQ7fXu+JfwGhI8zxdkeVPL4akI=
github.com/livepeer/lpms v0.0.0-20210405233628-731af8d684c5/go.mod h1:POdMzwnvPmf6UgRkaXGP/ZI7akrzHhzjCNygZej3gzc=
github.com/livepeer/lpms v0.0.0-20210505021749-6e5c36facc44 h1:mplEHprPN5ke24B9JEbDWkkNwH2vm7OSDDjbRSkHisk=
github.com/livepeer/lpms v0.0.0-20210505021749-6e5c36facc44/go.mod h1:POdMzwnvPmf6UgRkaXGP/ZI7akrzHhzjCNygZej3gzc=
github.com/livepeer/m3u8 v0.11.1 h1:VkUJzfNTyjy9mqsgp5JPvouwna8wGZMvd/gAfT5FinU=
github.com/livepeer/m3u8 v0.11.1/go.mod h1:IUqAtwWPAG2CblfQa4SVzTQoDcEMPyfNOaBSxqHMS04=
github.com/mattn/go-colorable v0.1.2 h1:/bC9yWikZXAL9uJdulbSfyVNIR3n3trXl+v8+1sx8mU=
Expand Down
2 changes: 1 addition & 1 deletion install_ffmpeg.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ fi
if [ ! -e "$HOME/ffmpeg/libavcodec/libavcodec.a" ]; then
git clone https://github.com/livepeer/ffmpeg.git "$HOME/ffmpeg" || echo "FFmpeg dir already exists"
cd "$HOME/ffmpeg"
git checkout 3ea705767720033754e8d85566460390191ae27d
git checkout 1fdf06e14239e1aaa9ddfb648fa374ca3cb1b269
./configure ${TARGET_OS:-} --fatal-warnings \
--disable-programs --disable-doc --disable-sdl2 --disable-iconv \
--disable-muxers --disable-demuxers --disable-parsers --disable-protocols \
Expand Down