Refactor MPEG2 profiles a bit

4 files changed, 164 insertions, 284 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index 640fa9e..366cdea 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -12,6 +12,7 @@ dlnaprofiles = mp3.xml \
 	       avc.xml \
 	       mpeg-ts.xml \
 	       mpeg-ps.xml \
+	       mpeg-common.xml \
 	       mpeg4.xml \
 	       jpeg.xml \
 	       png.xml
diff --git a/data/mpeg-common.xml b/data/mpeg-common.xml
new file mode 100644
index 0000000..3c98a02
--- /dev/null
+++ b/data/mpeg-common.xml
@@ -0,0 +1,158 @@
+<?xml version="1.0"?>
+
+<dlna-profiles>
+  <include ref="common.xml" />
+
+  <restrictions>
+    <!-- SD resolutions -->
+    <!-- NA region -->
+    <restriction id="720x480" type="video">
+      <parent name="525_D1" />
+      <field name="framerate" type="fraction">
+        <value>30000/1001</value>
+      </field>
+      <field name="pixel-aspect-ratio" type="fraction" used="in-strict">
+        <value>32/27</value>
+        <value>8/9</value>
+      </field>
+    </restriction>
+
+    <restriction id="704x480" type="video">
+      <parent name="525_4SIF" />
+      <field name="framerate" type="fraction">
+        <value>24000/1001</value> <!-- Note: only valid for interlaced=false -->
+        <value>24/1</value>
+        <value>30000/1001</value>
+        <value>30/1</value>
+        <value>60000/1001</value> <!-- Note: only valid for interlaced=false -->
+        <value>60/1</value> <!-- Note: only valid for interlaced=false -->
+      </field>
+      <field name="pixel-aspect-ratio" type="fraction" used="in-strict">
+        <value>40/33</value>
+        <value>10/11</value>
+      </field>
+    </restriction>
+
+    <restriction id="640x480" type="video">
+      <parent name="VGA" />
+      <field name="framerate" type="fraction">
+        <value>24000/1001</value> <!-- Note: only valid for interlaced=false -->
+        <value>24/1</value>
+        <value>30000/1001</value>
+        <value>30/1</value>
+        <value>60000/1001</value> <!-- Note: only valid for interlaced=false -->
+        <value>60/1</value> <!-- Note: only valid for interlaced=false -->
+      </field>
+      <field name="pixel-aspect-ratio" type="fraction" used="in-strict">
+        <value>1/1</value>
+        <value>4/3</value>
+      </field>
+    </restriction>
+
+    <restriction id="544x480" type="video">
+      <parent name="525_3/4D1" />
+      <field name="framerate" type="fraction">
+        <value>30000/1001</value>
+      </field>
+      <field name="pixel-aspect-ratio" type="fraction" used="in-strict">
+        <value>80/51</value>
+        <value>20/17</value>
+      </field>
+    </restriction>
+
+    <restriction id="480x480" type="video">
+      <parent name="525_2/3D1" />
+      <field name="framerate" type="fraction">
+        <value>30000/1001</value>
+      </field>
+      <field name="pixel-aspect-ratio" type="fraction" used="in-strict">
+        <value>16/9</value>
+        <value>4/3</value>
+      </field>
+    </restriction>
+
+    <restriction id="352x480" type="video">
+      <parent name="525_1/2D1" />
+      <field name="framerate" type="fraction">
+        <value>30000/1001</value>
+      </field>
+      <field name="pixel-aspect-ratio" type="fraction" used="in-strict">
+        <value>80/33</value>
+        <value>20/11</value>
+      </field>
+    </restriction>
+
+    <restriction id="352x240" type="video">
+      <parent name="525SIF" />
+      <field name="framerate" type="fraction">
+        <value>30000/1001</value>
+      </field>
+      <field name="pixel-aspect-ratio" type="fraction" used="in-strict">
+        <value>16/11</value>
+        <value>12/11</value>
+      </field>
+    </restriction>
+
+
+    <!-- EU region -->
+    <restriction id="EU_FPS" type="video">
+      <field name="framerate" type="fraction">
+        <value>25/1</value>
+      </field>
+    </restriction>
+
+    <restriction id="720x576" type="video">
+      <parent name="625_D1" />
+      <parent name="EU_FPS" />
+      <field name="pixel-aspect-ratio" type="fraction" used="in-strict">
+        <value>64/45</value>
+        <value>16/15</value>
+      </field>
+    </restriction>
+
+    <restriction id="704x576" type="video">
+      <parent name="625_4SIF" />
+      <parent name="EU_FPS" />
+      <field name="pixel-aspect-ratio" type="fraction" used="in-strict">
+        <value>64/45</value>
+        <value>16/15</value>
+      </field>
+    </restriction>
+
+    <restriction id="544x576" type="video">
+      <parent name="625_3/4D1" />
+      <parent name="EU_FPS" />
+      <field name="pixel-aspect-ratio" type="fraction" used="in-strict">
+        <value>32/17</value>
+        <value>24/17</value>
+      </field>
+    </restriction>
+
+    <restriction id="480x576" type="video">
+      <parent name="625_2/3D1" />
+      <parent name="EU_FPS" />
+      <field name="pixel-aspect-ratio" type="fraction" used="in-strict">
+        <value>32/15</value>
+        <value>8/5</value>
+      </field>
+    </restriction>
+
+    <restriction id="352x576" type="video">
+      <parent name="625_1/2D1" />
+      <parent name="EU_FPS" />
+      <field name="pixel-aspect-ratio" type="fraction" used="in-strict">
+        <value>32/11</value>
+        <value>24/11</value>
+      </field>
+    </restriction>
+
+    <restriction id="352x288" type="video">
+      <parent name="CIF" />
+      <parent name="EU_FPS" />
+      <field name="pixel-aspect-ratio" type="fraction" used="in-strict">
+        <value>16/11</value>
+        <value>12/11</value>
+      </field>
+    </restriction>
+ </restrictions>
+</dlna-profiles>
diff --git a/data/mpeg-ps.xml b/data/mpeg-ps.xml
index c6c2f8f..266e915 100644
--- a/data/mpeg-ps.xml
+++ b/data/mpeg-ps.xml
@@ -2,6 +2,7 @@
 
 <dlna-profiles>
   <include ref="common.xml" />
