From 7792aebc3ebf0bff2d1e0886e4335fae0f2d3a1c Mon Sep 17 00:00:00 2001 From: Yondon Fu Date: Tue, 4 May 2021 22:25:59 -0400 Subject: [PATCH 1/3] mod: Update lpms to livepeer/lpms@6e5c36f --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index d3fcc309c8..85a5751862 100644 --- a/go.mod +++ b/go.mod @@ -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 diff --git a/go.sum b/go.sum index d6f954d83d..d7b94483d5 100644 --- a/go.sum +++ b/go.sum @@ -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= From cb944d1c87f4febcf7c6c83dcf8b625946921d4b Mon Sep 17 00:00:00 2001 From: Yondon Fu Date: Tue, 4 May 2021 22:22:43 -0400 Subject: [PATCH 2/3] install_ffmpeg: Use livepeer/ffmpeg@1fdf06e --- install_ffmpeg.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install_ffmpeg.sh b/install_ffmpeg.sh index c1fde2a1ad..371e0e6e24 100755 --- a/install_ffmpeg.sh +++ b/install_ffmpeg.sh @@ -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 \ From 09b6477a23a40514f9777fccfb35797b1eafa1c7 Mon Sep 17 00:00:00 2001 From: Yondon Fu Date: Tue, 4 May 2021 22:28:01 -0400 Subject: [PATCH 3/3] CHANGELOG_PENDING: Add entry for fps passthrough fix --- CHANGELOG_PENDING.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG_PENDING.md b/CHANGELOG_PENDING.md index ccc79f9476..21795f0e41 100644 --- a/CHANGELOG_PENDING.md +++ b/CHANGELOG_PENDING.md @@ -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) \ No newline at end of file