mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-03-30 12:49:40 +00:00
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.
This commit is contained in:
parent
6370d24f99
commit
2add92153f
3 changed files with 15 additions and 4 deletions
|
@ -1,3 +1,11 @@
|
|||
2007-09-29 Sebastien Moutte <sebastien@moutte.net>
|
||||
|
||||
* 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 <tim at centricular dot net>
|
||||
|
||||
* ext/lame/gstlame.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;
|
||||
}
|
||||
|
|
|
@ -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)"
|
||||
|
|
Loading…
Reference in a new issue