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.
This commit is contained in:
Wim Taymans 2006-04-03 16:43:10 +00:00
parent b600beec9d
commit 157a5acfed
3 changed files with 13 additions and 6 deletions

View file

@ -1,3 +1,10 @@
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> 2006-04-03 Michael Smith <msmith@fluendo.com>
* ext/ogg/gstoggmux.c: (gst_ogg_mux_queue_pads): * ext/ogg/gstoggmux.c: (gst_ogg_mux_queue_pads):

View file

@ -80,7 +80,7 @@ struct _GstTheoraDec
GstSegment segment; GstSegment segment;
/* QoS stuff */ /* with LOCK*/ /* QoS stuff */ /* with LOCK*/
gboolean proportion; gdouble proportion;
GstClockTime earliest_time; GstClockTime earliest_time;
}; };

View file

@ -565,6 +565,7 @@ theora_dec_src_event (GstPad * pad, GstEvent * event)
gst_event_parse_seek (event, &rate, &format, &flags, &cur_type, &cur, gst_event_parse_seek (event, &rate, &format, &flags, &cur_type, &cur,
&stop_type, &stop); &stop_type, &stop);
gst_event_unref (event);
/* we have to ask our peer to seek to time here as we know /* we have to ask our peer to seek to time here as we know
* nothing about how to generate a granulepos from the src * 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); res = gst_pad_push_event (dec->sinkpad, real_seek);
gst_event_unref (event);
break; break;
} }
case GST_EVENT_QOS: 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 /* we cannot randomly skip frame decoding since we don't have
* B frames. we can however use the timestamp and diff to not * 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); GST_OBJECT_LOCK (dec);
dec->proportion = proportion; dec->proportion = proportion;
dec->earliest_time = timestamp + diff; dec->earliest_time = timestamp + diff;
GST_OBJECT_UNLOCK (dec); GST_OBJECT_UNLOCK (dec);
res = gst_pad_event_default (pad, event); res = gst_pad_push_event (dec->sinkpad, event);
break; break;
} }
default: default:
res = gst_pad_event_default (pad, event); res = gst_pad_push_event (dec->sinkpad, event);
break; break;
} }
done: done:
@ -619,7 +620,6 @@ done:
convert_error: convert_error:
{ {
GST_DEBUG_OBJECT (dec, "could not convert format"); GST_DEBUG_OBJECT (dec, "could not convert format");
gst_event_unref (event);
goto done; goto done;
} }
} }