+  <include ref="mpeg-common.xml" />
 
   <restrictions>
     <restriction id="MPEG_PS" type="container">
@@ -39,157 +40,6 @@
       </field>
     </restriction>
 
-    <!-- SD resolutions -->
-    <!-- NA region -->
-    <restriction id="720x480" type="video">
-      <parent name="525_D1" />
-      <field name="framerate" type="fraction">
-        <value>30000/1001</value>
-      </field>
-      <field name="pixel-aspect-ratio" type="fraction" used="in-strict">
-        <value>32/27</value>
-        <value>8/9</value>
-      </field>
-    </restriction>
-
-    <restriction id="704x480" type="video">
-      <parent name="525_4SIF" />
-      <field name="framerate" type="fraction">
-        <value>24000/1001</value> <!-- Note: only valid for interlaced=false -->
-        <value>24/1</value>
-        <value>30000/1001</value>
-        <value>30/1</value>
-        <value>60000/1001</value> <!-- Note: only valid for interlaced=false -->
-        <value>60/1</value> <!-- Note: only valid for interlaced=false -->
-      </field>
-      <field name="pixel-aspect-ratio" type="fraction" used="in-strict">
-        <value>40/33</value>
-        <value>10/11</value>
-      </field>
-    </restriction>
-
-    <restriction id="640x480" type="video">
-      <parent name="VGA" />
-      <field name="framerate" type="fraction">
-        <value>24000/1001</value> <!-- Note: only valid for interlaced=false -->
-        <value>24/1</value>
-        <value>30000/1001</value>
-        <value>30/1</value>
-        <value>60000/1001</value> <!-- Note: only valid for interlaced=false -->
-        <value>60/1</value> <!-- Note: only valid for interlaced=false -->
-      </field>
-      <field name="pixel-aspect-ratio" type="fraction" used="in-strict">
-        <value>1/1</value>
-        <value>4/3</value>
-      </field>
-    </restriction>
-
-    <restriction id="544x480" type="video">
-      <parent name="525_3/4D1" />
-      <field name="framerate" type="fraction">
-        <value>30000/1001</value>
-      </field>
-      <field name="pixel-aspect-ratio" type="fraction" used="in-strict">
-        <value>80/51</value>
-        <value>20/17</value>
-      </field>
-    </restriction>
-
-    <restriction id="480x480" type="video">
-      <parent name="525_2/3D1" />
-      <field name="framerate" type="fraction">
-        <value>30000/1001</value>
-      </field>
-      <field name="pixel-aspect-ratio" type="fraction" used="in-strict">
-        <value>16/9</value>
-        <value>4/3</value>
-      </field>
-    </restriction>
-
-    <restriction id="352x480" type="video">
-      <parent name="525_1/2D1" />
-      <field name="framerate" type="fraction">
-        <value>30000/1001</value>
-      </field>
-      <field name="pixel-aspect-ratio" type="fraction" used="in-strict">
-        <value>80/33</value>
-        <value>20/11</value>
-      </field>
-    </restriction>
-
-    <restriction id="352x240" type="video">
-      <parent name="525SIF" />
-      <field name="framerate" type="fraction">
-        <value>30000/1001</value>
-      </field>
-      <field name="pixel-aspect-ratio" type="fraction" used="in-strict">
-        <value>16/11</value>
-        <value>12/11</value>
-      </field>
-    </restriction>
-
-
-    <!-- EU region -->
-    <restriction id="EU_FPS" type="video">
-      <field name="framerate" type="fraction">
-        <value>25/1</value>
-      </field>
-    </restriction>
-
-    <restriction id="720x576" type="video">
-      <parent name="625_D1" />
-      <parent name="EU_FPS" />
-      <field name="pixel-aspect-ratio" type="fraction" used="in-strict">
-        <value>64/45</value>
-        <value>16/15</value>
-      </field>
-    </restriction>
-
-    <restriction id="704x576" type="video">
-      <parent name="625_4SIF" />
-      <parent name="EU_FPS" />
-      <field name="pixel-aspect-ratio" type="fraction" used="in-strict">
-        <value>64/45</value>
-        <value>16/15</value>
-      </field>
-    </restriction>
-
-    <restriction id="544x576" type="video">
-      <parent name="625_3/4D1" />
-      <parent name="EU_FPS" />
-      <field name="pixel-aspect-ratio" type="fraction" used="in-strict">
-        <value>32/17</value>
-        <value>24/17</value>
-      </field>
-    </restriction>
-
-    <restriction id="480x576" type="video">
-      <parent name="625_2/3D1" />
-      <parent name="EU_FPS" />
-      <field name="pixel-aspect-ratio" type="fraction" used="in-strict">
-        <value>32/15</value>
-        <value>8/5</value>
-      </field>
-    </restriction>
-
-    <restriction id="352x576" type="video">
-      <parent name="625_1/2D1" />
-      <parent name="EU_FPS" />
-      <field name="pixel-aspect-ratio" type="fraction" used="in-strict">
-        <value>32/11</value>
-        <value>24/11</value>
-      </field>
-    </restriction>
-
-    <restriction id="352x288" type="video">
-      <parent name="CIF" />
-      <parent name="EU_FPS" />
-      <field name="pixel-aspect-ratio" type="fraction" used="in-strict">
-        <value>16/11</value>
-        <value>12/11</value>
-      </field>
-    </restriction>
-
     <restriction id="MPEG_PS_AUDIO" type="audio">
       <field name="rate" type="int">
         <value>48000</value>
