CVS Root: /cvs/gstreamer
Module: gst-plugins-base
Changes by: msmith
Date: Thu Nov 20 2008 21:20:41 UTC
Log message:
* gst-libs/gst/riff/riff-media.c:
Support WMA Lossless properly.
Modified files:
. : ChangeLog
gst-libs/gst/riff: riff-media.c
Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/ChangeLog.diff?r1=1.4199&r2=1.4200
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/gst-libs/gst/riff/riff-media.c.diff?r1=1.109&r2=1.110
====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-base/ChangeLog,v
retrieving revision 1.4199
retrieving revision 1.4200
diff -u -d -r1.4199 -r1.4200
--- ChangeLog 19 Nov 2008 00:24:42 -0000 1.4199
+++ ChangeLog 20 Nov 2008 21:20:26 -0000 1.4200
@@ -1,3 +1,8 @@
+2008-11-20 Michael Smith <[email protected]>
+
+ * gst-libs/gst/riff/riff-media.c:
+ Support WMA Lossless properly.
2008-11-18 David Schleef <[email protected]>
* gst/videotestsrc/gstvideotestsrc.c:
Index: riff-media.c
RCS file: /cvs/gstreamer/gst-plugins-base/gst-libs/gst/riff/riff-media.c,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -d -r1.109 -r1.110
--- riff-media.c 6 Nov 2008 12:14:51 -0000 1.109
+++ riff-media.c 20 Nov 2008 21:20:27 -0000 1.110
@@ -1136,6 +1136,7 @@
case GST_RIFF_WAVE_FORMAT_WMAV1:
case GST_RIFF_WAVE_FORMAT_WMAV2:
case GST_RIFF_WAVE_FORMAT_WMAV3:
+ case GST_RIFF_WAVE_FORMAT_WMAV3_L:
{
gint version = (codec_id - GST_RIFF_WAVE_FORMAT_WMAV1) + 1;
@@ -1145,8 +1146,12 @@
caps = gst_caps_new_simple ("audio/x-wma",
"wmaversion", G_TYPE_INT, version, NULL);
- if (codec_name)
- *codec_name = g_strdup_printf ("WMA Version %d", version + 6);
+ if (codec_name) {
+ if (codec_id == GST_RIFF_WAVE_FORMAT_WMAV3_L)
+ *codec_name = g_strdup ("WMA Lossless");
+ else
+ *codec_name = g_strdup_printf ("WMA Version %d", version + 6);
+ }
if (strf != NULL) {
gst_caps_set_simple (caps,
@@ -1158,11 +1163,6 @@
}
break;
}
- case GST_RIFF_WAVE_FORMAT_WMAV3_L:
- {
- /* WMA Version 9 Lossless */
- goto unknown;
- }
case GST_RIFF_WAVE_FORMAT_SONY_ATRAC3:
caps = gst_caps_new_simple ("audio/x-vnd.sony.atrac3", NULL);
if (codec_name)
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.