diff options
Diffstat (limited to 'system')
| -rw-r--r-- | system/settings/android.xml | 14 | ||||
| -rw-r--r-- | system/settings/darwin_ios.xml | 9 | ||||
| -rw-r--r-- | system/settings/darwin_osx.xml | 9 | ||||
| -rw-r--r-- | system/settings/rbp.xml | 13 | ||||
| -rw-r--r-- | system/settings/settings.xml | 370 |
5 files changed, 240 insertions, 175 deletions
diff --git a/system/settings/android.xml b/system/settings/android.xml index 54d8f571b8..0aad89597c 100644 --- a/system/settings/android.xml +++ b/system/settings/android.xml @@ -8,10 +8,13 @@ </category> </section> <section id="videos"> - <category id="videoplayer"> - <group id="2"> - <setting id="videoplayer.usestagefright" type="boolean" label="13436" help="36260"> + <category id="videoacceleration"> + <group id="3"> + <setting id="videoplayer.usestagefright" type="boolean" parent="videoplayer.decodingmethod" label="13436" help="36260"> <requirement>HAVE_LIBSTAGEFRIGHTDECODER</requirement> + <dependencies> + <dependency type="enable" setting="videoplayer.decodingmethod" operator="is">1</dependency> + </dependencies> <level>2</level> <default>true</default> <updates> @@ -19,8 +22,11 @@ </updates> <control type="toggle" /> </setting> - <setting id="videoplayer.usemediacodec" type="boolean" label="13439" help="36544"> + <setting id="videoplayer.usemediacodec" type="boolean" parent="videoplayer.decodingmethod" label="13439" help="36544"> <visible>HAS_MEDIACODEC</visible> + <dependencies> + <dependency type="enable" setting="videoplayer.decodingmethod" operator="is">1</dependency> + </dependencies> <level>2</level> <default>true</default> <updates> diff --git a/system/settings/darwin_ios.xml b/system/settings/darwin_ios.xml index 1d67f9bb8c..af1b19dd1d 100644 --- a/system/settings/darwin_ios.xml +++ b/system/settings/darwin_ios.xml @@ -3,9 +3,6 @@ <section id="videos"> <category id="videoplayer"> <group id="2"> - <setting id="videoplayer.hqscalers"> - <visible>false</visible> - </setting> <setting id="videoplayer.adjustrefreshrate"> <visible>false</visible> </setting> @@ -14,6 +11,12 @@ </setting> </group> </category> + <category id="videoacceleration"> + <group id="1"> + <setting id="videoplayer.hqscalers"> + <visible>false</visible> + </setting> + </category> </section> <section id="music"> <category id="audiocds"> diff --git a/system/settings/darwin_osx.xml b/system/settings/darwin_osx.xml index aa1b414de1..0a772775a8 100644 --- a/system/settings/darwin_osx.xml +++ b/system/settings/darwin_osx.xml @@ -10,9 +10,12 @@ </category> </section> <section id="videos"> - <category id="videoplayer"> - <group id="2"> - <setting id="videoplayer.usevda" type="boolean" label="13429" help="36160"> + <category id="videoacceleration"> + <group id="3"> + <setting id="videoplayer.usevda" type="boolean" parent="videoplayer.decodingmethod" label="13429" help="36160"> + <dependencies> + <dependency type="enable" setting="videoplayer.decodingmethod" operator="is">1</dependency> + </dependencies> <level>2</level> <default>true</default> <control type="toggle" /> diff --git a/system/settings/rbp.xml b/system/settings/rbp.xml index 290d809cf9..6f5889f5c2 100644 --- a/system/settings/rbp.xml +++ b/system/settings/rbp.xml @@ -3,15 +3,16 @@ <section id="videos"> <category id="videoplayer"> <group id="2"> - <setting id="videoplayer.rendermethod"> - <visible>false</visible> - </setting> - <setting id="videoplayer.hqscalers"> - <visible>false</visible> - </setting> <setting id="videoplayer.synctype"> <visible>false</visible> </setting> + </group> + </category> + <category id="videoacceleration"> + <group id="1"> + <visible>false</visible> + </group> + <group id="3"> <setting id="videoplayer.useframemtdec"> <visible>false</visible> </setting> diff --git a/system/settings/settings.xml b/system/settings/settings.xml index f23094b3a6..2eb2e64e08 100644 --- a/system/settings/settings.xml +++ b/system/settings/settings.xml @@ -387,6 +387,126 @@ </setting> </group> <group id="2"> + <setting id="videoplayer.adjustrefreshrate" type="integer" label="170" help="36164"> + <level>2</level> + <default>0</default> <!-- ADJUST_REFRESHRATE_OFF --> + <constraints> + <options> + <option label="351">0</option> <!-- ADJUST_REFRESHRATE_OFF --> + <option label="36035">1</option> <!-- ADJUST_REFRESHRATE_ALWAYS --> + <option label="36036">2</option> <!-- ADJUST_REFRESHRATE_ON_STARTSTOP --> + </options> + </constraints> + <control type="spinner" format="string" /> + </setting> + <setting id="videoplayer.pauseafterrefreshchange" type="integer" parent="videoplayer.adjustrefreshrate" label="13550" help="36165"> + <level>2</level> + <default>0</default> + <constraints> + <options>refreshchangedelays</options> + </constraints> + <dependencies> + <dependency type="enable" setting="videoplayer.adjustrefreshrate" operator="!is">0</dependency> <!-- ADJUST_REFRESHRATE_OFF --> + </dependencies> + <control type="spinner" format="string" /> + </setting> + <setting id="videoplayer.usedisplayasclock" type="boolean" label="13510" help="36166"> + <level>2</level> + <default>false</default> + <control type="toggle" /> + </setting> + <setting id="videoplayer.synctype" type="integer" parent="videoplayer.usedisplayasclock" label="13500" help="36167"> + <level>2</level> + <default>2</default> <!-- SYNC_RESAMPLE --> + <constraints> + <options> + <option label="13501">0</option> <!-- SYNC_DISCON --> + <option label="13502">1</option> <!-- SYNC_SKIPDUP --> + <option label="13503">2</option> <!-- SYNC_RESAMPLE --> + </options> + </constraints> + <dependencies> + <dependency type="enable" setting="videoplayer.usedisplayasclock" operator="is">true</dependency> + </dependencies> + <control type="spinner" format="string" /> + </setting> + <setting id="videoplayer.maxspeedadjust" type="number" label="13504" help="36168"> + <level>4</level> + <default>5.0</default> + <constraints> + <minimum>0.0</minimum> + <step>0.1</step> + <maximum>10.0</maximum> + </constraints> + <dependencies> + <dependency type="enable"> + <and> + <condition setting="videoplayer.usedisplayasclock" operator="is">true</condition> + <condition setting="videoplayer.synctype" operator="is">2</condition> <!-- SYNC_RESAMPLE --> + </and> + </dependency> + </dependencies> + <control type="spinner" format="number" /> + </setting> + <setting id="videoplayer.errorinaspect" type="integer" label="22021" help="36170"> + <level>2</level> + <default>0</default> + <constraints> + <minimum label="231">0</minimum> + <step>1</step> + <maximum>20</maximum> + </constraints> + <control type="spinner" format="string"> + <formatlabel>14047</formatlabel> + </control> + </setting> + <setting id="videoplayer.stretch43" type="integer" label="173" help="36171"> + <level>1</level> + <default>0</default> <!-- ViewModeNormal --> + <constraints> + <options> + <option label="630">0</option> <!-- ViewModeNormal --> + <option label="633">3</option> <!-- ViewModeWideZoom --> + <option label="634">4</option> <!-- ViewModeStretch16x9 --> + <option label="631">1</option> <!-- ViewModeZoom --> + </options> + </constraints> + <control type="spinner" format="string" /> + </setting> + </group> + <group id="3"> + <setting id="videoplayer.teletextenabled" type="boolean" label="23050" help="36174"> + <level>1</level> + <default>true</default> + <control type="toggle" /> + </setting> + <setting id="videoplayer.teletextscale" type="boolean" label="23055" help="36175"> + <level>1</level> + <default>true</default> + <control type="toggle" /> + </setting> + </group> + <group id="4"> + <setting id="videoplayer.stereoscopicplaybackmode" type="integer" label="36520" help="36537"> + <level>2</level> + <default>0</default> + <constraints> + <options> + <option label="36521">0</option> <!-- ASK --> + <option label="36522">1</option> <!-- Preferred mode --> + </options> + </constraints> + <control type="spinner" format="integer" delayed="true"/> + </setting> + <setting id="videoplayer.quitstereomodeonstop" type="boolean" label="36526" help="36538"> + <level>2</level> + <default>true</default> + <control type="toggle" /> + </setting> + </group> + </category> + <category id="videoacceleration" label="14101" help="36430"> + <group id="1"> <setting id="videoplayer.rendermethod" type="integer" label="13415" help="36153"> <level>2</level> <default>0</default> <!-- RENDER_METHOD_AUTO --> @@ -395,7 +515,7 @@ </constraints> <control type="spinner" format="string" /> </setting> - <setting id="videoplayer.hqscalers" type="integer" label="13435" help="36154"> + <setting id="videoplayer.hqscalers" type="integer" parent="videoplayer.rendermethod" label="13435" help="36154"> <level>2</level> <default>0</default> <constraints> @@ -407,7 +527,53 @@ <formatlabel>14047</formatlabel> </control> </setting> - <setting id="videoplayer.useframemtdec" type="boolean" label="13440" help="36423"> + <setting id="videoplayer.usepbo" type="boolean" parent="videoplayer.rendermethod" label="13424" help="36163"> + <requirement>HAS_GL</requirement> + <dependencies> + <dependency type="enable" setting="videoplayer.rendermethod" operator="is">1</dependency> <!-- only supported with ARB --> + </dependencies> + <level>4</level> + <default>true</default> + <control type="toggle" /> + </setting> + </group> + <group id="2"> + <requirement> + <and> + <or> + <condition>HAS_GL</condition> + <condition>HAS_GLESv2</condition> + </or> + <condition>HAVE_LIBVDPAU</condition> + </and> + </requirement> + <setting id="videoplayer.vdpauUpscalingLevel" type="boolean" label="13121" help="36173"> + <level>4</level> + <default>false</default> + <control type="toggle" /> + </setting> + <setting id="videoplayer.vdpau_allow_xrandr" type="boolean" label="13122" help="36172"> + <level>4</level> + <default>false</default> + <control type="toggle" /> + </setting> + </group> + <group id="3"> + <setting id="videoplayer.decodingmethod" type="integer" label="13454" help="36431"> + <level>2</level> + <default>1</default> + <constraints> + <options> + <option label="13455">0</option> <!-- Software --> + <option label="13456">1</option> <!-- Hardware --> + </options> + </constraints> + <control type="spinner" format="integer" /> + </setting> + <setting id="videoplayer.useframemtdec" type="boolean" parent="videoplayer.decodingmethod" label="13440" help="36423"> + <dependencies> + <dependency type="enable" setting="videoplayer.decodingmethod" operator="is">0</dependency> + </dependencies> <level>2</level> <default>false</default> <control type="toggle" /> @@ -415,7 +581,7 @@ <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 --> + <dependency type="enable" setting="videoplayer.decodingmethod" operator="is">1</dependency> </dependencies> <level>2</level> <default>true</default> @@ -427,7 +593,7 @@ <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 --> + <dependency type="enable" setting="videoplayer.decodingmethod" operator="is">1</dependency> </dependencies> <level>2</level> <default>true</default> @@ -441,7 +607,7 @@ <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 --> + <condition setting="videoplayer.decodingmethod" operator="is">1</condition> </and> </dependency> </dependencies> @@ -452,7 +618,12 @@ <level>3</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.decodingmethod" operator="is">1</condition> + </and> + </dependency> <dependency type="visible" on="property" name="codecoptionvisible" setting="videoplayer.usevdpaumpeg2" operator="is">true</dependency> </dependencies> <control type="toggle" /> @@ -462,7 +633,12 @@ <level>3</level> <default>false</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.decodingmethod" operator="is">1</condition> + </and> + </dependency> <dependency type="visible" on="property" name="codecoptionvisible" setting="videoplayer.usevdpaumpeg4" operator="is">true</dependency> </dependencies> <control type="toggle" /> @@ -472,7 +648,12 @@ <level>3</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.decodingmethod" operator="is">1</condition> + </and> + </dependency> <dependency type="visible" on="property" name="codecoptionvisible" setting="videoplayer.usevdpauvc1" operator="is">true</dependency> </dependencies> <control type="toggle" /> @@ -480,7 +661,7 @@ <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 --> + <dependency type="enable" setting="videoplayer.decodingmethod" operator="is">1</dependency> </dependencies> <level>2</level> <default>true</default> @@ -489,7 +670,12 @@ <setting id="videoplayer.usevaapimpeg2" type="boolean" parent="videoplayer.usevaapi" label="13447" help="13448"> <requirement>HAVE_LIBVA</requirement> <dependencies> - <dependency type="visible" setting="videoplayer.usevaapi" operator="is">true</dependency> + <dependency type="enable"> + <and> + <condition setting="videoplayer.usevaapi" operator="is">true</condition> + <condition setting="videoplayer.decodingmethod" operator="is">1</condition> + </and> + </dependency> <dependency type="visible" on="property" name="codecoptionvisible" setting="videoplayer.usevaapimpeg2" operator="is">true</dependency> </dependencies> <level>3</level> @@ -499,7 +685,12 @@ <setting id="videoplayer.usevaapimpeg4" type="boolean" parent="videoplayer.usevaapi" label="13449" help="13450"> <requirement>HAVE_LIBVA</requirement> <dependencies> - <dependency type="visible" setting="videoplayer.usevaapi" operator="is">true</dependency> + <dependency type="enable"> + <and> + <condition setting="videoplayer.usevaapi" operator="is">true</condition> + <condition setting="videoplayer.decodingmethod" operator="is">1</condition> + </and> + </dependency> <dependency type="visible" on="property" name="codecoptionvisible" setting="videoplayer.usevaapimpeg4" operator="is">true</dependency> </dependencies> <level>3</level> @@ -509,7 +700,12 @@ <setting id="videoplayer.usevaapivc1" type="boolean" parent="videoplayer.usevaapi" label="13451" help="13452"> <requirement>HAVE_LIBVA</requirement> <dependencies> - <dependency type="visible" setting="videoplayer.usevaapi" operator="is">true</dependency> + <dependency type="enable"> + <and> + <condition setting="videoplayer.usevaapi" operator="is">true</condition> + <condition setting="videoplayer.decodingmethod" operator="is">1</condition> + </and> + </dependency> <dependency type="visible" on="property" name="codecoptionvisible" setting="videoplayer.usevaapivc1" operator="is">true</dependency> </dependencies> <level>3</level> @@ -519,7 +715,7 @@ <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 --> + <dependency type="enable" setting="videoplayer.decodingmethod" operator="is">1</dependency> </dependencies> <level>2</level> <default>true</default> @@ -528,7 +724,7 @@ <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 --> + <dependency type="enable" setting="videoplayer.decodingmethod" operator="is">1</dependency> </dependencies> <level>2</level> <default>true</default> @@ -537,7 +733,7 @@ <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 --> + <dependency type="enable" setting="videoplayer.decodingmethod" operator="is">1</dependency> </dependencies> <level>2</level> <default>true</default> @@ -549,150 +745,6 @@ <default>true</default> <control type="toggle" /> </setting> - <setting id="videoplayer.usepbo" type="boolean" label="13424" help="36163"> - <requirement>HAS_GL</requirement> - <level>4</level> - <default>true</default> - <control type="toggle" /> - </setting> - <setting id="videoplayer.adjustrefreshrate" type="integer" label="170" help="36164"> - <level>2</level> - <default>0</default> <!-- ADJUST_REFRESHRATE_OFF --> - <constraints> - <options> - <option label="351">0</option> <!-- ADJUST_REFRESHRATE_OFF --> - <option label="36035">1</option> <!-- ADJUST_REFRESHRATE_ALWAYS --> - <option label="36036">2</option> <!-- ADJUST_REFRESHRATE_ON_STARTSTOP --> - </options> - </constraints> - <control type="spinner" format="string" /> - </setting> - <setting id="videoplayer.pauseafterrefreshchange" type="integer" parent="videoplayer.adjustrefreshrate" label="13550" help="36165"> - <level>2</level> - <default>0</default> - <constraints> - <options>refreshchangedelays</options> - </constraints> - <dependencies> - <dependency type="enable" setting="videoplayer.adjustrefreshrate" operator="!is">0</dependency> <!-- ADJUST_REFRESHRATE_OFF --> - </dependencies> - <control type="spinner" format="string" /> - </setting> - <setting id="videoplayer.usedisplayasclock" type="boolean" label="13510" help="36166"> - <level>2</level> - <default>false</default> - <control type="toggle" /> - </setting> - <setting id="videoplayer.synctype" type="integer" parent="videoplayer.usedisplayasclock" label="13500" help="36167"> - <level>2</level> - <default>2</default> <!-- SYNC_RESAMPLE --> - <constraints> - <options> - <option label="13501">0</option> <!-- SYNC_DISCON --> - <option label="13502">1</option> <!-- SYNC_SKIPDUP --> - <option label="13503">2</option> <!-- SYNC_RESAMPLE --> - </options> - </constraints> - <dependencies> - <dependency type="enable" setting="videoplayer.usedisplayasclock" operator="is">true</dependency> - </dependencies> - <control type="spinner" format="string" /> - </setting> - <setting id="videoplayer.maxspeedadjust" type="number" label="13504" help="36168"> - <level>4</level> - <default>5.0</default> - <constraints> - <minimum>0.0</minimum> - <step>0.1</step> - <maximum>10.0</maximum> - </constraints> - <dependencies> - <dependency type="enable"> - <and> - <condition setting="videoplayer.usedisplayasclock" operator="is">true</condition> - <condition setting="videoplayer.synctype" operator="is">2</condition> <!-- SYNC_RESAMPLE --> - </and> - </dependency> - </dependencies> - <control type="spinner" format="number" /> - </setting> - <setting id="videoplayer.errorinaspect" type="integer" label="22021" help="36170"> - <level>2</level> - <default>0</default> - <constraints> - <minimum label="231">0</minimum> - <step>1</step> - <maximum>20</maximum> - </constraints> - <control type="spinner" format="string"> - <formatlabel>14047</formatlabel> - </control> - </setting> - <setting id="videoplayer.stretch43" type="integer" label="173" help="36171"> - <level>1</level> - <default>0</default> <!-- ViewModeNormal --> - <constraints> - <options> - <option label="630">0</option> <!-- ViewModeNormal --> - <option label="633">3</option> <!-- ViewModeWideZoom --> - <option label="634">4</option> <!-- ViewModeStretch16x9 --> - <option label="631">1</option> <!-- ViewModeZoom --> - </options> - </constraints> - <control type="spinner" format="string" /> - </setting> - <setting id="videoplayer.vdpau_allow_xrandr" type="boolean" label="13122" help="36172"> - <requirement>HAVE_LIBVDPAU</requirement> - <level>4</level> - <default>false</default> - <control type="toggle" /> - </setting> - </group> - <group id="3"> - <requirement> - <and> - <or> - <condition>HAS_GL</condition> - <condition>HAS_GLESv2</condition> - </or> - <condition>HAVE_LIBVDPAU</condition> - </and> - </requirement> - <setting id="videoplayer.vdpauUpscalingLevel" type="boolean" label="13121" help="36173"> - <level>4</level> - <default>false</default> - <control type="toggle" /> - </setting> - </group> - <group id="4"> - <setting id="videoplayer.teletextenabled" type="boolean" label="23050" help="36174"> - <level>1</level> - <default>true</default> - <control type="toggle" /> - </setting> - <setting id="videoplayer.teletextscale" type="boolean" label="23055" help="36175"> - <level>1</level> - <default>true</default> - <control type="toggle" /> - </setting> - </group> - <group id="5"> - <setting id="videoplayer.stereoscopicplaybackmode" type="integer" label="36520" help="36537"> - <level>2</level> - <default>0</default> - <constraints> - <options> - <option label="36521">0</option> <!-- ASK --> - <option label="36522">1</option> <!-- Preferred mode --> - </options> - </constraints> - <control type="spinner" format="integer" delayed="true"/> - </setting> - <setting id="videoplayer.quitstereomodeonstop" type="boolean" label="36526" help="36538"> - <level>2</level> - <default>true</default> - <control type="toggle" /> - </setting> </group> </category> <category id="myvideos" label="14081" help="36601"> |