Merge remote-tracking branch 'origin/master' into custom

This commit is contained in:
roytam1 2021-03-05 09:10:15 +08:00
commit 5f9cbf0b2f
4 changed files with 42 additions and 4 deletions

View file

@ -40,7 +40,15 @@
<preference id="media.mediasource.enabled" name="media.mediasource.enabled" type="bool"/>
<preference id="media.mediasource.mp4.enabled" name="media.mediasource.mp4.enabled" type="bool"/>
<preference id="media.mediasource.webm.enabled" name="media.mediasource.webm.enabled" type="bool"/>
<!-- Media formats -->
<preference id="media.av1.enabled" name="media.av1.enabled" type="bool"/>
<preference id="media.flac.enabled" name="media.flac.enabled" type="bool"/>
<preference id="media.mp4.enabled" name="media.mp4.enabled" type="bool"/>
<preference id="media.ogg.enabled" name="media.ogg.enabled" type="bool"/>
<preference id="media.opus.enabled" name="media.opus.enabled" type="bool"/>
<preference id="media.webm.enabled" name="media.webm.enabled" type="bool"/>
</preferences>
<script type="application/javascript" src="chrome://mozapps/content/preferences/fontbuilder.js"/>
@ -178,6 +186,24 @@
label="&videoMSEWebM.label;" accesskey="&videoMSEWebM.accesskey;"/>
</groupbox>
<!-- Media formats -->
<groupbox id="mediaSupport" align="start">
<caption label="&mediaSupport.label;"/>
<hbox align="center">
<label id="allowEnable" value="&allowEnable.label;"/>
#ifdef MOZ_FMP4
<checkbox id="enableMP4" label="&enableMP4.label;" preference="media.mp4.enabled"/>
#endif
<checkbox id="enableWebM" label="&enableWebM.label;" preference="media.webm.enabled"/>
#ifdef MOZ_AV1
<checkbox id="enableAV1" label="&enableAV1.label;" preference="media.av1.enabled"/>
#endif
<checkbox id="enableOGG" label="&enableOGG.label;" preference="media.ogg.enabled"/>
<checkbox id="enableOPUS" label="&enableOPUS.label;" preference="media.opus.enabled"/>
<checkbox id="enableFLAC" label="&enableFLAC.label;" preference="media.flac.enabled"/>
</hbox>
</groupbox>
</prefpane>
</overlay>

View file

@ -12,7 +12,7 @@ browser.jar:
* content/browser/preferences/colors.xul
* content/browser/preferences/cookies.xul
* content/browser/preferences/cookies.js
content/browser/preferences/content.xul
* content/browser/preferences/content.xul
content/browser/preferences/content.js
* content/browser/preferences/connection.xul
content/browser/preferences/connection.js

View file

@ -42,4 +42,16 @@
<!ENTITY videoMSEWebM.label "Enable MSE for WebM video">
<!ENTITY videoMSEWebM.accesskey "W">
<!ENTITY mediaSupport.label "Media Formats">
<!ENTITY allowEnable.label "Enable:">
#ifdef MOZ_FMP4
<!ENTITY enableMP4.label "MP4">
#endif
<!ENTITY enableWebM.label "WebM">
#ifdef MOZ_AV1
<!ENTITY enableAV1.label "AV1">
#endif
<!ENTITY enableOGG.label "Vorbis">
<!ENTITY enableOPUS.label "Opus">
<!ENTITY enableFLAC.label "Flac">

View file

@ -62,7 +62,7 @@
locale/browser/preferences/applicationManager.properties (%chrome/browser/preferences/applicationManager.properties)
locale/browser/preferences/colors.dtd (%chrome/browser/preferences/colors.dtd)
locale/browser/preferences/cookies.dtd (%chrome/browser/preferences/cookies.dtd)
locale/browser/preferences/content.dtd (%chrome/browser/preferences/content.dtd)
* locale/browser/preferences/content.dtd (%chrome/browser/preferences/content.dtd)
locale/browser/preferences/connection.dtd (%chrome/browser/preferences/connection.dtd)
locale/browser/preferences/applications.dtd (%chrome/browser/preferences/applications.dtd)
locale/browser/preferences/fonts.dtd (%chrome/browser/preferences/fonts.dtd)