mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-03 15:06:34 +00:00
Code Issues 1 Projects Releases Wiki Activity

Fixes: #151879, #151881, #151882, #151883, #151884, #151886, #151887, #152102, #152247.

Browse source 
Original commit message from CVS:
Fixes: #151879, #151881, #151882, #151883, #151884, #151886,
#151887, #152102, #152247.
* examples/indexing/indexmpeg.c: 64-bit warning fixes.
* examples/seeking/cdparanoia.c: same
* examples/seeking/cdplayer.c: same
* examples/seeking/seek.c: same
* examples/seeking/spider_seek.c: same
* examples/seeking/vorbisfile.c: same
* examples/stats/mp2ogg.c: same
* ext/esd/esdsink.c: (gst_esdsink_class_init),
(gst_esdsink_dispose): Dispose of element properly.
* ext/ivorbis/vorbisfile.c: (gst_ivorbisfile_seek): 64-bit warning
fixes.
* ext/nas/nassink.c: (gst_nassink_class_init),
(gst_nassink_dispose): Dispose of element correctly.
* gst/wavenc/gstwavenc.c: (gst_wavenc_chain): Fix leak.
* sys/ximage/ximagesink.c: (gst_ximagesink_check_xshm_calls),
(gst_ximagesink_ximage_new), (gst_ximagesink_ximage_destroy):
Fix 64-bit warning.
* sys/xvimage/xvimagesink.c: (gst_xvimagesink_check_xshm_calls),
(gst_xvimagesink_xvimage_new), (gst_xvimagesink_xvimage_destroy):
Fix 64-bit warning.
This commit is contained in:
David Schleef 2004-09-12 22:57:26 +00:00
parent 8dfcf043e5
commit 9d7603d00d
8 changed files with 75 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
ChangeLog
View file

@ -1,3 +1,28 @@
2004-09-12 David Schleef <ds@schleef.org>
Fixes: #151879, #151881, #151882, #151883, #151884, #151886,
#151887, #152102, #152247.
* examples/indexing/indexmpeg.c: 64-bit warning fixes.
* examples/seeking/cdparanoia.c: same
* examples/seeking/cdplayer.c: same
* examples/seeking/seek.c: same
* examples/seeking/spider_seek.c: same
* examples/seeking/vorbisfile.c: same
* examples/stats/mp2ogg.c: same
* ext/esd/esdsink.c: (gst_esdsink_class_init),
(gst_esdsink_dispose): Dispose of element properly.
* ext/ivorbis/vorbisfile.c: (gst_ivorbisfile_seek): 64-bit warning
fixes.
* ext/nas/nassink.c: (gst_nassink_class_init),
(gst_nassink_dispose): Dispose of element correctly.
* gst/wavenc/gstwavenc.c: (gst_wavenc_chain): Fix leak.
* sys/ximage/ximagesink.c: (gst_ximagesink_check_xshm_calls),
(gst_ximagesink_ximage_new), (gst_ximagesink_ximage_destroy):
Fix 64-bit warning.
* sys/xvimage/xvimagesink.c: (gst_xvimagesink_check_xshm_calls),
(gst_xvimagesink_xvimage_new), (gst_xvimagesink_xvimage_destroy):
Fix 64-bit warning.
2004-09-12 Stephane Loeuillet <stephane.loeuillet@tiscali.fr> 2004-09-12 Stephane Loeuillet <stephane.loeuillet@tiscali.fr>
* configure.ac : change speex detection as 1.1.6 now uses * configure.ac : change speex detection as 1.1.6 now uses

2
examples/indexing/indexmpeg.c
View file

@ -42,7 +42,7 @@ entry_added (GstIndex * index, GstIndexEntry * entry)
g_print ("%p, %d: %08x ", entry, entry->id, g_print ("%p, %d: %08x ", entry, entry->id,
GST_INDEX_ASSOC_FLAGS (entry)); GST_INDEX_ASSOC_FLAGS (entry));
for (i = 0; i < GST_INDEX_NASSOCS (entry); i++) { for (i = 0; i < GST_INDEX_NASSOCS (entry); i++) {
g_print ("%d %lld ", GST_INDEX_ASSOC_FORMAT (entry, i), g_print ("%d %" G_GINT64_FORMAT " ", GST_INDEX_ASSOC_FORMAT (entry, i),
GST_INDEX_ASSOC_VALUE (entry, i)); GST_INDEX_ASSOC_VALUE (entry, i));
} }
g_print ("\n"); g_print ("\n");

