gst-libs/gst/pbutils/descriptions.c: Add description for Windows Media RTP caps.

Original commit message from CVS:
* gst-libs/gst/pbutils/descriptions.c: (caps_are_rtp_caps):
Add description for Windows Media RTP caps.
* gst-libs/gst/pbutils/missing-plugins.c: (copy_and_clean_caps):
Remove RTP fields that don't define the format from caps.
This commit is contained in:
Tim-Philipp Müller 2007-06-27 12:55:20 +00:00
parent 087f644cfe
commit f637e3b80c
3 changed files with 27 additions and 1 deletions

View file

@ -1,3 +1,11 @@
2007-06-27 Tim-Philipp Müller <tim at centricular dot net>
* gst-libs/gst/pbutils/descriptions.c: (caps_are_rtp_caps):
Add description for Windows Media RTP caps.
* gst-libs/gst/pbutils/missing-plugins.c: (copy_and_clean_caps):
Remove RTP fields that don't define the format from caps.
2007-06-27 Tim-Philipp Müller <tim at centricular dot net>
* ext/vorbis/vorbisdec.c: (vorbis_dec_decode_buffer):

View file

@ -606,7 +606,15 @@ caps_are_rtp_caps (const GstCaps * caps, const gchar * media, gchar ** format)
str = gst_structure_get_string (s, "encoding-name");
if (str == NULL || *str == '\0')
return FALSE;
*format = g_strdup (str);
if (strcmp (str, "X-ASF-PF") == 0) {
*format = g_strdup ("Windows Media");
} else if (g_str_has_prefix (str, "X-")) {
*format = g_strdup (str + 2);
} else {
*format = g_strdup (str);
}
return TRUE;
}

View file

@ -137,6 +137,16 @@ copy_and_clean_caps (const GstCaps * caps)
gst_structure_remove_field (s, "height");
gst_structure_remove_field (s, "channels");
gst_structure_remove_field (s, "rate");
/* rtp fields */
gst_structure_remove_field (s, "config");
gst_structure_remove_field (s, "clock-rate");
gst_structure_remove_field (s, "clock-base");
gst_structure_remove_field (s, "maxps");
gst_structure_remove_field (s, "seqnum-base");
gst_structure_remove_field (s, "npt-start");
gst_structure_remove_field (s, "npt-stop");
gst_structure_remove_field (s, "play-speed");
gst_structure_remove_field (s, "play-scale");
return ret;
}