From: Ronald B. <rb...@us...> - 2003-01-30 20:12:33
|
CVS Root: /cvsroot/gstreamer Module: gst-plugins Changes by: rbultje Date: Thu Jan 30 2003 12:12:32 PST Log message: Fix bug 104344 and add a missing free() Modified files: ext/mad : gstmad.c Links: http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/mad/gstmad.c.diff?r1=1.55&r2=1.56 ====Begin Diffs==== Index: gstmad.c =================================================================== RCS file: /cvsroot/gstreamer/gst-plugins/ext/mad/gstmad.c,v retrieving revision 1.55 retrieving revision 1.56 diff -u -d -r1.55 -r1.56 --- gstmad.c 20 Jan 2003 19:38:37 -0000 1.55 +++ gstmad.c 30 Jan 2003 20:12:18 -0000 1.56 @@ -909,7 +909,7 @@ unsigned int i; struct id3_frame const *frame; id3_ucs4_t const *ucs4; - id3_latin1_t *latin1; + id3_utf8_t *utf8; GstProps *props; GstPropsEntry *entry; GstCaps *caps; @@ -965,13 +965,13 @@ if (strcmp(info[i].id, ID3_FRAME_GENRE) == 0) ucs4 = id3_genre_name(ucs4); - latin1 = id3_ucs4_latin1duplicate(ucs4); - if (latin1 == 0) + utf8 = id3_ucs4_utf8duplicate(ucs4); + if (utf8 == 0) goto fail; - entry = gst_props_entry_new (name, GST_PROPS_STRING_TYPE, latin1); + entry = gst_props_entry_new (name, GST_PROPS_STRING_TYPE, utf8); values = g_list_prepend (values, entry); - free(latin1); + free(utf8); } if (values) { values = g_list_reverse (values); @@ -1000,12 +1000,13 @@ ucs4 = id3_field_getfullstring(&frame->fields[3]); g_assert(ucs4); - latin1 = id3_ucs4_latin1duplicate(ucs4); - if (latin1 == 0) + utf8 = id3_ucs4_utf8duplicate(ucs4); + if (utf8 == 0) goto fail; - entry = gst_props_entry_new ("Comment", GST_PROPS_STRING_TYPE, latin1); + entry = gst_props_entry_new ("Comment", GST_PROPS_STRING_TYPE, utf8); values = g_list_prepend (values, entry); + free(utf8); } if (values) { values = g_list_reverse (values); |
From: Ronald B. <rb...@us...> - 2003-03-30 13:48:43
|
CVS Root: /cvsroot/gstreamer Module: gst-plugins Changes by: rbultje Date: Sun Mar 30 2003 05:48:43 PST Branch: BRANCH-GSTREAMER-0_6 Log message: 0.6.1 accepted release patch fixes text encoding of metadata in mad (latin->utf8) Modified files: ext/mad : gstmad.c Links: http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/mad/gstmad.c.diff?r1=1.54&r2=1.54.4.1 ====Begin Diffs==== Index: gstmad.c =================================================================== RCS file: /cvsroot/gstreamer/gst-plugins/ext/mad/gstmad.c,v retrieving revision 1.54 retrieving revision 1.54.4.1 diff -u -d -r1.54 -r1.54.4.1 --- gstmad.c 8 Jan 2003 16:11:48 -0000 1.54 +++ gstmad.c 30 Mar 2003 13:48:30 -0000 1.54.4.1 @@ -811,7 +811,7 @@ unsigned int i; struct id3_frame const *frame; id3_ucs4_t const *ucs4; - id3_latin1_t *latin1; + id3_utf8_t *utf8; GstProps *props; GstPropsEntry *entry; GstCaps *caps; @@ -867,13 +867,13 @@ if (strcmp(info[i].id, ID3_FRAME_GENRE) == 0) ucs4 = id3_genre_name(ucs4); - latin1 = id3_ucs4_latin1duplicate(ucs4); - if (latin1 == 0) + utf8 = id3_ucs4_utf8duplicate(ucs4); + if (utf8 == 0) goto fail; - entry = gst_props_entry_new (name, GST_PROPS_STRING_TYPE, latin1); + entry = gst_props_entry_new (name, GST_PROPS_STRING_TYPE, utf8); values = g_list_prepend (values, entry); - free(latin1); + free(utf8); } if (values) { values = g_list_reverse (values); @@ -902,12 +902,13 @@ ucs4 = id3_field_getfullstring(&frame->fields[3]); g_assert(ucs4); - latin1 = id3_ucs4_latin1duplicate(ucs4); - if (latin1 == 0) + utf8 = id3_ucs4_utf8duplicate(ucs4); + if (utf8 == 0) goto fail; - entry = gst_props_entry_new ("Comment", GST_PROPS_STRING_TYPE, latin1); + entry = gst_props_entry_new ("Comment", GST_PROPS_STRING_TYPE, utf8); values = g_list_prepend (values, entry); + free(utf8); } if (values) { values = g_list_reverse (values); |
From: Ronald B. <rb...@us...> - 2003-06-07 00:28:33
|
CVS Root: /cvsroot/gstreamer Module: gst-plugins Changes by: rbultje Date: Fri Jun 06 2003 17:28:33 PDT Log message: Add duration field support to mad - thanks to Joshua Modified files: ext/mad : gstmad.c Links: http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/mad/gstmad.c.diff?r1=1.62&r2=1.63 ====Begin Diffs==== Index: gstmad.c =================================================================== RCS file: /cvsroot/gstreamer/gst-plugins/ext/mad/gstmad.c,v retrieving revision 1.62 retrieving revision 1.63 diff -u -d -r1.62 -r1.63 --- gstmad.c 30 May 2003 14:48:29 -0000 1.62 +++ gstmad.c 7 Jun 2003 00:28:20 -0000 1.63 @@ -1268,8 +1268,8 @@ } time_offset = mad->total_samples * GST_SECOND / mad->frame.header.samplerate; - time_duration = ((mad->total_samples + nsamples) * GST_SECOND - / mad->frame.header.samplerate) - time_offset; + time_duration = (nsamples * GST_SECOND + / mad->frame.header.samplerate); } if (mad->index) { |
From: Ronald B. <rb...@us...> - 2003-07-06 20:50:24
|
CVS Root: /cvsroot/gstreamer Module: gst-plugins Changes by: rbultje Date: Sun Jul 06 2003 13:50:21 PDT Log message: New mimetypes gone into effect today - this commit changes all old mimetypes over to the new mimetypes spec as described in the previous commit's document. Note: some plugins will break, some pipelines will break, expect HEAD to be broken or at least not 100% working for a few days, but don't forget to report bugs Modified files: ext/mad : gstmad.c Links: http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/mad/gstmad.c.diff?r1=1.64&r2=1.65 ====Begin Diffs==== Index: gstmad.c =================================================================== RCS file: /cvsroot/gstreamer/gst-plugins/ext/mad/gstmad.c,v retrieving revision 1.64 retrieving revision 1.65 diff -u -d -r1.64 -r1.65 --- gstmad.c 29 Jun 2003 19:45:16 -0000 1.64 +++ gstmad.c 6 Jul 2003 20:49:19 -0000 1.65 @@ -120,9 +120,7 @@ GST_PAD_ALWAYS, GST_CAPS_NEW ( "mad_src", - "audio/raw", - "format", GST_PROPS_STRING ("int"), - "law", GST_PROPS_INT (0), + "audio/x-raw-int", "endianness", GST_PROPS_INT (G_BYTE_ORDER), "signed", GST_PROPS_BOOLEAN (TRUE), "width", GST_PROPS_INT (16), @@ -138,8 +136,9 @@ GST_PAD_ALWAYS, GST_CAPS_NEW ( "mad_sink", - "audio/x-mp3", - NULL + "audio/mpeg", + /* we don't need channel/rate ... */ + "layer", GST_PROPS_INT_RANGE (1, 3) ) ) @@ -1236,10 +1235,8 @@ if (gst_pad_try_set_caps (mad->srcpad, gst_caps_new ( "mad_src", - "audio/raw", + "audio/x-raw-int", gst_props_new ( - "format", GST_PROPS_STRING ("int"), - "law", GST_PROPS_INT (0), "endianness", GST_PROPS_INT (G_BYTE_ORDER), "signed", GST_PROPS_BOOLEAN (TRUE), "width", GST_PROPS_INT (16), |
From: Ronald B. <rb...@us...> - 2003-08-02 00:56:24
|
CVS Root: /cvsroot/gstreamer Module: gst-plugins Changes by: rbultje Date: Fri Aug 01 2003 17:56:23 PDT Log message: gcc-2.9x fixes Modified files: ext/mad : gstmad.c Links: http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/mad/gstmad.c.diff?r1=1.67&r2=1.68 ====Begin Diffs==== Index: gstmad.c =================================================================== RCS file: /cvsroot/gstreamer/gst-plugins/ext/mad/gstmad.c,v retrieving revision 1.67 retrieving revision 1.68 diff -u -d -r1.67 -r1.68 --- gstmad.c 25 Jul 2003 02:04:00 -0000 1.67 +++ gstmad.c 2 Aug 2003 00:56:11 -0000 1.68 @@ -611,6 +611,7 @@ while (gst_formats_contains (peer_formats, *try_formats)) { gint64 value; + GstEvent *seek_event; if (gst_index_entry_assoc_map (entry, *try_formats, &value)) { /* lookup succeeded, create the seek */ @@ -622,10 +623,9 @@ gst_format_get_details (*try_formats)->nick, value); - GstEvent *seek_event = - gst_event_new_seek (*try_formats | - GST_SEEK_METHOD_SET | - GST_SEEK_FLAG_FLUSH, value); + seek_event = gst_event_new_seek (*try_formats | + GST_SEEK_METHOD_SET | + GST_SEEK_FLAG_FLUSH, value); if (gst_pad_send_event (GST_PAD_PEER (mad->sinkpad), seek_event)) { /* seek worked, we're done, loop will exit */ |
From: Ronald B. <rb...@us...> - 2003-12-15 08:52:29
|
CVS Root: /cvsroot/gstreamer Module: gst-plugins Changes by: rbultje Date: Mon Dec 15 2003 00:52:28 PST Log message: Fix crasher (#129287) Modified files: ext/mad : gstmad.c Links: http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/mad/gstmad.c.diff?r1=1.78&r2=1.79 ====Begin Diffs==== Index: gstmad.c =================================================================== RCS file: /cvsroot/gstreamer/gst-plugins/ext/mad/gstmad.c,v retrieving revision 1.78 retrieving revision 1.79 diff -u -d -r1.78 -r1.79 --- gstmad.c 9 Dec 2003 16:33:52 -0000 1.78 +++ gstmad.c 15 Dec 2003 08:52:16 -0000 1.79 @@ -241,6 +241,7 @@ {MAD_EMPHASIS_NONE, "0", "None"}, {MAD_EMPHASIS_50_15_US, "1", "50/15 Microseconds"}, {MAD_EMPHASIS_CCITT_J_17, "2", "CCITT J.17"}, + {MAD_EMPHASIS_RESERVED, "3", "Reserved"}, { 0, NULL, NULL}, }; if (!mad_emphasis_type) { |