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

oggstream: More fixes for invalid granuleshift

Browse source 
Don't use granuleshift if it wasn't set
This commit is contained in:
Edward Hervey 2017-11-05 12:15:33 +01:00 committed by Edward Hervey
parent 89238f9de1
commit 7f5ffcaa49
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ext/ogg/gstoggstream.c
View file

@ -172,7 +172,7 @@ gst_ogg_stream_granulepos_to_key_granule (GstOggStream * pad, gint64 granulepos)
if (mappers[pad->map].granulepos_to_key_granule_func) if (mappers[pad->map].granulepos_to_key_granule_func)
return mappers[pad->map].granulepos_to_key_granule_func (pad, granulepos); 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; return granulepos;
} }
@ -311,7 +311,7 @@ granulepos_to_granule_default (GstOggStream * pad, gint64 granulepos)
{ {
gint64 keyindex, keyoffset; gint64 keyindex, keyoffset;
if (pad->granuleshift != 0 && pad->granuleshift != -1) { if (pad->granuleshift != 0 && pad->granuleshift != G_MAXUINT32) {
keyindex = granulepos >> pad->granuleshift; keyindex = granulepos >> pad->granuleshift;
keyoffset = granulepos - (keyindex << pad->granuleshift); keyoffset = granulepos - (keyindex << pad->granuleshift);
return keyindex + keyoffset; return keyindex + keyoffset;
@ -327,7 +327,7 @@ granule_to_granulepos_default (GstOggStream * pad, gint64 granule,
{ {
gint64 keyoffset; 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 /* 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 at 0 or 1, depending on bitstream version. If nothing else, this
avoids getting negative granpos back. */ avoids getting negative granpos back. */
@ -478,7 +478,7 @@ granulepos_to_granule_theora (GstOggStream * pad, gint64 granulepos)
{ {
gint64 keyindex, keyoffset; gint64 keyindex, keyoffset;
if (pad->granuleshift != 0) { if (pad->granuleshift != 0 && pad->granuleshift != G_MAXUINT32) {
keyindex = granulepos >> pad->granuleshift; keyindex = granulepos >> pad->granuleshift;
keyoffset = granulepos - (keyindex << pad->granuleshift); keyoffset = granulepos - (keyindex << pad->granuleshift);
if (pad->theora_has_zero_keyoffset) { if (pad->theora_has_zero_keyoffset) {
@ -495,7 +495,7 @@ is_granulepos_keyframe_theora (GstOggStream * pad, gint64 granulepos)
{ {
gint64 frame_mask; gint64 frame_mask;
if (granulepos == (gint64) - 1) if (granulepos == (gint64) - 1 || pad->granuleshift == G_MAXUINT32)
return FALSE; return FALSE;
frame_mask = (G_GUINT64_CONSTANT (1) << pad->granuleshift) - 1; frame_mask = (G_GUINT64_CONSTANT (1) << pad->granuleshift) - 1;
@ -2182,7 +2182,7 @@ granulepos_to_granule_daala (GstOggStream * pad, gint64 granulepos)
{ {
gint64 keyindex, keyoffset; gint64 keyindex, keyoffset;
if (pad->granuleshift != 0) { if (pad->granuleshift != 0 && pad->granuleshift != G_MAXUINT32) {
keyindex = granulepos >> pad->granuleshift; keyindex = granulepos >> pad->granuleshift;
keyoffset = granulepos - (keyindex << pad->granuleshift); keyoffset = granulepos - (keyindex << pad->granuleshift);
return keyindex + keyoffset; return keyindex + keyoffset;
@ -2196,7 +2196,7 @@ is_granulepos_keyframe_daala (GstOggStream * pad, gint64 granulepos)
{ {
gint64 frame_mask; gint64 frame_mask;
if (granulepos == (gint64) - 1) if (granulepos == (gint64) - 1 || pad->granuleshift == G_MAXUINT32)
return FALSE; return FALSE;
frame_mask = (G_GUINT64_CONSTANT (1) << pad->granuleshift) - 1; frame_mask = (G_GUINT64_CONSTANT (1) << pad->granuleshift) - 1;