Commit 157a5acf authored by Wim Taymans's avatar Wim Taymans

ext/theora/: Don't try to store a gdouble in a gboolean.

Original commit message from CVS:
* ext/theora/gsttheoradec.h:
* ext/theora/theoradec.c: (theora_dec_src_event):
Don't try to store a gdouble in a gboolean.
Small cleanups.
parent b600beec
2006-04-03 Wim Taymans <wim@fluendo.com>
* ext/theora/gsttheoradec.h:
* ext/theora/theoradec.c: (theora_dec_src_event):
Don't try to store a gdouble in a gboolean.
Small cleanups.
2006-04-03 Michael Smith <msmith@fluendo.com>
* ext/ogg/gstoggmux.c: (gst_ogg_mux_queue_pads):
......
......@@ -80,7 +80,7 @@ struct _GstTheoraDec
GstSegment segment;
/* QoS stuff */ /* with LOCK*/
gboolean proportion;
gdouble proportion;
GstClockTime earliest_time;
};
......
......@@ -565,6 +565,7 @@ theora_dec_src_event (GstPad * pad, GstEvent * event)
gst_event_parse_seek (event, &rate, &format, &flags, &cur_type, &cur,
&stop_type, &stop);
gst_event_unref (event);
/* we have to ask our peer to seek to time here as we know
* nothing about how to generate a granulepos from the src
......@@ -584,7 +585,6 @@ theora_dec_src_event (GstPad * pad, GstEvent * event)
res = gst_pad_push_event (dec->sinkpad, real_seek);
gst_event_unref (event);
break;
}
case GST_EVENT_QOS:
......@@ -597,17 +597,18 @@ theora_dec_src_event (GstPad * pad, GstEvent * event)
/* we cannot randomly skip frame decoding since we don't have
* B frames. we can however use the timestamp and diff to not
* push late frames. */
* push late frames. This would at least save us the time to
* crop/memcpy the data. */
GST_OBJECT_LOCK (dec);
dec->proportion = proportion;
dec->earliest_time = timestamp + diff;
GST_OBJECT_UNLOCK (dec);
res = gst_pad_event_default (pad, event);
res = gst_pad_push_event (dec->sinkpad, event);
break;
}
default:
res = gst_pad_event_default (pad, event);
res = gst_pad_push_event (dec->sinkpad, event);
break;
}
done:
......@@ -619,7 +620,6 @@ done:
convert_error:
{
GST_DEBUG_OBJECT (dec, "could not convert format");
gst_event_unref (event);
goto done;
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment