From 2add92153f3de3a539f9c63f4b2bedd7a759a709 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Moutte?= Date: Sat, 29 Sep 2007 17:11:16 +0000 Subject: [PATCH] gst/mpegaudioparse/gstmpegaudioparse.c: Use gst_util_guint64_to_gdouble for conversions. Original commit message from CVS: * gst/mpegaudioparse/gstmpegaudioparse.c: (mp3parse_time_to_bytepos), (mp3parse_bytepos_to_time): Use gst_util_guint64_to_gdouble for conversions. * win32/vs6/libgstmad.dsp: Add a link to libgstaudio. --- ChangeLog | 8 ++++++++ gst/mpegaudioparse/gstmpegaudioparse.c | 7 +++++-- win32/vs6/libgstmad.dsp | 4 ++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 86bc96c..61c9fc2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-09-29 Sebastien Moutte + + * gst/mpegaudioparse/gstmpegaudioparse.c: (mp3parse_time_to_bytepos), + (mp3parse_bytepos_to_time): + Use gst_util_guint64_to_gdouble for conversions. + * win32/vs6/libgstmad.dsp: + Add a link to libgstaudio. + 2007-09-26 Tim-Philipp Müller * ext/lame/gstlame.c: diff --git a/gst/mpegaudioparse/gstmpegaudioparse.c b/gst/mpegaudioparse/gstmpegaudioparse.c index 2b57ef8..1659cd6 100644 --- a/gst/mpegaudioparse/gstmpegaudioparse.c +++ b/gst/mpegaudioparse/gstmpegaudioparse.c @@ -29,6 +29,7 @@ GST_DEBUG_CATEGORY_STATIC (mp3parse_debug); #define GST_CAT_DEFAULT mp3parse_debug + /* elementfactory information */ static GstElementDetails mp3parse_details = { "MPEG1 Audio Parser", @@ -1176,7 +1177,9 @@ mp3parse_time_to_bytepos (GstMPEGAudioParse * mp3parse, GstClockTime ts, mp3parse_total_bytes (mp3parse, &total_bytes) && mp3parse_total_time (mp3parse, &total_time)) { gdouble fa, fb, fx; - gdouble percent = CLAMP ((100.0 * ts) / total_time, 0.0, 100.0); + gdouble percent = + CLAMP ((100.0 * gst_util_guint64_to_gdouble (ts)) / + gst_util_guint64_to_gdouble (total_time), 0.0, 100.0); gint index = CLAMP (percent, 0, 99); fa = mp3parse->xing_seek_table[index]; @@ -1236,7 +1239,7 @@ mp3parse_bytepos_to_time (GstMPEGAudioParse * mp3parse, fx = fa + (fb - fa) * (pos - index); - *ts = (1.0 / 10000.0) * fx * total_time; + *ts = (1.0 / 10000.0) * fx * gst_util_guint64_to_gdouble (total_time); return TRUE; } diff --git a/win32/vs6/libgstmad.dsp b/win32/vs6/libgstmad.dsp index 1df20f3..1752cd9 100644 --- a/win32/vs6/libgstmad.dsp +++ b/win32/vs6/libgstmad.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 -# ADD LINK32 zlib.lib libid3tag.lib libmad.lib libgsttag-0.10.lib libgstreamer-0.10.lib libgstbase-0.10.lib glib-2.0.lib gobject-2.0.lib /nologo /dll /machine:I386 /libpath:"../../../gstreamer/win32/vs6/release" /libpath:"./release" /libpath:"../../../gst-plugins-base/win32/vs6/release" +# ADD LINK32 glib-2.0.lib gobject-2.0.lib zlib.lib libid3tag.lib libmad.lib libgsttag-0.10.lib libgstreamer-0.10.lib libgstbase-0.10.lib libgstaudio-0.10.lib /nologo /dll /machine:I386 /libpath:"../../../gstreamer/win32/vs6/release" /libpath:"./release" /libpath:"../../../gst-plugins-base/win32/vs6/release" # Begin Special Build Tool TargetPath=.\Release\libgstmad.dll SOURCE="$(InputPath)" @@ -86,7 +86,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 zlib.lib libid3tag.lib libmad.lib libgsttag-0.10.lib libgstreamer-0.10.lib libgstbase-0.10.lib glib-2.0D.lib gobject-2.0D.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"../../../gstreamer/win32/vs6/debug" /libpath:"./debug" /libpath:"../../../gst-plugins-base/win32/vs6/debug" +# ADD LINK32 glib-2.0D.lib gobject-2.0D.lib zlib.lib libid3tag.lib libmad.lib libgsttag-0.10.lib libgstreamer-0.10.lib libgstbase-0.10.lib libgstaudio-0.10.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"../../../gstreamer/win32/vs6/debug" /libpath:"./debug" /libpath:"../../../gst-plugins-base/win32/vs6/debug" # Begin Special Build Tool TargetPath=.\Debug\libgstmad.dll SOURCE="$(InputPath)" -- 2.7.4