mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-25 01:30:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

rename WMAx codec defines to be consistent

Browse source 
Original commit message from CVS:
rename WMAx codec defines to be consistent
This commit is contained in:
Stéphane Loeuillet 2004-05-17 16:29:16 +00:00
parent 7af3ffabc3
commit a8d76e7f4e
3 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gst-libs/gst/riff/riff-ids.h
View file

@ -276,9 +276,9 @@ typedef struct _gst_riff_strf_auds { /* == WaveHeader (?) */
#define GST_RIFF_IBM_FORMAT_MULAW (0x0101) #define GST_RIFF_IBM_FORMAT_MULAW (0x0101)
#define GST_RIFF_IBM_FORMAT_ALAW (0x0102) #define GST_RIFF_IBM_FORMAT_ALAW (0x0102)
#define GST_RIFF_IBM_FORMAT_ADPCM (0x0103) #define GST_RIFF_IBM_FORMAT_ADPCM (0x0103)
#define GST_RIFF_WAVE_FORMAT_DIVX_WMAV1 (0x0160) #define GST_RIFF_WAVE_FORMAT_WMAV1 (0x0160)
#define GST_RIFF_WAVE_FORMAT_DIVX_WMAV2 (0x0161) #define GST_RIFF_WAVE_FORMAT_WMAV2 (0x0161)
#define GST_RIFF_WAVE_FORMAT_WMAV9 (0x0162) #define GST_RIFF_WAVE_FORMAT_WMAV3 (0x0162)
#define GST_RIFF_WAVE_FORMAT_A52 (0x2000) #define GST_RIFF_WAVE_FORMAT_A52 (0x2000)
#define GST_RIFF_WAVE_FORMAT_VORBIS1 (0x674f) #define GST_RIFF_WAVE_FORMAT_VORBIS1 (0x674f)
#define GST_RIFF_WAVE_FORMAT_VORBIS2 (0x6750) #define GST_RIFF_WAVE_FORMAT_VORBIS2 (0x6750)

6
gst-libs/gst/riff/riff-media.c
View file

@ -214,21 +214,21 @@ gst_riff_create_video_caps_with_data (guint32 codec_fcc,
caps = gst_caps_new_simple ("video/x-wmv", caps = gst_caps_new_simple ("video/x-wmv",
"wmvversion", G_TYPE_INT, 1, NULL); "wmvversion", G_TYPE_INT, 1, NULL);
if (codec_name) if (codec_name)
*codec_name = g_strdup ("Windows Media Video 7"); *codec_name = g_strdup ("Microsoft Windows Media 7 (WMV1)");
break; break;
case GST_MAKE_FOURCC ('W', 'M', 'V', '2'): case GST_MAKE_FOURCC ('W', 'M', 'V', '2'):
caps = gst_caps_new_simple ("video/x-wmv", caps = gst_caps_new_simple ("video/x-wmv",
"wmvversion", G_TYPE_INT, 2, NULL); "wmvversion", G_TYPE_INT, 2, NULL);
if (codec_name) if (codec_name)
*codec_name = g_strdup ("Windows Media Video 8"); *codec_name = g_strdup ("Microsoft Windows Media 8 (WMV2)");
break; break;
case GST_MAKE_FOURCC ('W', 'M', 'V', '3'): case GST_MAKE_FOURCC ('W', 'M', 'V', '3'):
caps = gst_caps_new_simple ("video/x-wmv", caps = gst_caps_new_simple ("video/x-wmv",
"wmvversion", G_TYPE_INT, 3, NULL); "wmvversion", G_TYPE_INT, 3, NULL);
if (codec_name) if (codec_name)
*codec_name = g_strdup ("Windows Media Video 9"); *codec_name = g_strdup ("Microsoft Windows Media 9 (WMV3)");
break; break;
case GST_MAKE_FOURCC ('c', 'v', 'i', 'd'): case GST_MAKE_FOURCC ('c', 'v', 'i', 'd'):

24
gst/asfdemux/gstasfdemux.c
View file

@ -136,9 +136,9 @@ gst_asf_demux_base_init (gpointer g_class)
GST_RIFF_WAVE_FORMAT_PCM, GST_RIFF_WAVE_FORMAT_PCM,
GST_RIFF_WAVE_FORMAT_VORBIS1, GST_RIFF_WAVE_FORMAT_VORBIS1,
GST_RIFF_WAVE_FORMAT_A52, GST_RIFF_WAVE_FORMAT_A52,
GST_RIFF_WAVE_FORMAT_DIVX_WMAV1, GST_RIFF_WAVE_FORMAT_WMAV1,
GST_RIFF_WAVE_FORMAT_DIVX_WMAV2, GST_RIFF_WAVE_FORMAT_WMAV2,
GST_RIFF_WAVE_FORMAT_WMAV9, GST_RIFF_WAVE_FORMAT_WMAV3,
-1 /* end */ -1 /* end */
}; };
@ -1479,7 +1479,7 @@ gst_asf_demux_audio_caps (guint16 codec_id,
*codec_name = g_strdup ("AC3"); *codec_name = g_strdup ("AC3");
break; break;
case GST_RIFF_WAVE_FORMAT_DIVX_WMAV1: case GST_RIFF_WAVE_FORMAT_WMAV1:
caps = gst_caps_from_string ("audio/x-wma, " caps = gst_caps_from_string ("audio/x-wma, "
"wmaversion = (int) 1, " "wmaversion = (int) 1, "
"block_align = (int) [ 0, MAX ], " "bitrate = (int) [ 0, MAX ]"); "block_align = (int) [ 0, MAX ], " "bitrate = (int) [ 0, MAX ]");
@ -1496,10 +1496,10 @@ gst_asf_demux_audio_caps (guint16 codec_id,
"bitrate", G_TYPE_INT, audio->byte_rate * 8, NULL); "bitrate", G_TYPE_INT, audio->byte_rate * 8, NULL);
} }
if (codec_name) if (codec_name)
*codec_name = g_strdup ("Microsoft WMA V1"); *codec_name = g_strdup ("Microsoft Windows Media 7 (WMA1)");
break; break;
case GST_RIFF_WAVE_FORMAT_DIVX_WMAV2: case GST_RIFF_WAVE_FORMAT_WMAV2:
caps = gst_caps_from_string ("audio/x-wma, " caps = gst_caps_from_string ("audio/x-wma, "
"wmaversion = (int) 2, " "wmaversion = (int) 2, "
"block_align = (int) [ 0, MAX ], " "bitrate = (int) [ 0, MAX ]"); "block_align = (int) [ 0, MAX ], " "bitrate = (int) [ 0, MAX ]");
@ -1517,13 +1517,13 @@ gst_asf_demux_audio_caps (guint16 codec_id,
gst_data_unref (GST_DATA (buffer)); gst_data_unref (GST_DATA (buffer));
} }
if (codec_name) if (codec_name)
*codec_name = g_strdup ("Microsoft WMA V2"); *codec_name = g_strdup ("Microsoft Windows Media 8 (WMA2)");
break; break;
case GST_RIFF_WAVE_FORMAT_WMAV9: case GST_RIFF_WAVE_FORMAT_WMAV3:
caps = gst_caps_from_string ("audio/x-wma, " "wmaversion = (int) 3"); caps = gst_caps_from_string ("audio/x-wma, " "wmaversion = (int) 3");
if (codec_name) if (codec_name)
*codec_name = g_strdup ("Microsoft WMA V3"); *codec_name = g_strdup ("Microsoft Windows Media 9 (WMA3)");
break; break;
default: default:
@ -1653,21 +1653,21 @@ gst_asf_demux_video_caps (guint32 codec_fcc,
caps = gst_caps_new_simple ("video/x-wmv", caps = gst_caps_new_simple ("video/x-wmv",
"wmvversion", G_TYPE_INT, 1, NULL); "wmvversion", G_TYPE_INT, 1, NULL);
if (codec_name) if (codec_name)
*codec_name = g_strdup ("Windows Media Video 7"); *codec_name = g_strdup ("Microsoft Windows Media 7 (WMV1)");
break; break;
case GST_MAKE_FOURCC ('W', 'M', 'V', '2'): case GST_MAKE_FOURCC ('W', 'M', 'V', '2'):
caps = gst_caps_new_simple ("video/x-wmv", caps = gst_caps_new_simple ("video/x-wmv",
"wmvversion", G_TYPE_INT, 2, NULL); "wmvversion", G_TYPE_INT, 2, NULL);
if (codec_name) if (codec_name)
*codec_name = g_strdup ("Windows Media Video 8"); *codec_name = g_strdup ("Microsoft Windows Media 8 (WMV2)");
break; break;
case GST_MAKE_FOURCC ('W', 'M', 'V', '3'): case GST_MAKE_FOURCC ('W', 'M', 'V', '3'):
caps = gst_caps_new_simple ("video/x-wmv", caps = gst_caps_new_simple ("video/x-wmv",
"wmvversion", G_TYPE_INT, 3, NULL); "wmvversion", G_TYPE_INT, 3, NULL);
if (codec_name) if (codec_name)
*codec_name = g_strdup ("Windows Media Video 9"); *codec_name = g_strdup ("Microsoft Windows Media 9 (WMV3)");
break; break;
case GST_MAKE_FOURCC ('M', 'P', 'G', '4'): case GST_MAKE_FOURCC ('M', 'P', 'G', '4'):