gst-libs/gst/riff/riff-media.c: Support WMA Lossless properly.
Original commit message from CVS: * gst-libs/gst/riff/riff-media.c: Support WMA Lossless properly.
This commit is contained in:
parent
b97e582c57
commit
eabff64640
@ -1,3 +1,8 @@
|
|||||||
|
2008-11-20 Michael Smith <msmith@songbirdnest.com>
|
||||||
|
|
||||||
|
* gst-libs/gst/riff/riff-media.c:
|
||||||
|
Support WMA Lossless properly.
|
||||||
|
|
||||||
2008-11-18 David Schleef <ds@schleef.org>
|
2008-11-18 David Schleef <ds@schleef.org>
|
||||||
|
|
||||||
* gst/videotestsrc/gstvideotestsrc.c:
|
* gst/videotestsrc/gstvideotestsrc.c:
|
||||||
|
@ -1136,6 +1136,7 @@ gst_riff_create_audio_caps (guint16 codec_id,
|
|||||||
case GST_RIFF_WAVE_FORMAT_WMAV1:
|
case GST_RIFF_WAVE_FORMAT_WMAV1:
|
||||||
case GST_RIFF_WAVE_FORMAT_WMAV2:
|
case GST_RIFF_WAVE_FORMAT_WMAV2:
|
||||||
case GST_RIFF_WAVE_FORMAT_WMAV3:
|
case GST_RIFF_WAVE_FORMAT_WMAV3:
|
||||||
|
case GST_RIFF_WAVE_FORMAT_WMAV3_L:
|
||||||
{
|
{
|
||||||
gint version = (codec_id - GST_RIFF_WAVE_FORMAT_WMAV1) + 1;
|
gint version = (codec_id - GST_RIFF_WAVE_FORMAT_WMAV1) + 1;
|
||||||
|
|
||||||
@ -1145,8 +1146,12 @@ gst_riff_create_audio_caps (guint16 codec_id,
|
|||||||
caps = gst_caps_new_simple ("audio/x-wma",
|
caps = gst_caps_new_simple ("audio/x-wma",
|
||||||
"wmaversion", G_TYPE_INT, version, NULL);
|
"wmaversion", G_TYPE_INT, version, NULL);
|
||||||
|
|
||||||
if (codec_name)
|
if (codec_name) {
|
||||||
*codec_name = g_strdup_printf ("WMA Version %d", version + 6);
|
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) {
|
if (strf != NULL) {
|
||||||
gst_caps_set_simple (caps,
|
gst_caps_set_simple (caps,
|
||||||
@ -1158,11 +1163,6 @@ gst_riff_create_audio_caps (guint16 codec_id,
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case GST_RIFF_WAVE_FORMAT_WMAV3_L:
|
|
||||||
{
|
|
||||||
/* WMA Version 9 Lossless */
|
|
||||||
goto unknown;
|
|
||||||
}
|
|
||||||
case GST_RIFF_WAVE_FORMAT_SONY_ATRAC3:
|
case GST_RIFF_WAVE_FORMAT_SONY_ATRAC3:
|
||||||
caps = gst_caps_new_simple ("audio/x-vnd.sony.atrac3", NULL);
|
caps = gst_caps_new_simple ("audio/x-vnd.sony.atrac3", NULL);
|
||||||
if (codec_name)
|
if (codec_name)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user