diff options
| author | Peter Frühberger <Peter.Fruehberger@gmail.com> | 2014-01-20 12:37:58 -0800 |
|---|---|---|
| committer | Peter Frühberger <Peter.Fruehberger@gmail.com> | 2014-01-20 12:37:58 -0800 |
| commit | c0254bcbd25904b504c747ef9cb2259fdcfd7235 (patch) | |
| tree | ee7b3067ca4c73d44322ae250585bd0be8bdbd5e /system | |
| parent | c074af1c64dfe25f00a1b8202316f0e197f64d00 (diff) | |
| parent | 93eb4f8f073409e77513fd6b4d38654c3087e8ca (diff) | |
Merge pull request #3950 from fritsch/warning-text
Don't use hw decoders when doing multithreaded decoding
Diffstat (limited to 'system')
| -rw-r--r-- | system/settings/settings.xml | 35 |
1 files changed, 29 insertions, 6 deletions
diff --git a/system/settings/settings.xml b/system/settings/settings.xml index 2a1cb462db..aae8e51fae 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml @@ -415,8 +415,16 @@ <formatlabel>14047</formatlabel> </control> </setting> + <setting id="videoplayer.useframemtdec" type="boolean" label="13440" help="36423"> + <level>2</level> + <default>false</default> + <control type="toggle" /> + </setting> <setting id="videoplayer.useamcodec" type="boolean" label="13438" help="36422"> <requirement>HAVE_AMCODEC</requirement> + <dependencies> + <dependency type="enable" setting="videoplayer.useframemtdec" operator="is">false</dependency> <!-- disable when frame threading is active --> + </dependencies> <level>2</level> <default>true</default> <updates> @@ -426,6 +434,9 @@ </setting> <setting id="videoplayer.usevdpau" type="boolean" label="13425" help="36155"> <requirement>HAVE_LIBVDPAU</requirement> + <dependencies> + <dependency type="enable" setting="videoplayer.useframemtdec" operator="is">false</dependency> <!-- disable when frame threading is active --> + </dependencies> <level>2</level> <default>true</default> <control type="toggle" /> @@ -435,30 +446,47 @@ <level>2</level> <default>true</default> <dependencies> - <dependency type="enable" setting="videoplayer.usevdpau" operator="is">true</dependency> <!-- USE VDPAU --> + <dependency type="enable"> + <and> + <condition setting="videoplayer.usevdpau" operator="is">true</condition> <!-- USE VDPAU --> + <condition setting="videoplayer.useframemtdec" operator="is">false</condition> <!-- disable when frame threading is active --> + </and> + </dependency> </dependencies> <control type="toggle" /> </setting> <setting id="videoplayer.usevaapi" type="boolean" label="13426" help="36156"> <requirement>HAVE_LIBVA</requirement> + <dependencies> + <dependency type="enable" setting="videoplayer.useframemtdec" operator="is">false</dependency> <!-- disable when frame threading is active --> + </dependencies> <level>2</level> <default>true</default> <control type="toggle" /> </setting> <setting id="videoplayer.usedxva2" type="boolean" label="13427" help="36158"> <requirement>HasDXVA2</requirement> + <dependencies> + <dependency type="enable" setting="videoplayer.useframemtdec" operator="is">false</dependency> <!-- disable when frame threading is active --> + </dependencies> <level>2</level> <default>true</default> <control type="toggle" /> </setting> <setting id="videoplayer.usechd" type="boolean" label="13428" help="36159"> <requirement>HasCrystalHDDevice</requirement> + <dependencies> + <dependency type="enable" setting="videoplayer.useframemtdec" operator="is">false</dependency> <!-- disable when frame threading is active --> + </dependencies> <level>2</level> <default>true</default> <control type="toggle" /> </setting> <setting id="videoplayer.useomx" type="boolean" label="13430" help="36161"> <requirement>HAVE_LIBOPENMAX</requirement> + <dependencies> + <dependency type="enable" setting="videoplayer.useframemtdec" operator="is">false</dependency> <!-- disable when frame threading is active --> + </dependencies> <level>2</level> <default>true</default> <control type="toggle" /> @@ -475,11 +503,6 @@ <default>true</default> <control type="toggle" /> </setting> - <setting id="videoplayer.useframemtdec" type="boolean" label="13440" help="36423"> - <level>3</level> - <default>false</default> - <control type="toggle" /> - </setting> <setting id="videoplayer.adjustrefreshrate" type="integer" label="170" help="36164"> <level>2</level> <default>0</default> <!-- ADJUST_REFRESHRATE_OFF --> |