diff --git a/data/mpeg-ts.xml b/data/mpeg-ts.xml
index 4fc81aa..ab0b549 100644
--- a/data/mpeg-ts.xml
+++ b/data/mpeg-ts.xml
@@ -2,6 +2,7 @@
 
 <dlna-profiles>
   <include ref="common.xml" />
+  <include ref="mpeg-common.xml" />
 
   <restrictions>
     <restriction id="MPEG_TS_ISO" type="container">
@@ -83,136 +84,6 @@
       </field>
     </restriction>
 
-    <!-- SD resolutions -->
-    <!-- NA region -->
-    <restriction id="720x480" type="video">
-      <parent name="525_D1" />
-      <field name="framerate" type="fraction">
-        <value>30000/1001</value>
-      </field>
-      <field name="pixel-aspect-ratio" type="fraction" used="in-strict">
-        <value>32/27</value>
-        <value>8/9</value>
-      </field>
-    </restriction>
-
-    <restriction id="704x480" type="video">
-      <parent name="525_4SIF" />
-      <field name="framerate" type="fraction">
-        <value>24000/1001</value> <!-- Note: only valid for interlaced=false -->
-        <value>24/1</value>
-        <value>30000/1001</value>
-        <value>30/1</value>
-        <value>60000/1001</value> <!-- Note: only valid for interlaced=false -->
-        <value>60/1</value> <!-- Note: only valid for interlaced=false -->
-      </field>
-      <field name="pixel-aspect-ratio" type="fraction" used="in-strict">
-        <value>40/33</value>
-        <value>10/11</value>
-      </field>
-    </restriction>
-
-    <restriction id="640x480" type="video">
-      <parent name="VGA" />
-      <field name="framerate" type="fraction">
-        <value>24000/1001</value> <!-- Note: only valid for interlaced=false -->
-        <value>24/1</value>
-        <value>30000/1001</value>
-        <value>30/1</value>
-        <value>60000/1001</value> <!-- Note: only valid for interlaced=false -->
-        <value>60/1</value> <!-- Note: only valid for interlaced=false -->
-      </field>
-      <field name="pixel-aspect-ratio" type="fraction" used="in-strict">
-        <value>1/1</value>
-        <value>4/3</value>
-      </field>
-    </restriction>
-
-    <restriction id="544x480" type="video">
-      <parent name="525_3/4D1" />
-      <field name="framerate" type="fraction">
-        <value>30000/1001</value>
-      </field>
-      <field name="pixel-aspect-ratio" type="fraction" used="in-strict">
-        <value>80/51</value>
-        <value>20/17</value>
-      </field>
-    </restriction>
-
-    <restriction id="480x480" type="video">
-      <parent name="525_2/3D1" />
-      <field name="framerate" type="fraction">
-        <value>30000/1001</value>
-      </field>
-      <field name="pixel-aspect-ratio" type="fraction" used="in-strict">
-        <value>16/9</value>
-        <value>4/3</value>
-      </field>
-    </restriction>
-
-    <restriction id="352x480" type="video">
-      <parent name="525_1/2D1" />
-      <field name="framerate" type="fraction">
-        <value>30000/1001</value>
-      </field>
-      <field name="pixel-aspect-ratio" type="fraction" used="in-strict">
-        <value>80/33</value>
-        <value>20/11</value>
-      </field>
-    </restriction>
-
-    <!-- EU region -->
-    <restriction id="EU_FPS" type="video">
-      <field name="framerate" type="fraction">
-        <value>25/1</value>
-      </field>
-    </restriction>
-
-    <restriction id="720x576" type="video">
-      <parent name="625_D1" />
-      <parent name="EU_FPS" />
-      <field name="pixel-aspect-ratio" type="fraction" used="in-strict">
-        <value>64/45</value>
-        <value>16/15</value>
-      </field>
-    </restriction>
-
-    <restriction id="544x576" type="video">
-      <parent name="625_3/4D1" />
-      <parent name="EU_FPS" />
-      <field name="pixel-aspect-ratio" type="fraction" used="in-strict">
-        <value>32/17</value>
-        <value>24/17</value>
-      </field>
-    </restriction>
-
-    <restriction id="480x576" type="video">
-      <parent name="625_2/3D1" />
-      <parent name="EU_FPS" />
-      <field name="pixel-aspect-ratio" type="fraction" used="in-strict">
-        <value>32/15</value>
-        <value>8/5</value>
-      </field>
-    </restriction>
-
-    <restriction id="352x576" type="video">
-      <parent name="625_1/2D1" />
-      <parent name="EU_FPS" />
-      <field name="pixel-aspect-ratio" type="fraction" used="in-strict">
-        <value>32/11</value>
-        <value>24/11</value>
-      </field>
-    </restriction>
-
-    <restriction id="352x288" type="video">
-      <parent name="CIF" />
-      <parent name="EU_FPS" />
-      <field name="pixel-aspect-ratio" type="fraction" used="in-strict">
-        <value>16/11</value>
-        <value>12/11</value>
-      </field>
-    </restriction>
-
     <!-- HD resolutions -->
     <restriction id="MPEG_TS_1920x1080" type="video">
       <parent name="1920x1080" />
@@ -288,7 +159,7 @@
       <parent name="MPEG_TS_AUDIO" />
 
       <field name="name" type="string">
-	<value>audio/x-ac3</value>
+        <value>audio/x-ac3</value>
       </field>
     </restriction>
 
@@ -296,7 +167,7 @@
       <parent name="MPEG_TS_AUDIO" />
 
       <field name="name" type="string">
-	<value>audio/x-private1-ac3</value>
+        <value>audio/x-private1-ac3</value>
       </field>
     </restriction>
 
@@ -304,7 +175,7 @@
       <parent name="MPEG_TS_AUDIO" />
 
       <field name="name" type="string">
-	<value>audio/ac3</value>
+        <value>audio/ac3</value>
       </field>
     </restriction>