milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #5056 from nyanmisaka/rockchip-rkmpp-hwa-web

Browse source
This commit is contained in:
Bill Thornton 2024-02-01 09:22:31 -05:00 • committed by GitHub
commit 389676de6e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/controllers/dashboard/encodingsettings.html
View file

@ -16,6 +16,7 @@
<option value="nvenc">Nvidia NVENC</option> <option value="nvenc">Nvidia NVENC</option>
<option value="qsv">Intel QuickSync (QSV)</option> <option value="qsv">Intel QuickSync (QSV)</option>
<option value="vaapi">Video Acceleration API (VAAPI)</option> <option value="vaapi">Video Acceleration API (VAAPI)</option>
<option value="rkmpp">Rockchip MPP (RKMPP)</option>
<option value="videotoolbox">Apple VideoToolBox</option> <option value="videotoolbox">Apple VideoToolBox</option>
<option value="v4l2m2m">Video4Linux2 (V4L2)</option> <option value="v4l2m2m">Video4Linux2 (V4L2)</option>
</select> </select>
@ -34,19 +35,23 @@
<h3 class="checkboxListLabel">${LabelEnableHardwareDecodingFor}</h3> <h3 class="checkboxListLabel">${LabelEnableHardwareDecodingFor}</h3>
<div class="checkboxList"> <div class="checkboxList">
<label> <label>
<input type="checkbox" is="emby-checkbox" class="chkDecodeCodec" data-codec="h264" data-types="amf,nvenc,qsv,vaapi,videotoolbox,v4l2m2m" /> <input type="checkbox" is="emby-checkbox" class="chkDecodeCodec" data-codec="h264" data-types="amf,nvenc,qsv,vaapi,rkmpp,videotoolbox,v4l2m2m" />
<span>H264</span> <span>H264</span>
</label> </label>
<label> <label>
<input type="checkbox" is="emby-checkbox" class="chkDecodeCodec" data-codec="hevc" data-types="amf,nvenc,qsv,vaapi,videotoolbox" /> <input type="checkbox" is="emby-checkbox" class="chkDecodeCodec" data-codec="hevc" data-types="amf,nvenc,qsv,vaapi,rkmpp,videotoolbox" />
<span>HEVC</span> <span>HEVC</span>
</label> </label>
<label> <label>
<input type="checkbox" is="emby-checkbox" class="chkDecodeCodec" data-codec="mpeg2video" data-types="amf,nvenc,qsv,vaapi,videotoolbox" /> <input type="checkbox" is="emby-checkbox" class="chkDecodeCodec" data-codec="mpeg1video" data-types="rkmpp" />
<span>MPEG1</span>
</label>
<label>
<input type="checkbox" is="emby-checkbox" class="chkDecodeCodec" data-codec="mpeg2video" data-types="amf,nvenc,qsv,vaapi,rkmpp,videotoolbox" />
<span>MPEG2</span> <span>MPEG2</span>
</label> </label>
<label> <label>
<input type="checkbox" is="emby-checkbox" class="chkDecodeCodec" data-codec="mpeg4" data-types="nvenc,videotoolbox" /> <input type="checkbox" is="emby-checkbox" class="chkDecodeCodec" data-codec="mpeg4" data-types="nvenc,rkmpp,videotoolbox" />
<span>MPEG4</span> <span>MPEG4</span>
</label> </label>
<label> <label>
@ -54,15 +59,15 @@
<span>VC1</span> <span>VC1</span>
</label> </label>
<label> <label>
<input type="checkbox" is="emby-checkbox" class="chkDecodeCodec" data-codec="vp8" data-types="nvenc,qsv,vaapi,videotoolbox" /> <input type="checkbox" is="emby-checkbox" class="chkDecodeCodec" data-codec="vp8" data-types="nvenc,qsv,vaapi,rkmpp,videotoolbox" />
<span>VP8</span> <span>VP8</span>
</label> </label>
<label> <label>
<input type="checkbox" is="emby-checkbox" class="chkDecodeCodec" data-codec="vp9" data-types="amf,nvenc,qsv,vaapi,videotoolbox" /> <input type="checkbox" is="emby-checkbox" class="chkDecodeCodec" data-codec="vp9" data-types="amf,nvenc,qsv,vaapi,rkmpp,videotoolbox" />
<span>VP9</span> <span>VP9</span>
</label> </label>
<label> <label>
<input type="checkbox" is="emby-checkbox" class="chkDecodeCodec" data-codec="av1" data-types="amf,nvenc,qsv,vaapi" /> <input type="checkbox" is="emby-checkbox" class="chkDecodeCodec" data-codec="av1" data-types="amf,nvenc,qsv,vaapi,rkmpp" />
<span>AV1</span> <span>AV1</span>
</label> </label>
</div> </div>

4
src/controllers/dashboard/encodingsettings.js
View file

@ -200,13 +200,13 @@ $(document).on('pageinit', '#encodingSettingsPage', function () {
page.querySelector('#txtVaapiDevice').removeAttribute('required'); page.querySelector('#txtVaapiDevice').removeAttribute('required');
} }
if (this.value == 'amf' || this.value == 'nvenc' || this.value == 'qsv' || this.value == 'vaapi' || this.value == 'videotoolbox') { if (this.value == 'amf' || this.value == 'nvenc' || this.value == 'qsv' || this.value == 'vaapi' || this.value == 'rkmpp' || this.value == 'videotoolbox') {
page.querySelector('.fld10bitHevcVp9HwDecoding').classList.remove('hide'); page.querySelector('.fld10bitHevcVp9HwDecoding').classList.remove('hide');
} else { } else {
page.querySelector('.fld10bitHevcVp9HwDecoding').classList.add('hide'); page.querySelector('.fld10bitHevcVp9HwDecoding').classList.add('hide');
} }
if (this.value == 'amf' || this.value == 'nvenc' || this.value == 'qsv' || this.value == 'vaapi') { if (this.value == 'amf' || this.value == 'nvenc' || this.value == 'qsv' || this.value == 'vaapi' || this.value == 'rkmpp') {
page.querySelector('.tonemappingOptions').classList.remove('hide'); page.querySelector('.tonemappingOptions').classList.remove('hide');
} else { } else {
page.querySelector('.tonemappingOptions').classList.add('hide'); page.querySelector('.tonemappingOptions').classList.add('hide');