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: [Server] VCEEncC を 7.07 に更新し、 1080p-60fps サポートを追加 #18

Merged
merged 2 commits into from
Aug 24, 2022
Merged

Update: [Server] VCEEncC を 7.07 に更新し、 1080p-60fps サポートを追加 #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68c93ea
Update: [GitHub][workflows] VCEEncC を 7.07 に更新
rigaya Aug 24, 2022
6504085
Update: [Server] VCEEncC での 1080p-60fps サポートを追加
rigaya Aug 24, 2022
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
8 changes: 4 additions & 4 deletions .github/workflows/build_thirdparty.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ jobs:
curl -L -o thirdparty/NVEncC/License.txt https://raw.githubusercontent.com/rigaya/NVEnc/master/NVEnc_license.txt

# VCEEncC のアーカイブのダウンロード
curl -LO https://github.com/rigaya/VCEEnc/releases/download/7.05/VCEEncC_7.05_x64.7z
7z x -y -o"thirdparty/VCEEncC" VCEEncC_7.05_x64.7z
curl -LO https://github.com/rigaya/VCEEnc/releases/download/7.07/VCEEncC_7.07_x64.7z
7z x -y -o"thirdparty/VCEEncC" VCEEncC_7.07_x64.7z
rm thirdparty/VCEEncC/hdr10plus_gen.exe
mv thirdparty/VCEEncC/VCEEncC64.exe thirdparty/VCEEncC/VCEEncC.exe
curl -L -o thirdparty/VCEEncC/License.txt https://raw.githubusercontent.com/rigaya/VCEEnc/master/VCEEnc_license.txt
Expand Down Expand Up @@ -234,8 +234,8 @@ jobs:
curl -L -o thirdparty/NVEncC/License.txt https://raw.githubusercontent.com/rigaya/NVEnc/master/NVEnc_license.txt

# VCEEncC のアーカイブのダウンロード
curl -LO https://github.com/rigaya/VCEEnc/releases/download/7.05/vceencc_7.05_Ubuntu20.04_amd64.deb
7z x -y vceencc_7.05_Ubuntu20.04_amd64.deb && tar xvf data.tar
curl -LO https://github.com/rigaya/VCEEnc/releases/download/7.07/vceencc_7.07_Ubuntu20.04_amd64.deb
7z x -y vceencc_7.07_Ubuntu20.04_amd64.deb && tar xvf data.tar
mkdir thirdparty/VCEEncC/
cp usr/bin/vceencc thirdparty/VCEEncC/VCEEncC.elf
chmod a+x thirdparty/VCEEncC/VCEEncC.elf
Expand Down
8 changes: 6 additions & 2 deletions server/app/tasks/LiveEncodingTask.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,8 +224,12 @@ def buildHWEncCOptions(self, quality: QUALITY_TYPES, encoder_type: Literal['QSVE
# インターレース解除 (60i → 30p (30fps))
options.append('--vpp-deinterlace normal --avsync forcecfr --gop-len 60')
elif encoder_type == 'VCEEncC':
# VCEEncC では --vpp-deinterlace が使えないため、60i → 60p (60fps) へのインターレース解除ができない
options.append('--vpp-afs preset=default --avsync forcecfr --gop-len 60')
if quality == '1080p-60fps':
# インターレース解除 (60i → 60p (60fps))
options.append('--vpp-yadif mode=bob --avsync cfr --gop-len 120')
else:
# インターレース解除 (60i → 30p (30fps))
options.append('--vpp-afs preset=default --avsync forcecfr --gop-len 60')
## プリセット
if encoder_type == 'QSVEncC':
options.append('--quality balanced')
Expand Down