mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-23 18:21:04 +00:00
Code Issues 1 Projects Releases Wiki Activity

mpegaudioparse: use metadata (xing, vbri) provided bytesize for conversions

Browse source 
Metadata provided seek tables are consistent with metadata's view of
total size, which typically matches real size, but need not do so
(e.g. a truncated file).  Fixes seeking and position reporting
in such truncated files (although duration based on metadata may then
still be incorrect).
This commit is contained in:
Mark Nauwelaerts 2009-08-14 12:07:40 +02:00
parent ba49058ea9
commit 52f6764e4c
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gst/mpegaudioparse/gstmpegaudioparse.c
View file

@ -1620,6 +1620,9 @@ mp3parse_time_to_bytepos (GstMPEGAudioParse * mp3parse, GstClockTime ts,
gst_util_guint64_to_gdouble (total_time), 0.0, 100.0); gst_util_guint64_to_gdouble (total_time), 0.0, 100.0);
gint index = CLAMP (percent, 0, 99); gint index = CLAMP (percent, 0, 99);
/* xing indicated size is preferred over e.g. truncated file size */
if (mp3parse->xing_bytes)
total_bytes = mp3parse->xing_bytes;
fa = mp3parse->xing_seek_table[index]; fa = mp3parse->xing_seek_table[index];
if (index < 99) if (index < 99)
fb = mp3parse->xing_seek_table[index + 1]; fb = mp3parse->xing_seek_table[index + 1];
@ -1639,6 +1642,9 @@ mp3parse_time_to_bytepos (GstMPEGAudioParse * mp3parse, GstClockTime ts,
gint i, j; gint i, j;
gdouble a, b, fa, fb; gdouble a, b, fa, fb;
/* header indicated size is preferred over e.g. truncated file size */
if (mp3parse->vbri_bytes)
total_bytes = mp3parse->vbri_bytes;
i = gst_util_uint64_scale (ts, mp3parse->vbri_seek_points - 1, total_time); i = gst_util_uint64_scale (ts, mp3parse->vbri_seek_points - 1, total_time);
i = CLAMP (i, 0, mp3parse->vbri_seek_points - 1); i = CLAMP (i, 0, mp3parse->vbri_seek_points - 1);
@ -1695,9 +1701,14 @@ mp3parse_bytepos_to_time (GstMPEGAudioParse * mp3parse,
mp3parse_total_bytes (mp3parse, &total_bytes) && mp3parse_total_bytes (mp3parse, &total_bytes) &&
mp3parse_total_time (mp3parse, &total_time)) { mp3parse_total_time (mp3parse, &total_time)) {
gdouble fa, fb, fx; gdouble fa, fb, fx;
gdouble pos = CLAMP ((bytepos * 256.0) / total_bytes, 0.0, 256.0); gdouble pos;
gint index = CLAMP (pos, 0, 255); gint index;
/* xing indicated size is preferred over e.g. truncated file size */
if (mp3parse->xing_bytes)
total_bytes = mp3parse->xing_bytes;
pos = CLAMP ((bytepos * 256.0) / total_bytes, 0.0, 256.0);
index = CLAMP (pos, 0, 255);
fa = mp3parse->xing_seek_table_inverse[index]; fa = mp3parse->xing_seek_table_inverse[index];
if (index < 255) if (index < 255)
fb = mp3parse->xing_seek_table_inverse[index + 1]; fb = mp3parse->xing_seek_table_inverse[index + 1];
@ -1718,6 +1729,9 @@ mp3parse_bytepos_to_time (GstMPEGAudioParse * mp3parse,
guint64 sum = 0; guint64 sum = 0;
gdouble a, b, fa, fb; gdouble a, b, fa, fb;
/* header indicated size is preferred over e.g. truncated file size */
if (mp3parse->vbri_bytes)
total_bytes = mp3parse->vbri_bytes;
do { do {
sum += mp3parse->vbri_seek_table[i]; sum += mp3parse->vbri_seek_table[i];
i++; i++;