diff options
| author | Edward Hervey <edward@centricular.com> | 2017-11-05 12:15:33 +0100 |
|---|---|---|
| committer | Edward Hervey <bilboed@bilboed.com> | 2017-12-01 10:02:03 +0100 |
| commit | ea4d9256a35a6b49dfd5e708f459da10f2474866 (patch) | |
| tree | 561976ef41ef6f6e66b90f76efb17089a3207947 | |
| parent | 3266de8d8d07b2447cfc87e00c3bffc1e775bd1f (diff) | |
| download | gstreamer-plugins-base-ea4d9256a35a6b49dfd5e708f459da10f2474866.tar.gz | |
oggstream: More fixes for invalid granuleshift
Don't use granuleshift if it wasn't set
| -rw-r--r-- | ext/ogg/gstoggstream.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ext/ogg/gstoggstream.c b/ext/ogg/gstoggstream.c index 5577ef39c..d2c38c7b1 100644 --- a/ext/ogg/gstoggstream.c +++ b/ext/ogg/gstoggstream.c @@ -172,7 +172,7 @@ gst_ogg_stream_granulepos_to_key_granule (GstOggStream * pad, gint64 granulepos) if (mappers[pad->map].granulepos_to_key_granule_func) return mappers[pad->map].granulepos_to_key_granule_func (pad, granulepos); - if (granulepos == -1 || granulepos == 0) { + if (granulepos == -1 || granulepos == 0 || pad->granuleshift == G_MAXUINT32) { return granulepos; } @@ -311,7 +311,7 @@ granulepos_to_granule_default (GstOggStream * pad, gint64 granulepos) { gint64 keyindex, keyoffset; - if (pad->granuleshift != 0 && pad->granuleshift != -1) { + if (pad->granuleshift != 0 && pad->granuleshift != G_MAXUINT32) { keyindex = granulepos >> pad->granuleshift; keyoffset = granulepos - (keyindex << pad->granuleshift); return keyindex + keyoffset; @@ -327,7 +327,7 @@ granule_to_granulepos_default (GstOggStream * pad, gint64 granule, { gint64 keyoffset; - if (pad->granuleshift != 0 && pad->granuleshift != -1) { + if (pad->granuleshift != 0 && pad->granuleshift != G_MAXUINT32) { /* If we don't know where the previous keyframe is yet, assume it is at 0 or 1, depending on bitstream version. If nothing else, this avoids getting negative granpos back. */ @@ -478,7 +478,7 @@ granulepos_to_granule_theora (GstOggStream * pad, gint64 granulepos) { gint64 keyindex, keyoffset; - if (pad->granuleshift != 0) { + if (pad->granuleshift != 0 && pad->granuleshift != G_MAXUINT32) { keyindex = granulepos >> pad->granuleshift; keyoffset = granulepos - (keyindex << pad->granuleshift); if (pad->theora_has_zero_keyoffset) { @@ -495,7 +495,7 @@ is_granulepos_keyframe_theora (GstOggStream * pad, gint64 granulepos) { gint64 frame_mask; - if (granulepos == (gint64) - 1) + if (granulepos == (gint64) - 1 || pad->granuleshift == G_MAXUINT32) return FALSE; frame_mask = (G_GUINT64_CONSTANT (1) << pad->granuleshift) - 1; @@ -2193,7 +2193,7 @@ granulepos_to_granule_daala (GstOggStream * pad, gint64 granulepos) { gint64 keyindex, keyoffset; - if (pad->granuleshift != 0) { + if (pad->granuleshift != 0 && pad->granuleshift != G_MAXUINT32) { keyindex = granulepos >> pad->granuleshift; keyoffset = granulepos - (keyindex << pad->granuleshift); return keyindex + keyoffset; @@ -2207,7 +2207,7 @@ is_granulepos_keyframe_daala (GstOggStream * pad, gint64 granulepos) { gint64 frame_mask; - if (granulepos == (gint64) - 1) + if (granulepos == (gint64) - 1 || pad->granuleshift == G_MAXUINT32) return FALSE; frame_mask = (G_GUINT64_CONSTANT (1) << pad->granuleshift) - 1; |