mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-30 13:41:48 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/asfdemux/gstasfdemux.c: Extract TrackNumber metadata + clean up code

Browse source 
Original commit message from CVS:
* gst/asfdemux/gstasfdemux.c:
(gst_asf_demux_process_ext_content_desc):
Extract TrackNumber metadata + clean up code

* gst/games/gstvideoimage.c: (gst_video_image_draw_rectangle):
Hope this is the good fix (var used unitialised)
This commit is contained in:
Stéphane Loeuillet 2005-01-06 12:41:13 +00:00
parent 6869eeb6bf
commit 404fe766bb
2 changed files with 45 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2005-01-06 Stephane LOEUILLET <stephane.loeuillet@tiscali.fr>
* gst/asfdemux/gstasfdemux.c:
(gst_asf_demux_process_ext_content_desc):
Extract TrackNumber metadata + clean up code
* gst/games/gstvideoimage.c: (gst_video_image_draw_rectangle):
Hope this is the good fix (var used unitialised)
2005-01-06 Ronald S. Bultje <rbultje@ronald.bitfreak.net> 2005-01-06 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* ext/faad/gstfaad.c: (gst_faad_chain): * ext/faad/gstfaad.c: (gst_faad_chain):

63
gst/asfdemux/gstasfdemux.c
View file

@ -641,21 +641,22 @@ Other known (and unused) 'text/unicode' metadata available :
WM/Provider = AMG WM/Provider = AMG
WM/ProviderRating = 8 WM/ProviderRating = 8
WM/ProviderStyle = Rock WM/ProviderStyle = Rock
WM/GenreID
Other known (and unused) 'non-text' metadata available : Other known (and unused) 'non-text' metadata available :
WM/Track WM/Track (same as WM/TrackNumber but starts at 0)
IsVBR
WM/TrackNumber
WM/EncodingTime WM/EncodingTime
WM/MCDI WM/MCDI
IsVBR
*/ */
const guchar *tags[4] = const guchar *tags[5] =
{ GST_TAG_GENRE, GST_TAG_ALBUM, GST_TAG_ARTIST, NULL }; { GST_TAG_GENRE, GST_TAG_ALBUM, GST_TAG_ARTIST, GST_TAG_TRACK_NUMBER,
const guchar *tags_label[4] = NULL };
{ "WM/Genre", "WM/AlbumTitle", "WM/AlbumArtist", NULL }; const guchar *tags_label[5] =
{ "WM/Genre", "WM/AlbumTitle", "WM/AlbumArtist", "WM/TrackNumber", NULL };
GstTagList *taglist; GstTagList *taglist;
GValue tag_value = { 0 }; GValue tag_value = { 0 };
@ -664,7 +665,6 @@ WM/MCDI
GST_INFO ("Object is an extended content description."); GST_INFO ("Object is an extended content description.");
taglist = gst_tag_list_new (); taglist = gst_tag_list_new ();
g_value_init (&tag_value, G_TYPE_STRING);
/* Content Descriptors Count */ /* Content Descriptors Count */
if (!_read_uint16 (asf_demux, &blockcount)) if (!_read_uint16 (asf_demux, &blockcount))
@ -704,10 +704,10 @@ WM/MCDI
value = g_memdup (tmpvalue, value_length); value = g_memdup (tmpvalue, value_length);
gst_bytestream_flush_fast (bs, value_length); gst_bytestream_flush_fast (bs, value_length);
/* 0000 = Unicode String */ /* 0000 = Unicode String OR 0003 = DWORD */
if (datatype == 0) { if ((datatype == 0) || (datatype == 3)) {
gsize in, out; gsize in, out;
guchar tag = 255; guchar tag;
guint16 j = 0; guint16 j = 0;
/* convert to UTF-8 */ /* convert to UTF-8 */
@ -716,32 +716,41 @@ WM/MCDI
name[out] = 0; name[out] = 0;
while (tags_label[j] != NULL) { while (tags_label[j] != NULL) {
if (!strncmp (name, tags_label[j], strlen (tags_label[j]))) { if (!strcmp (name, tags_label[j])) {
tag = j; tag = j;
have_tags = TRUE;
/* 0000 = UTF-16 String */
if (datatype == 0) {
/* convert to UTF-8 */
value =
g_convert (value, value_length, "UTF-8", "UTF-16LE", &in, &out,
NULL);
value[out] = 0;
g_value_init (&tag_value, G_TYPE_STRING);
g_value_set_string (&tag_value, value);
}
/* 0003 = DWORD */
if (datatype == 3) {
g_value_init (&tag_value, G_TYPE_INT);
g_value_set_int (&tag_value, GUINT32_FROM_LE ((guint32) * value));
}
gst_tag_list_add_values (taglist, GST_TAG_MERGE_APPEND, tags[tag],
&tag_value, NULL);
g_value_unset (&tag_value);
}; };
j++; j++;
} }
if (tag != 255) {
/* convert to UTF-8 */
value =
g_convert (value, value_length, "UTF-8", "UTF-16LE", &in, &out,
NULL);
value[out] = 0;
have_tags = TRUE;
g_value_set_string (&tag_value, value);
gst_tag_list_add_values (taglist, GST_TAG_MERGE_APPEND, tags[tag],
&tag_value, NULL);
}
} }
g_free (name); g_free (name);
g_free (value); g_free (value);
} }
g_value_unset (&tag_value);
if (have_tags) { if (have_tags) {
GstElement *element = GST_ELEMENT (asf_demux); GstElement *element = GST_ELEMENT (asf_demux);
GstEvent *event; GstEvent *event;