FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

oggstream: Implement latest version of the Skeleton 4.0 spec

Browse Source 
Fixes bug #620939.
This commit is contained in:
Sebastian Dröge 2010-06-09 16:33:25 +02:00
parent 487c88ca42
commit 7bade30f5e
1 changed files with 18 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
ext/ogg/gstoggstream.c
View File

@ -1047,48 +1047,30 @@ gst_ogg_map_add_index (GstOggStream * pad, GstOggStream * skel_pad,
data += 8; data += 8;
size -= 8; size -= 8;
if (skel_pad->skeleton_major == 3) { pad->kp_denom = GST_READ_UINT64_LE (data);
pad->kp_denom = GST_READ_UINT64_LE (data); if (pad->kp_denom == 0)
if (pad->kp_denom == 0) pad->kp_denom = 1;
pad->kp_denom = 1;
data += 8; data += 8;
size -= 8; size -= 8;
} else if (skel_pad->skeleton_major == 4) {
gint64 firstsampletime_n, firstsampletime_d; if (skel_pad->skeleton_major == 4) {
gint64 lastsampletime_n, lastsampletime_d; gint64 firstsampletime_n;
gint64 lastsampletime_n;
gint64 firstsampletime, lastsampletime; gint64 firstsampletime, lastsampletime;
firstsampletime_n = GST_READ_UINT64_LE (data + 0); firstsampletime_n = GST_READ_UINT64_LE (data + 0);
firstsampletime_d = GST_READ_UINT64_LE (data + 8); lastsampletime_n = GST_READ_UINT64_LE (data + 8);
lastsampletime_n = GST_READ_UINT64_LE (data + 16);
lastsampletime_d = GST_READ_UINT64_LE (data + 24);
/* FIXME: What's in this gap? Also http://github.com/cpearce/OggIndex
* and http://wiki.xiph.org/Ogg_Skeleton_4 disagree on the content
* and format of the index pages. This implements the former because
* files using this actually exist... */
pad->kp_denom = GST_READ_UINT64_LE (data + 36);
if (pad->kp_denom == 0)
pad->kp_denom = 1;
GST_INFO ("firstsampletime %" G_GUINT64_FORMAT "/%" G_GUINT64_FORMAT, GST_INFO ("firstsampletime %" G_GUINT64_FORMAT "/%" G_GUINT64_FORMAT,
firstsampletime_n, firstsampletime_d); firstsampletime_n, pad->kp_denom);
GST_INFO ("lastsampletime %" G_GUINT64_FORMAT "/%" G_GUINT64_FORMAT, GST_INFO ("lastsampletime %" G_GUINT64_FORMAT "/%" G_GUINT64_FORMAT,
lastsampletime_n, lastsampletime_d); lastsampletime_n, pad->kp_denom);
if (firstsampletime_d > 0) firstsampletime = gst_util_uint64_scale (GST_SECOND,
firstsampletime = gst_util_uint64_scale (GST_SECOND, firstsampletime_n, pad->kp_denom);
firstsampletime_n, firstsampletime_d); lastsampletime = gst_util_uint64_scale (GST_SECOND,
else lastsampletime_n, pad->kp_denom);
firstsampletime = 0;
if (lastsampletime_d > 0)
lastsampletime = gst_util_uint64_scale (GST_SECOND,
lastsampletime_n, lastsampletime_d);
else
lastsampletime = 0;
if (lastsampletime > firstsampletime) if (lastsampletime > firstsampletime)
pad->total_time = lastsampletime - firstsampletime; pad->total_time = lastsampletime - firstsampletime;
@ -1098,8 +1080,8 @@ gst_ogg_map_add_index (GstOggStream * pad, GstOggStream * skel_pad,
GST_INFO ("skeleton index parsed total: %" GST_TIME_FORMAT, GST_INFO ("skeleton index parsed total: %" GST_TIME_FORMAT,
GST_TIME_ARGS (pad->total_time)); GST_TIME_ARGS (pad->total_time));
data += 44; data += 16;
size -= 44; size -= 16;
} }
GST_INFO ("skeleton index has %" G_GUINT64_FORMAT " keypoints, denom: %" GST_INFO ("skeleton index has %" G_GUINT64_FORMAT " keypoints, denom: %"