use audio/x-ttafile and audio/x-tta for tta instead of audio/x-tta and audio/x-raw-tta

Original commit message from CVS:
use audio/x-ttafile and audio/x-tta for tta instead of audio/x-tta and audio/x-raw-tta

diff --git a/ChangeLog b/ChangeLog
index 1026882..4b2b836 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-09-15  Arwed v. Merkatz  <v.merkatz@gmx.net>
+
+       * gst/matroska/matroska-demux.c: (gst_matroska_demux_audio_caps):
+       * gst/matroska/matroska-mux.c: (audiosink_templ),
+       (gst_matroska_mux_audio_pad_link):
+       * gst/typefind/gsttypefindfunctions.c: (tta_caps), (plugin_init):
+       Use audio/x-ttafile for tta files and audio/x-tta for raw tta frames.
+
 2004-09-15  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
 
        * gst/avi/gstavidemux.c: (gst_avi_demux_handle_src_query),

diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c
index b8e76d6..00eee5b 100644 (file)
--- a/gst/matroska/matroska-demux.c
+++ b/gst/matroska/matroska-demux.c
@@ -1491,8 +1491,7 @@ gst_matroska_demux_parse_metadata (GstMatroskaDemux * demux,
     gchar *matroska_tagname;
     gchar *gstreamer_tagname;
   }
-  tag_conv[] =
-  {
+  tag_conv[] = {
     {
     GST_MATROSKA_TAG_ID_TITLE, GST_TAG_TITLE}
     , {
@@ -1611,8 +1610,7 @@ gst_matroska_demux_parse_metadata (GstMatroskaDemux * demux,
                 for (i = 0; tag_conv[i].matroska_tagname != NULL; i++) {
                   if (!strcmp (tag_conv[i].matroska_tagname, tag)) {
                     GValue src = { 0 }
-                    , dest =
-                    {
+                    , dest = {
                     0};
                     const gchar *type = tag_conv[i].gstreamer_tagname;
                     GType dest_type = gst_tag_get_type (type);
@@ -2661,10 +2659,10 @@ gst_matroska_demux_audio_caps (GstMatroskaTrackAudioContext * audiocontext,
         "mpegversion", G_TYPE_INT, mpegversion, NULL);
   } else if (!strcmp (codec_id, GST_MATROSKA_CODEC_ID_AUDIO_TTA)) {
     if (audiocontext != NULL) {
-      caps = gst_caps_new_simple ("audio/x-raw-tta",
+      caps = gst_caps_new_simple ("audio/x-tta",
           "width", G_TYPE_INT, audiocontext->bitdepth, NULL);
     } else {
-      caps = gst_caps_from_string ("audio/x-raw-tta, "
+      caps = gst_caps_from_string ("audio/x-tta, "
           "width = (int) { 8, 16, 24 }");
     }
   } else {
@@ -2754,8 +2752,7 @@ gst_matroska_demux_plugin_init (GstPlugin * plugin)
     /* TODO: Real/Quicktime */
     /* FILLME */
     NULL,
-  }, *audio_id[] =
-  {
+  }, *audio_id[] = {
     GST_MATROSKA_CODEC_ID_AUDIO_MPEG1_L1,
         GST_MATROSKA_CODEC_ID_AUDIO_MPEG1_L2,
         GST_MATROSKA_CODEC_ID_AUDIO_MPEG1_L3,

diff --git a/gst/matroska/matroska-mux.c b/gst/matroska/matroska-mux.c
index 7790783..2aded26 100644 (file)
--- a/gst/matroska/matroska-mux.c
+++ b/gst/matroska/matroska-mux.c
@@ -103,7 +103,7 @@ static GstStaticPadTemplate audiosink_templ =
         "endianness = (int) { BIG_ENDIAN, LITTLE_ENDIAN }, "
         "signed = (boolean) { true, false }, "
         COMMON_AUDIO_CAPS ";"
-        "audio/x-raw-tta, "
+        "audio/x-tta, "
         "width = (int) { 8, 16, 24 }, "
         "channels = (int) { 1, 2 }, " "rate = (int) [ 8000, 96000 ]")
     );
@@ -572,7 +572,7 @@ gst_matroska_mux_audio_pad_link (GstPad * pad, const GstCaps * caps)
     context->codec_id = g_strdup (GST_MATROSKA_CODEC_ID_AUDIO_AC3);
 
     return GST_PAD_LINK_OK;
-  } else if (!strcmp (mimetype, "audio/x-raw-tta")) {
+  } else if (!strcmp (mimetype, "audio/x-tta")) {
     gint width;
 
     /* TTA frame duration */