xml: Add the AVC_MP4_BL_L3(L)_SD_AAC profiles

2 files changed, 142 insertions, 18 deletions

diff --git a/data/avc.xml b/data/avc.xml
index 909619d..5e34f17 100644
--- a/data/avc.xml
+++ b/data/avc.xml
@@ -12,7 +12,15 @@
       </field>
     </restriction>
 
-    <restriction id="AVC_BL" type="video">
+    <restriction id="AVC_BL_L3_AAC" type="audio">
+      <parent name="AAC" />
+
+      <field name="bitrate" type="int">
+        <range min="1" max="256000" />
+      </field>
+    </restriction>
+
+    <restriction id="AVC_BL_C" type="video">
       <field name="name" type="string">
         <value>video/x-h264</value>
       </field>
@@ -24,23 +32,6 @@
       <field name="format" type="fourcc">
         <value>I420</value>
       </field>
-    </restriction>
-
-    <restriction id="AVC_BL_384" type="video">
-      <parent name="AVC_BL" />
-
-      <field name="level" type="string">
-        <value>1</value>
-        <value>1b</value>
-        <value>1.1</value>
-        <value>1.2</value>
-      </field>
-      <field name="bitrate" type="int">
-        <range min="0" max="384000" />
-      </field>
-      <field name="maximum-bitrate" type="int">
-        <range min="0" max="384000" />
-      </field>
       <field name="pixel-aspect-ratio" type="fraction">
         <value>1/1</value>
         <value>12/11</value>
@@ -60,6 +51,70 @@
       </field>
     </restriction>
 
+    <restriction id="AVC_BL_384" type="video">
+      <parent name="AVC_BL_C" />
+
+      <field name="level" type="string">
+        <value>1</value>
+        <value>1b</value>
+        <value>1.1</value>
+        <value>1.2</value>
+      </field>
+      <field name="bitrate" type="int">
+        <range min="0" max="384000" />
+      </field>
+      <field name="maximum-bitrate" type="int">
+        <range min="0" max="384000" />
+      </field>
+    </restriction>
+
+    <restriction id="AVC_BL_L3L" type="video">
+      <parent name="AVC_BL_C" />
+      <field name="level" type="string">
+        <value>1</value>
+        <value>1b</value>
+        <value>1.1</value>
+        <value>1.2</value>
+        <value>1.3</value>
+        <value>2</value>
+        <value>2.1</value>
+        <value>2.2</value>
+        <value>3</value>
+      </field>
+    </restriction>
+
+    <restriction id="AVC_BL_L3" type="video">
+      <parent name="AVC_BL_L3L" />
+      <field name="profile" type="string">
+        <!-- constrained-baseline is a subset of baseline, but that's already
+             handled in the L3L profile -->
+        <value>baseline</value>
+      </field>
+      <field name="bitrate" type="int">
+        <range min="1" max="4000000" />
+      </field>
+    </restriction>
+
+    <restriction id="AVC_BL_625_D1" type="video">
+      <parent name="625_D1" />
+      <parent name="25fps" />
+    </restriction>
+
+    <restriction id="AVC_BL_525_D1" type="video">
+      <parent name="525_D1" />
+      <parent name="29.97fps" />
+    </restriction>
+
+    <restriction id="AVC_BL_VGA" type="video">
+      <parent name="VGA" />
+      <parent name="30fps" />
+    </restriction>
+
+    <restriction id="AVC_BL_VGA_16:9" type="video">
+      <parent name="VGA_16:9" />
+      <parent name="30fps" />
+    </restriction>
+
     <restriction id="AVC_BL_CIF" type="video">
       <parent name="CIF" />
       <parent name="15fps" />
@@ -204,4 +259,61 @@
       <parent name="AVC_BL_1/7_VGA_16:9" />
     </restriction>
   </dlna-profile>
+
+  <dlna-profile name="AVC_MP4_L3L_SD_AAC" mime="video/mp4">
+    <parent name="MP4" />
+
+    <parent name="AVC_BL_L3_AAC" />
+
+    <!--
+      Note: the AVC_MP4_BL_L3L_SD_AAC resolutions are missing from the DLNA
+      spec, so I'm just reusing the ones from AVC_MP4_L3_SD_AAC.
+    -->
+
+    <restriction type="video">
+      <parent name="AVC_BL_L3L" />
+      <parent name="AVC_BL_625_D1" />
+    </restriction>
+
+    <restriction type="video">
+      <parent name="AVC_BL_L3L" />
+      <parent name="AVC_BL_525_D1" />
+    </restriction>
+
+    <restriction type="video">
+      <parent name="AVC_BL_L3L" />
+      <parent name="AVC_BL_VGA" />
+    </restriction>
+
+    <restriction type="video">
+      <parent name="AVC_BL_L3L" />
+      <parent name="AVC_BL_VGA_16:9" />
+    </restriction>
+  </dlna-profile>
+
+  <dlna-profile name="AVC_MP4_L3_SD_AAC" mime="video/mp4">
+    <parent name="MP4" />
+
+    <parent name="AVC_BL_L3_AAC" />
+
+    <restriction type="video">
+      <parent name="AVC_BL_L3" />
+      <parent name="AVC_BL_625_D1" />
+    </restriction>
+
+    <restriction type="video">
+      <parent name="AVC_BL_L3" />
+      <parent name="AVC_BL_525_D1" />
+    </restriction>
+
+    <restriction type="video">
+      <parent name="AVC_BL_L3" />
+      <parent name="AVC_BL_VGA" />
+    </restriction>
+
+    <restriction type="video">
+      <parent name="AVC_BL_L3" />
+      <parent name="AVC_BL_VGA_16:9" />
+    </restriction>
+  </dlna-profile>
 </dlna-profiles>
diff --git a/data/common.xml b/data/common.xml
index 6104b67..47a4077 100644
--- a/data/common.xml
+++ b/data/common.xml
@@ -308,6 +308,18 @@
       </field>
     </restriction>
 
+    <restriction id="25fps" type="video">
+      <field name="framerate" type="fraction">
+        <range min="0/1" max="25/1" />
+      </field>
+    </restriction>
+
+    <restriction id="29.97fps" type="video">
+      <field name="framerate" type="fraction">
+        <range min="0/1" max="30000/1001" />
+      </field>
+    </restriction>
+
     <restriction id="30fps" type="video">
       <field name="framerate" type="fraction">
         <range min="0/1" max="30/1" />