[gst-cvs] gst-plugins-good: matroskademux: Support "webm" DocType

[<sl...@ke...>]

Module: gst-plugins-good
Branch: master
Commit: 1daeb26df1fd9d7d737a3229d65a92825499fd5a
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-good/commit/?id=1daeb26df1fd9d7d737a3229d65a92825499fd5a

Author: Philip Jägenstedt <ph...@fo...>
Date:   Sun May  9 19:28:59 2010 +0200

matroskademux: Support "webm" DocType

---

 gst/matroska/matroska-demux.c |   36 +++++++++++++++++++++++++-----------
 1 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c
index 0dc975d..b18909a 100644
--- a/gst/matroska/matroska-demux.c
+++ b/gst/matroska/matroska-demux.c
@@ -2574,18 +2574,32 @@ gst_matroska_demux_parse_header (GstMatroskaDemux * demux)
   if ((ret = gst_ebml_read_header (ebml, &doctype, &version)) != GST_FLOW_OK)
     return ret;
 
-  if (!doctype || strcmp (doctype, "matroska") != 0) {
-    GST_ELEMENT_ERROR (demux, STREAM, WRONG_TYPE, (NULL),
-        ("Input is not a matroska stream (doctype=%s)",
-            doctype ? doctype : "none"));
+  ret = GST_FLOW_ERROR;
+  if (doctype) {
+    GEnumClass *doctype_class;
+    GEnumValue *doctype_value;
+    doctype_class = g_type_class_ref (GST_TYPE_MATROSKA_DOCTYPE);
+    doctype_value = g_enum_get_value_by_nick (doctype_class, doctype);
+    if (doctype_value) {
+      guint max_version =
+          doctype_value->value == GST_MATROSKA_DOCTYPE_MATROSKA ? 2 : 1;
+      if (version <= max_version) {
+        GST_INFO_OBJECT (demux, "Input is %s version %d", doctype, version);
+        ret = GST_FLOW_OK;
+      } else {
+        GST_ELEMENT_ERROR (demux, STREAM, DEMUX, (NULL),
+            ("Demuxer version (%d) is too old to read %s version %d",
+                max_version, doctype, version));
+      }
+    } else {
+      GST_ELEMENT_ERROR (demux, STREAM, WRONG_TYPE, (NULL),
+          ("Input is not a matroska stream (doctype=%s)", doctype));
+    }
+    g_type_class_unref (doctype_class);
     g_free (doctype);
-    return GST_FLOW_ERROR;
-  }
-  g_free (doctype);
-  if (version > 2) {
-    GST_ELEMENT_ERROR (demux, STREAM, DEMUX, (NULL),
-        ("Demuxer version (2) is too old to read stream version %d", version));
-    return GST_FLOW_ERROR;
+  } else {
+    GST_ELEMENT_ERROR (demux, STREAM, WRONG_TYPE, (NULL),
+        ("Input is not a matroska stream"));
   }
 
   return ret;