diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2010-06-08 11:31:35 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2010-06-08 11:31:35 +0200 |
| commit | aa8daa862ec1e1723a4d5236f0de7b97b77d4479 (patch) | |
| tree | 472b99f624b45d18578599440c8d6da9af125286 | |
| parent | 7eea3c25c9c4e0df6a2386da7acc372afe6d0862 (diff) | |
oggdemux: Parse Skeleton stream major/minor version
| -rw-r--r-- | ext/ogg/gstoggstream.c | 12 | ||||
| -rw-r--r-- | ext/ogg/gstoggstream.h | 1 |
2 files changed, 10 insertions, 3 deletions
diff --git a/ext/ogg/gstoggstream.c b/ext/ogg/gstoggstream.c index ecf1dcf50..447f8763c 100644 --- a/ext/ogg/gstoggstream.c +++ b/ext/ogg/gstoggstream.c @@ -830,7 +830,12 @@ setup_fishead_mapper (GstOggStream * pad, ogg_packet * packet) data = packet->packet; - data += 8 + 2 + 2; /* header + major/minor version */ + data += 8; /* header */ + + pad->skeleton_major = GST_READ_UINT16_LE (data); + data += 2; + pad->skeleton_minor = GST_READ_UINT16_LE (data); + data += 2; prestime_n = (gint64) GST_READ_UINT64_LE (data); data += 8; @@ -891,8 +896,9 @@ setup_fishead_mapper (GstOggStream * pad, ogg_packet * packet) pad->total_time = -1; } - GST_INFO ("skeleton fishead parsed (basetime: %" GST_TIME_FORMAT - ", prestime: %" GST_TIME_FORMAT ")", GST_TIME_ARGS (pad->basetime), + GST_INFO ("skeleton fishead %u.%u parsed (basetime: %" GST_TIME_FORMAT + ", prestime: %" GST_TIME_FORMAT ")", pad->skeleton_major, + pad->skeleton_minor, GST_TIME_ARGS (pad->basetime), GST_TIME_ARGS (pad->prestime)); pad->is_skeleton = TRUE; diff --git a/ext/ogg/gstoggstream.h b/ext/ogg/gstoggstream.h index 162261253..5903b611b 100644 --- a/ext/ogg/gstoggstream.h +++ b/ext/ogg/gstoggstream.h @@ -85,6 +85,7 @@ struct _GstOggStream gboolean is_ogm; gboolean is_ogm_text; /* fishead stuff */ + guint16 skeleton_major, skeleton_minor; gint64 prestime; gint64 basetime; /* index */ |