Merge pull request #1248 from croneter/fix-transcoding-options
Fix high transcoding resolutions not being available for Win10
This commit is contained in:
commit
681179683f
2 changed files with 9 additions and 11 deletions
|
@ -265,19 +265,17 @@ def get_resolution():
|
||||||
"""
|
"""
|
||||||
chosen = utils.settings('transcoderVideoQualities')
|
chosen = utils.settings('transcoderVideoQualities')
|
||||||
res = {
|
res = {
|
||||||
'0': '420x420',
|
'0': '720x480',
|
||||||
'1': '576x320',
|
'1': '1024x768',
|
||||||
'2': '720x480',
|
'2': '1280x720',
|
||||||
'3': '1024x768',
|
'3': '1280x720',
|
||||||
'4': '1280x720',
|
'4': '1920x1080',
|
||||||
'5': '1280x720',
|
'5': '1920x1080',
|
||||||
'6': '1920x1080',
|
'6': '1920x1080',
|
||||||
'7': '1920x1080',
|
'7': '1920x1080',
|
||||||
'8': '1920x1080',
|
'8': '1920x1080',
|
||||||
'9': '1920x1080',
|
'9': '3840x2160',
|
||||||
'10': '1920x1080',
|
'10': '3840x2160'
|
||||||
'11': '3840x2160',
|
|
||||||
'12': '3840x2160'
|
|
||||||
}
|
}
|
||||||
return res[chosen]
|
return res[chosen]
|
||||||
|
|
||||||
|
|
|
@ -112,7 +112,7 @@
|
||||||
<setting id="resumeJumpBack" type="slider" label="30521" default="10" range="0,1,120" option="int" visible="false"/>
|
<setting id="resumeJumpBack" type="slider" label="30521" default="10" range="0,1,120" option="int" visible="false"/>
|
||||||
<setting type="sep" />
|
<setting type="sep" />
|
||||||
<setting id="playType" type="enum" label="30002" values="Try Direct Path|Direct Play|Direct Stream|Force Transcode" default="0" />
|
<setting id="playType" type="enum" label="30002" values="Try Direct Path|Direct Play|Direct Stream|Force Transcode" default="0" />
|
||||||
<setting id="transcoderVideoQualities" type="enum" label="30160" values="420x420, 320kbps|576x320, 720kbps|720x480, 1.5Mbps|1024x768, 2Mbps|720p, 3Mbps|720p, 4Mbps|1080p, 8Mbps|1080p, 10Mbps|1080p, 12Mbps|1080p, 20Mbps|1080p, 40Mbps|4K, 35Mbps|4K, 50Mbps" default="10" /><!-- Video Quality if Transcoding necessary -->
|
<setting id="transcoderVideoQualities" type="enum" label="30160" values="720x480, 1.5Mbps|1024x768, 2Mbps|720p, 3Mbps|720p, 4Mbps|1080p, 8Mbps|1080p, 10Mbps|1080p, 12Mbps|1080p, 20Mbps|1080p, 40Mbps|4K, 35Mbps|4K, 50Mbps" default="10" /><!-- Video Quality if Transcoding necessary -->
|
||||||
<setting id="auto_adjust_transcode_quality" label="30161" type="bool" default="false" /><!-- Auto-adjust transcoding quality (deactivate for Chromecast) -->
|
<setting id="auto_adjust_transcode_quality" label="30161" type="bool" default="false" /><!-- Auto-adjust transcoding quality (deactivate for Chromecast) -->
|
||||||
<setting id="maxVideoQualities" type="enum" label="30143" values="320kbps|720kbps|1.5Mbps|2Mbps|3Mbps|4Mbps|8Mbps|10Mbps|12Mbps|20Mbps|40Mbps|deactivated" default="11" /><!-- Always transcode if video bitrate is above -->
|
<setting id="maxVideoQualities" type="enum" label="30143" values="320kbps|720kbps|1.5Mbps|2Mbps|3Mbps|4Mbps|8Mbps|10Mbps|12Mbps|20Mbps|40Mbps|deactivated" default="11" /><!-- Always transcode if video bitrate is above -->
|
||||||
<setting id="transcodeH265" type="enum" label="30522" default="0" values="Disabled (default)|480p (and higher)|720p (and higher)|1080p (and higher)|4K" /><!-- Force transcode h265/HEVC -->
|
<setting id="transcodeH265" type="enum" label="30522" default="0" values="Disabled (default)|480p (and higher)|720p (and higher)|1080p (and higher)|4K" /><!-- Force transcode h265/HEVC -->
|
||||||
|
|
Loading…
Reference in a new issue