16
examples/seeking/cdparanoia.c
View file

@ -28,10 +28,10 @@ get_position_info (GstElement * cdparanoia)
if (format == GST_FORMAT_TIME) { if (format == GST_FORMAT_TIME) {
position /= GST_SECOND; position /= GST_SECOND;
g_print ("%s: %lld:%02lld", definition->nick, position / 60, g_print ("%s: %" G_GINT64_FORMAT ":%02" G_GINT64_FORMAT,
position % 60); definition->nick, position / 60, position % 60);
} else { } else {
g_print ("%s: %lld", definition->nick, position); g_print ("%s: %" G_GINT64_FORMAT, definition->nick, position);
} }
formats++; formats++;
@ -73,10 +73,10 @@ get_track_info (GstElement * cdparanoia)
if (res) { if (res) {
if (format == GST_FORMAT_TIME) { if (format == GST_FORMAT_TIME) {
total /= GST_SECOND; total /= GST_SECOND;
g_print ("%s total: %lld:%02lld\n", definition->nick, total / 60, g_print ("%s total: %" G_GINT64_FORMAT ":%02" G_GINT64_FORMAT "\n",
total % 60); definition->nick, total / 60, total % 60);
} else } else
g_print ("%s total: %lld\n", definition->nick, total); g_print ("%s total: %" G_GINT64_FORMAT "\n", definition->nick, total);
if (format == track_format) if (format == track_format)
total_tracks = total; total_tracks = total;
@ -112,7 +112,9 @@ get_track_info (GstElement * cdparanoia)
if (i > 0) { if (i > 0) {
gint64 length = time - time_count; gint64 length = time - time_count;
g_print ("track %d: %lld:%02lld -> %lld:%02lld, length: %lld:%02lld\n", g_print ("track %d: %" G_GINT64_FORMAT ":%02" G_GINT64_FORMAT
" -> %" G_GINT64_FORMAT ":%02" G_GINT64_FORMAT ", length: %"
G_GINT64_FORMAT ":%02" G_GINT64_FORMAT "\n",
i - 1, i - 1,
time_count / 60, time_count % 60, time_count / 60, time_count % 60,
time / 60, time % 60, length / 60, length % 60); time / 60, time % 60, length / 60, length % 60);

16
examples/seeking/cdplayer.c
View file

@ -39,8 +39,8 @@ format_value (GtkScale * scale, gdouble value)
seconds = (gint64) real / GST_SECOND; seconds = (gint64) real / GST_SECOND;
subseconds = (gint64) real / (GST_SECOND / 100); subseconds = (gint64) real / (GST_SECOND / 100);
return g_strdup_printf ("%02lld:%02lld:%02lld", return g_strdup_printf ("%02" G_GINT64_FORMAT ":%02" G_GINT64_FORMAT ":%02"
seconds / 60, seconds % 60, subseconds % 100); G_GINT64_FORMAT, seconds / 60, seconds % 60, subseconds % 100);
} }
typedef struct typedef struct
@ -77,7 +77,7 @@ query_durations ()
format = seek_formats[i].format; format = seek_formats[i].format;
res = gst_element_query (element, GST_QUERY_TOTAL, &format, &value); res = gst_element_query (element, GST_QUERY_TOTAL, &format, &value);
if (res) { if (res) {
g_print ("%s %13lld | ", seek_formats[i].name, value); g_print ("%s %13" G_GINT64_FORMAT " | ", seek_formats[i].name, value);
} else { } else {
g_print ("%s %13.13s | ", seek_formats[i].name, "*NA*"); g_print ("%s %13.13s | ", seek_formats[i].name, "*NA*");
} }
@ -106,7 +106,7 @@ query_positions ()
format = seek_formats[i].format; format = seek_formats[i].format;
res = gst_element_query (element, GST_QUERY_POSITION, &format, &value); res = gst_element_query (element, GST_QUERY_POSITION, &format, &value);
if (res) { if (res) {
g_print ("%s %13lld | ", seek_formats[i].name, value); g_print ("%s %13" G_GINT64_FORMAT " | ", seek_formats[i].name, value);
} else { } else {
g_print ("%s %13.13s | ", seek_formats[i].name, "*NA*"); g_print ("%s %13.13s | ", seek_formats[i].name, "*NA*");
} }
@ -183,9 +183,11 @@ stop_seek (GtkWidget * widget, GdkEventButton * event, gpointer user_data)
while (walk) { while (walk) {
GstElement *seekable = GST_ELEMENT (walk->data); GstElement *seekable = GST_ELEMENT (walk->data);
g_print ("seek to %lld on element %s\n", real, GST_ELEMENT_NAME (seekable)); g_print ("seek to %" G_GINT64_FORMAT " on element %s\n", real,
s_event = gst_event_new_seek (GST_FORMAT_TIME | GST_ELEMENT_NAME (seekable));
GST_SEEK_METHOD_SET | GST_SEEK_FLAG_FLUSH, real); s_event =
gst_event_new_seek (GST_FORMAT_TIME | GST_SEEK_METHOD_SET |
GST_SEEK_FLAG_FLUSH, real);
res = gst_element_send_event (seekable, s_event); res = gst_element_send_event (seekable, s_event);

18
examples/seeking/seek.c
View file

@ -580,8 +580,8 @@ format_value (GtkScale * scale, gdouble value)
seconds = (gint64) real / GST_SECOND; seconds = (gint64) real / GST_SECOND;
subseconds = (gint64) real / (GST_SECOND / 100); subseconds = (gint64) real / (GST_SECOND / 100);
return g_strdup_printf ("%02lld:%02lld:%02lld", return g_strdup_printf ("%02" G_GINT64_FORMAT ":%02" G_GINT64_FORMAT ":%02"
seconds / 60, seconds % 60, subseconds % 100); G_GINT64_FORMAT, seconds / 60, seconds % 60, subseconds % 100);
} }
typedef struct typedef struct
@ -616,7 +616,7 @@ query_rates (void)
format = seek_formats[i].format; format = seek_formats[i].format;
if (gst_pad_convert (pad, GST_FORMAT_TIME, GST_SECOND, &format, &value)) { if (gst_pad_convert (pad, GST_FORMAT_TIME, GST_SECOND, &format, &value)) {
g_print ("%s %13lld | ", seek_formats[i].name, value); g_print ("%s %13" G_GINT64_FORMAT " | ", seek_formats[i].name, value);
} else { } else {
g_print ("%s %13.13s | ", seek_formats[i].name, "*NA*"); g_print ("%s %13.13s | ", seek_formats[i].name, "*NA*");
} }
@ -647,7 +647,7 @@ query_durations_elems ()
format = seek_formats[i].format; format = seek_formats[i].format;
res = gst_element_query (element, GST_QUERY_TOTAL, &format, &value); res = gst_element_query (element, GST_QUERY_TOTAL, &format, &value);
if (res) { if (res) {
g_print ("%s %13lld | ", seek_formats[i].name, value); g_print ("%s %13" G_GINT64_FORMAT " | ", seek_formats[i].name, value);
} else { } else {
g_print ("%s %13.13s | ", seek_formats[i].name, "*NA*"); g_print ("%s %13.13s | ", seek_formats[i].name, "*NA*");
} }
@ -677,7 +677,7 @@ query_durations_pads ()
format = seek_formats[i].format; format = seek_formats[i].format;
res = gst_pad_query (pad, GST_QUERY_TOTAL, &format, &value); res = gst_pad_query (pad, GST_QUERY_TOTAL, &format, &value);
if (res) { if (res) {
g_print ("%s %13lld | ", seek_formats[i].name, value); g_print ("%s %13" G_GINT64_FORMAT " | ", seek_formats[i].name, value);
} else { } else {
g_print ("%s %13.13s | ", seek_formats[i].name, "*NA*"); g_print ("%s %13.13s | ", seek_formats[i].name, "*NA*");
} }
@ -707,7 +707,7 @@ query_positions_elems ()
format = seek_formats[i].format; format = seek_formats[i].format;
res = gst_element_query (element, GST_QUERY_POSITION, &format, &value); res = gst_element_query (element, GST_QUERY_POSITION, &format, &value);
if (res) { if (res) {
g_print ("%s %13lld | ", seek_formats[i].name, value); g_print ("%s %13" G_GINT64_FORMAT " | ", seek_formats[i].name, value);
} else { } else {
g_print ("%s %13.13s | ", seek_formats[i].name, "*NA*"); g_print ("%s %13.13s | ", seek_formats[i].name, "*NA*");
} }
@ -737,7 +737,7 @@ query_positions_pads ()
format = seek_formats[i].format; format = seek_formats[i].format;
res = gst_pad_query (pad, GST_QUERY_POSITION, &format, &value); res = gst_pad_query (pad, GST_QUERY_POSITION, &format, &value);
if (res) { if (res) {
g_print ("%s %13lld | ", seek_formats[i].name, value); g_print ("%s %13" G_GINT64_FORMAT " | ", seek_formats[i].name, value);
} else { } else {
g_print ("%s %13.13s | ", seek_formats[i].name, "*NA*"); g_print ("%s %13.13s | ", seek_formats[i].name, "*NA*");
} }
@ -851,7 +851,7 @@ stop_seek (GtkWidget * widget, GdkEventButton * event, gpointer user_data)
while (walk) { while (walk) {
GstPad *seekable = GST_PAD (walk->data); GstPad *seekable = GST_PAD (walk->data);
g_print ("seek to %lld on pad %s:%s\n", real, g_print ("seek to %" G_GINT64_FORMAT " on pad %s:%s\n", real,
GST_DEBUG_PAD_NAME (seekable)); GST_DEBUG_PAD_NAME (seekable));
s_event = s_event =
gst_event_new_seek (GST_FORMAT_TIME | GST_SEEK_METHOD_SET | gst_event_new_seek (GST_FORMAT_TIME | GST_SEEK_METHOD_SET |
@ -867,7 +867,7 @@ stop_seek (GtkWidget * widget, GdkEventButton * event, gpointer user_data)
while (walk) { while (walk) {
GstElement *seekable = GST_ELEMENT (walk->data); GstElement *seekable = GST_ELEMENT (walk->data);
g_print ("seek to %lld on element %s\n", real, g_print ("seek to %" G_GINT64_FORMAT " on element %s\n", real,
gst_element_get_name (seekable)); gst_element_get_name (seekable));
s_event = s_event =
gst_event_new_seek (GST_FORMAT_TIME | GST_SEEK_METHOD_SET | gst_event_new_seek (GST_FORMAT_TIME | GST_SEEK_METHOD_SET |

18
examples/seeking/spider_seek.c
View file

@ -83,8 +83,8 @@ format_value (GtkScale * scale, gdouble value)
seconds = (gint64) real / GST_SECOND; seconds = (gint64) real / GST_SECOND;
subseconds = (gint64) real / (GST_SECOND / 100); subseconds = (gint64) real / (GST_SECOND / 100);
return g_strdup_printf ("%02lld:%02lld:%02lld", return g_strdup_printf ("%02" G_GINT64_FORMAT ":%02" G_GINT64_FORMAT ":%02"
seconds / 60, seconds % 60, subseconds % 100); G_GINT64_FORMAT, seconds / 60, seconds % 60, subseconds % 100);
} }
typedef struct typedef struct
@ -119,7 +119,7 @@ query_rates (void)
format = seek_formats[i].format; format = seek_formats[i].format;
if (gst_pad_convert (pad, GST_FORMAT_TIME, GST_SECOND, &format, &value)) { if (gst_pad_convert (pad, GST_FORMAT_TIME, GST_SECOND, &format, &value)) {
g_print ("%s %13lld | ", seek_formats[i].name, value); g_print ("%s %13" G_GINT64_FORMAT " | ", seek_formats[i].name, value);
} else { } else {
g_print ("%s %13.13s | ", seek_formats[i].name, "*NA*"); g_print ("%s %13.13s | ", seek_formats[i].name, "*NA*");
} }
@ -150,7 +150,7 @@ query_durations ()
format = seek_formats[i].format; format = seek_formats[i].format;
res = gst_element_query (element, GST_QUERY_TOTAL, &format, &value); res = gst_element_query (element, GST_QUERY_TOTAL, &format, &value);
if (res) { if (res) {
g_print ("%s %13lld | ", seek_formats[i].name, value); g_print ("%s %13" G_GINT64_FORMAT " | ", seek_formats[i].name, value);
} else { } else {
g_print ("%s %13.13s | ", seek_formats[i].name, "*NA*"); g_print ("%s %13.13s | ", seek_formats[i].name, "*NA*");
} }
@ -179,7 +179,7 @@ query_positions ()
format = seek_formats[i].format; format = seek_formats[i].format;
res = gst_element_query (element, GST_QUERY_POSITION, &format, &value); res = gst_element_query (element, GST_QUERY_POSITION, &format, &value);
if (res) { if (res) {
g_print ("%s %13lld | ", seek_formats[i].name, value); g_print ("%s %13" G_GINT64_FORMAT " | ", seek_formats[i].name, value);
} else { } else {
g_print ("%s %13.13s | ", seek_formats[i].name, "*NA*"); g_print ("%s %13.13s | ", seek_formats[i].name, "*NA*");
} }
@ -254,9 +254,11 @@ stop_seek (GtkWidget * widget, GdkEventButton * event, gpointer user_data)
while (walk) { while (walk) {
GstElement *seekable = GST_ELEMENT (walk->data); GstElement *seekable = GST_ELEMENT (walk->data);
g_print ("seek to %lld on element %s\n", real, GST_ELEMENT_NAME (seekable)); g_print ("seek to %" G_GINT64_FORMAT " on element %s\n", real,
s_event = gst_event_new_seek (GST_FORMAT_TIME | GST_ELEMENT_NAME (seekable));
GST_SEEK_METHOD_SET | GST_SEEK_FLAG_FLUSH, real); s_event =
gst_event_new_seek (GST_FORMAT_TIME | GST_SEEK_METHOD_SET |
GST_SEEK_FLAG_FLUSH, real);
res = gst_element_send_event (seekable, s_event); res = gst_element_send_event (seekable, s_event);

14
examples/seeking/vorbisfile.c
View file

@ -75,10 +75,11 @@ print_lbs_info (struct probe_context *context, gint stream)
if (format == GST_FORMAT_TIME) { if (format == GST_FORMAT_TIME) {
value_end /= (GST_SECOND / 100); value_end /= (GST_SECOND / 100);
g_print (" %s: %lld:%02lld.%02lld\n", definition->nick, g_print (" %s: %" G_GINT64_FORMAT ":%02" G_GINT64_FORMAT ".%02"
value_end / 6000, (value_end / 100) % 60, (value_end % 100)); G_GINT64_FORMAT "\n", definition->nick, value_end / 6000,
(value_end / 100) % 60, (value_end % 100));
} else { } else {
g_print (" %s: %lld\n", definition->nick, value_end); g_print (" %s: %" G_GINT64_FORMAT "\n", definition->nick, value_end);
} }
} else } else
g_print (" could not get logical stream %s\n", definition->nick); g_print (" could not get logical stream %s\n", definition->nick);
@ -181,12 +182,13 @@ collect_stream_properties (struct probe_context *context)
if (res) { if (res) {
if (format == GST_FORMAT_TIME) { if (format == GST_FORMAT_TIME) {
value /= (GST_SECOND / 100); value /= (GST_SECOND / 100);
g_print (" total %s: %lld:%02lld.%02lld\n", definition->nick, g_print (" total %s: %" G_GINT64_FORMAT ":%02" G_GINT64_FORMAT ".%02"
value / 6000, (value / 100) % 60, (value % 100)); G_GINT64_FORMAT "\n", definition->nick, value / 6000,
(value / 100) % 60, (value % 100));
} else { } else {
if (format == context->ls_format) if (format == context->ls_format)
context->total_ls = value; context->total_ls = value;
g_print (" total %s: %lld\n", definition->nick, value); g_print (" total %s: %" G_GINT64_FORMAT "\n", definition->nick, value);
} }
} }
} }

7
examples/stats/mp2ogg.c
View file

@ -86,12 +86,13 @@ main (gint argc, gchar * argv[])
&format, &bitrate_dec); &format, &bitrate_dec);
g_print ("[%2dm %.2ds] of [%2dm %.2ds], " g_print ("[%2dm %.2ds] of [%2dm %.2ds], "
"src avg bitrate: %lld, dest avg birate: %lld, ratio [%02.2f] \r", "src avg bitrate: %" G_GINT64_FORMAT ", dest avg birate: %"
G_GINT64_FORMAT ", ratio [%02.2f] \r",
(gint) (position / (GST_SECOND * 60)), (gint) (position / (GST_SECOND * 60)),
(gint) (position / (GST_SECOND)) % 60, (gint) (position / (GST_SECOND)) % 60,
(gint) (duration / (GST_SECOND * 60)), (gint) (duration / (GST_SECOND * 60)),
(gint) (duration / (GST_SECOND)) % 60, (gint) (duration / (GST_SECOND)) % 60, bitrate_dec, bitrate_enc,
bitrate_dec, bitrate_enc, (gfloat) bitrate_dec / bitrate_enc); (gfloat) bitrate_dec / bitrate_enc);
} }
g_print ("\n"); g_print ("\n");