From 650abe2cb9eb02c14369a807a6225ebb053d0b17 Mon Sep 17 00:00:00 2001
From: Moonchild <moonchild@palemoon.org>
Date: Thu, 4 Mar 2021 10:57:15 +0000
Subject: [PATCH] [Pale-Moon] Issue #1862 - Add media format controls in
 Preferences -> Content

---
 .../components/preferences/content.xul        | 28 ++++++++++++++++++-
 .../palemoon/components/preferences/jar.mn    |  2 +-
 .../chrome/browser/preferences/content.dtd    | 12 ++++++++
 application/palemoon/locales/jar.mn           |  2 +-
 4 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/application/palemoon/components/preferences/content.xul b/application/palemoon/components/preferences/content.xul
index 19a6c34ab8..21f9e5d81a 100644
--- a/application/palemoon/components/preferences/content.xul
+++ b/application/palemoon/components/preferences/content.xul
@@ -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>
diff --git a/application/palemoon/components/preferences/jar.mn b/application/palemoon/components/preferences/jar.mn
index 6e143dea39..7e8ac3bc8a 100644
--- a/application/palemoon/components/preferences/jar.mn
+++ b/application/palemoon/components/preferences/jar.mn
@@ -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
diff --git a/application/palemoon/locales/en-US/chrome/browser/preferences/content.dtd b/application/palemoon/locales/en-US/chrome/browser/preferences/content.dtd
index bed982bc37..8c1908f4d2 100644
--- a/application/palemoon/locales/en-US/chrome/browser/preferences/content.dtd
+++ b/application/palemoon/locales/en-US/chrome/browser/preferences/content.dtd
@@ -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">
diff --git a/application/palemoon/locales/jar.mn b/application/palemoon/locales/jar.mn
index 5fcee246e9..26cc88735a 100644
--- a/application/palemoon/locales/jar.mn
+++ b/application/palemoon/locales/jar.mn
@@ -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)