summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Georg <jensg@openismus.com>2013-05-07 14:11:30 +0200
committerJens Georg <jensg@openismus.com>2013-05-07 14:19:24 +0200
commitc98ca2d6c1425d0cedcc1fe0163a679e52653d7f (patch)
treedc7430975ed8ddd5547c316e4cbd81de10e72684
parentf03d1a0dfe23f5849573f4ff5321bb1f1bc0ef2b (diff)
downloadgupnp-dlna-c98ca2d6c1425d0cedcc1fe0163a679e52653d7f.tar.gz
Add MPEG_TS_SD_EU profile
Note: This also matches MPEG_TS_SD_EU_T files since we don't have any means of deciding whether the 4 byte timestamps are valid or not.
-rw-r--r--data/mpeg-ts.xml39
1 files changed, 32 insertions, 7 deletions
diff --git a/data/mpeg-ts.xml b/data/mpeg-ts.xml
index 57b68cd..beba788 100644
--- a/data/mpeg-ts.xml
+++ b/data/mpeg-ts.xml
@@ -4,7 +4,7 @@
<include ref="common.xml" />
<restrictions>
- <restriction id="MPEG_TS" type="container">
+ <restriction id="MPEG_TS_ISO" type="container">
<field name="name" type="string">
<value>video/mpegts</value>
</field>
@@ -16,6 +16,19 @@
</field>
</restriction>
+ <!-- TS with 192 byte packet size and all zero timestamps -->
+ <restriction id="MPEG_TS" type="container">
+ <field name="name" type="string">
+ <value>video/mpegts</value>
+ </field>
+ <field name="systemstream" type="boolean">
+ <value>true</value>
+ </field>
+ <field name="packetsize" type="int">
+ <value>192</value>
+ </field>
+ </restriction>
+
<restriction id="MPEG_TS_AUDIO_BASE" type="audio">
<field name="channels" type="int">
<range min="1" max="6" />
@@ -269,7 +282,7 @@
<dlna-profile name="MPEG_TS_SD_NA_ISO" mime="video/mpeg">
<!-- Note: We have no way to restrict the system bitrate yet -->
- <parent name="MPEG_TS" />
+ <parent name="MPEG_TS_ISO" />
<restriction type="audio">
<parent name="MPEG_TS_AUDIO" />
@@ -326,10 +339,8 @@
</restriction>
</dlna-profile>
- <dlna-profile name="MPEG_TS_SD_EU_ISO" mime="video/mpeg">
+ <dlna-profile id="MPEG_TS_SD_EU_BASE">
<!-- Note: We have no way to restrict the system bitrate yet -->
- <parent name="MPEG_TS" />
-
<restriction type="audio">
<parent name="MPEG_TS_AUDIO_EU" />
@@ -366,7 +377,6 @@
</field>
</restriction>
-
<restriction type="video">
<parent name="MPEG_TS_VIDEO" />
<parent name="720x576" />
@@ -393,8 +403,23 @@
</restriction>
</dlna-profile>
+ <dlna-profile name="MPEG_TS_SD_EU" mime="video/vnd.dlna.mpeg-tts" base-profile="MPEG_TS_SD_EU_BASE">
+ <!-- Note: We have no way to restrict the system bitrate yet -->
+ <restriction type="container">
+ <parent name="MPEG_TS" />
+ </restriction>
+ </dlna-profile>
+
+ <dlna-profile name="MPEG_TS_SD_EU_ISO" mime="video/mpeg" base-profile="MPEG_TS_SD_EU_BASE">
+ <!-- Note: We have no way to restrict the system bitrate yet -->
+ <restriction type="container">
+ <parent name="MPEG_TS_ISO" />
+ </restriction>
+ </dlna-profile>
+
+
<dlna-profile name="MPEG_TS_HD_NA_ISO" mime="video/mpeg">
- <parent name="MPEG_TS" />
+ <parent name="MPEG_TS_ISO" />
<restriction type="audio">
<parent name="MPEG_TS_AUDIO" />